[vlc-commits] direct3d11: the default luminance with PQ is always 10,000 nits

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Jan 24 10:15:57 2018 +0100| [c400d7de864e158e29d9dd5f24172c69deea3801] | committer: Jean-Baptiste Kempf

direct3d11: the default luminance with PQ is always 10,000 nits

It may differ according to the HDR metadata passed with frames.

(cherry picked from commit 82e3d78e50a7ae40e920578ea88a82d6994ba34d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c400d7de864e158e29d9dd5f24172c69deea3801
---

 modules/video_output/win32/direct3d11.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 82e79304a3..162871be77 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1744,12 +1744,8 @@ static HRESULT CompilePixelShader(vout_display_t *vd, const d3d_format_t *format
     switch (transfer)
     {
         case TRANSFER_FUNC_SMPTE_ST2084:
-            if (sys->display.colorspace->transfer == TRANSFER_FUNC_SMPTE_ST2084)
-                /* the display will take care of the meta data if there are some */
-                src_luminance_peak = MAX_PQ_BRIGHTNESS;
-            else
-                /* TODO adjust this value during playback using HDR metadata ? */
-                src_luminance_peak = 5000;
+            /* that's the default PQ value if the metadata are not set */
+            src_luminance_peak = MAX_PQ_BRIGHTNESS;
             break;
         case TRANSFER_FUNC_HLG:
             src_luminance_peak = 1000;