[vlc-commits] [Git][videolan/vlc][master] 2 commits: direct3d11: use accurate logging of Scaler mode

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
48a4c682 by Steve Lhomme at 2023-05-29T08:44:56+00:00
direct3d11: use accurate logging of Scaler mode

If we fallback to linear the log was wrong.

- - - - -
ef457f21 by Steve Lhomme at 2023-05-29T08:44:56+00:00
d3d11_scaler: don't use upscaler with software chroma

This was already the case before 1f529133a4440d3fc0b04a77cb06638aebe32170.
We can't feed the VideoProcessor with DXGI_FORMAT_UNKNOWN.

- - - - -


2 changed files:

- modules/video_output/win32/d3d11_scaler.cpp
- modules/video_output/win32/direct3d11.cpp


Changes:

=====================================
modules/video_output/win32/d3d11_scaler.cpp
=====================================
@@ -67,6 +67,11 @@ d3d11_scaler *D3D11_UpscalerCreate(vlc_object_t *vd, d3d11_device_t *d3d_dev, vl
         return nullptr;
     }
 
+    if ((*out_fmt)->formatTexture == DXGI_FORMAT_UNKNOWN)
+    {
+        msg_Warn(vd, "chroma upscale of %4.4s not supported", (char*)&i_chroma);
+        return nullptr;
+    }
     const d3d_format_t *fmt = nullptr;
     if ((*out_fmt)->bitsPerChannel > 10)
         fmt = GetDirectRenderingFormat(vd, d3d_dev, VLC_CODEC_RGBA64);


=====================================
modules/video_output/win32/direct3d11.cpp
=====================================
@@ -790,8 +790,7 @@ static void InitScaleProcessor(vout_display_t *vd)
         sys->upscaleMode = upscale_LinearSampler;
     }
 
-    msg_Dbg(vd, "Using %s scaler", sys->upscaleMode != upscale_SuperResolution ?
-            "Video Processor": "Super Resolution");
+    msg_Dbg(vd, "Using %s scaler", ppsz_upscale_mode_text[sys->upscaleMode]);
 }
 
 static int Direct3D11Open(vout_display_t *vd, video_format_t *fmtp, vlc_video_context *vctx)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/ea80086999670e30fc2785e9de64e698f9ba4f92...ef457f21992f7a272e619d420f41be5619dc4d0a

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


VideoLAN code repository instance