Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
91c6420a by Steve Lhomme at 2024-04-08T11:27:36+00:00
direct3d11: log the output format of the scaler
- - - - -
8160b84a by Steve Lhomme at 2024-04-08T11:27:36+00:00
direct3d11: allow passing through the upscaler after the tonemapper
- - - - -
1 changed file:
- modules/video_output/win32/direct3d11.c
Changes:
=====================================
modules/video_output/win32/direct3d11.c
=====================================
@@ -1058,7 +1058,7 @@ static void Prepare(vout_display_t *vd, picture_t
*picture, subpicture_t *subpic
return;
p_sys = D3D11_TonemapperGetOutput(sys->tonemapProc);
}
- else if (sys->scaleProc && D3D11_UpscalerUsed(sys->scaleProc))
+ if (sys->scaleProc && D3D11_UpscalerUsed(sys->scaleProc))
{
if (D3D11_UpscalerScale(VLC_OBJECT(vd), sys->scaleProc, p_sys) !=
VLC_SUCCESS)
return;
@@ -1554,7 +1554,8 @@ static void InitScaleProcessor(vout_display_t *vd)
if (sys->scaleProc == NULL)
sys->upscaleMode = upscale_LinearSampler;
- msg_Dbg(vd, "Using %s scaler", ppsz_upscale_mode_text[sys->upscaleMode]);
+ msg_Dbg(vd, "Using %s scaler with %s output",
ppsz_upscale_mode_text[sys->upscaleMode],
+ sys->picQuad.formatInfo->name);
}
static int Direct3D11Open(vout_display_t *vd, bool external_device)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/6142a908b86676170f75cc131126e60bc8fcd14f...8160b84a3892b7127b8fb9a638b459f222d39389
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/6142a908b86676170f75cc131126e60bc8fcd14f...8160b84a3892b7127b8fb9a638b459f222d39389
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
