[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: d3d11_scaler: mark Intel Super Resolution detection as not possible

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC


Commits:
49a3e1f3 by Steve Lhomme at 2024-03-22T08:51:39+00:00
d3d11_scaler: mark Intel Super Resolution detection as not possible

(cherry picked from commit 40ac7778b994337a0a55c8a5d507f6284933b4cf)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
d625e97a by Steve Lhomme at 2024-03-22T08:51:39+00:00
d3d11_scaler: fix Intel Super Resolution enabling

The wrong API was used to set kIntelVpeFnScaling.

(cherry picked from commit 6d8d4e0ff7a34705c0fff4ee0d5f3a409b991dce)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
6142a908 by Steve Lhomme at 2024-03-22T08:51:39+00:00
d3d11_scaler: fix deadlock on NVIDIA detection errors

(cherry picked from commit b7fa0712fbaa2bf4f00994ffeefc565d59533dee)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -


1 changed file:

- modules/video_output/win32/d3d11_scaler.cpp


Changes:

=====================================
modules/video_output/win32/d3d11_scaler.cpp
=====================================
@@ -124,14 +124,13 @@ d3d11_scaler *D3D11_UpscalerCreate(vlc_object_t *vd, d3d11_device_t *d3d_dev, vl
 
         hr = d3dvidctx->VideoProcessorGetStreamExtension(processor.Get(),
                     0, &kNvidiaPPEInterfaceGUID, sizeof(available), &available);
-        d3d11_device_unlock(d3d_dev);
 checked:
+        d3d11_device_unlock(d3d_dev);
         canProcess = available != 0;
     }
     else if (d3d_dev->adapterDesc.VendorId == GPU_MANUFACTURER_INTEL)
     {
-        // TODO refine which GPU and drivers can do it
-        canProcess = true;
+        canProcess = true; // detection doesn't work
     }
 #ifdef HAVE_AMF_SCALER
     else if (d3d_dev->adapterDesc.VendorId == GPU_MANUFACTURER_AMD)
@@ -554,8 +553,8 @@ int D3D11_UpscalerUpdate(vlc_object_t *vd, d3d11_scaler *scaleProc, d3d11_device
 
             ext.function = kIntelVpeFnScaling;
             param = upscale ? kIntelVpeScalingSuperResolution : kIntelVpeScalingDefault;
-            hr = scaleProc->d3dvidctx->VideoProcessorSetOutputExtension(
-                scaleProc->processor.Get(),
+            hr = scaleProc->d3dvidctx->VideoProcessorSetStreamExtension(
+                scaleProc->processor.Get(), 0,
                 &GUID_INTEL_VPE_INTERFACE, sizeof(ext), &ext);
             if (FAILED(hr)) {
                 msg_Err(vd, "Failed to set the Intel VPE scaling type. (hr=0x%lX)", hr);



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/020d1d443dcdb00348442580a87f7e53b918130f...6142a908b86676170f75cc131126e60bc8fcd14f

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/020d1d443dcdb00348442580a87f7e53b918130f...6142a908b86676170f75cc131126e60bc8fcd14f
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance