[vlc-commits] Revert "opengl: converter_cvpx: don't handle color space"

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Sep 13 09:11:52 2017 +0200| [49cf3da0fedfd10cac9e32d8cb852eaac4ba9d7d] | committer: Thomas Guillem

Revert "opengl: converter_cvpx: don't handle color space"

This commits worked by luck for HD content because Videotoolbox was wrong.
Indeed, COLOR_SPACE_UNDEF in opengl_fragment_shader_init() will use the default
colorspace conversion: BT709.

This reverts commit e818a9b141d588f0582af2555a3c45065ae84992.

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

 modules/video_output/opengl/converter_cvpx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/opengl/converter_cvpx.c b/modules/video_output/opengl/converter_cvpx.c
index 886dcd616f..676d9220e9 100644
--- a/modules/video_output/opengl/converter_cvpx.c
+++ b/modules/video_output/opengl/converter_cvpx.c
@@ -213,7 +213,7 @@ Open(vlc_object_t *obj)
 
             fragment_shader =
                 opengl_fragment_shader_init(tc, tex_target, VLC_CODEC_VYUY,
-                                            COLOR_SPACE_UNDEF);
+                                            tc->fmt.space);
             tc->texs[0].internal = GL_RGB;
             tc->texs[0].format = GL_RGB_422_APPLE;
             tc->texs[0].type = GL_UNSIGNED_SHORT_8_8_APPLE;
@@ -223,13 +223,13 @@ Open(vlc_object_t *obj)
         {
             fragment_shader =
                 opengl_fragment_shader_init(tc, tex_target, VLC_CODEC_NV12,
-                                            COLOR_SPACE_UNDEF);
+                                            tc->fmt.space);
             break;
         }
         case VLC_CODEC_CVPX_I420:
             fragment_shader =
                 opengl_fragment_shader_init(tc, tex_target, VLC_CODEC_I420,
-                                            COLOR_SPACE_UNDEF);
+                                            tc->fmt.space);
             break;
         case VLC_CODEC_CVPX_BGRA:
             fragment_shader =