Rename colour_conversion -> xyz_rec709_colour_conversion.

[dcpomatic.git] / src / wx / gl_video_view.cc

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 29d44fcd2a6bf9bbd0126573b432a7dc815347b5..efafe6548504d7405f4bfc978d5b775cf00a1ac2 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -203,14 +203,14 @@ static constexpr char fragment_source[] =
 "uniform int type = 0;\n"
 "uniform vec4 outline_content_colour;\n"
 "uniform vec4 crop_guess_colour;\n"
-"uniform mat4 colour_conversion;\n"
+"uniform mat4 xyz_rec709_colour_conversion;\n"
 "\n"
 "out vec4 FragColor;\n"
 "\n"
 "vec4 cubic(float x)\n"
 "\n"
-"#define IN_GAMMA 2.2\n"
-"#define OUT_GAMMA 0.384615385\n"       //  1 /  2.6
+"#define IN_GAMMA 2.6\n"
+"#define OUT_GAMMA 0.454545455\n"       //  1 /  2.2
 "#define DCI_COEFFICIENT 0.91655528\n"  // 48 / 53.37
 "\n"
 "{\n"
@@ -271,7 +271,7 @@ static constexpr char fragment_source[] =
 "                      FragColor.x = pow(FragColor.x, IN_GAMMA) / DCI_COEFFICIENT;\n"
 "                      FragColor.y = pow(FragColor.y, IN_GAMMA) / DCI_COEFFICIENT;\n"
 "                      FragColor.z = pow(FragColor.z, IN_GAMMA) / DCI_COEFFICIENT;\n"
-"                      FragColor = colour_conversion * FragColor;\n"
+"                      FragColor = xyz_rec709_colour_conversion * FragColor;\n"
 "                      FragColor.x = pow(FragColor.x, OUT_GAMMA);\n"
 "                      FragColor.y = pow(FragColor.y, OUT_GAMMA);\n"
 "                      FragColor.z = pow(FragColor.z, OUT_GAMMA);\n"
@@ -462,9 +462,9 @@ GLVideoView::setup_shaders ()
                0.0f, 0.0f, 0.0f, 1.0f
                };
 
-       auto colour_conversion = glGetUniformLocation (program, "colour_conversion");
+       auto xyz_rec709_colour_conversion = glGetUniformLocation(program, "xyz_rec709_colour_conversion");
        check_gl_error ("glGetUniformLocation");
-       glUniformMatrix4fv (colour_conversion, 1, GL_TRUE, gl_matrix);
+       glUniformMatrix4fv(xyz_rec709_colour_conversion, 1, GL_TRUE, gl_matrix);
 
        glLineWidth (1.0f);
        check_gl_error ("glLineWidth");
@@ -563,8 +563,6 @@ GLVideoView::set_image (shared_ptr<const PlayerVideo> pv)
         *  Otherwise we render a RGB image without any shader-side processing.
         */
 
-       /* XXX: video range conversion */
-
        _video_texture->set (video);
 
        auto const text = pv->text();