#174 Fixed bug in the contrast/saturation/brightness code where the wrong luma coeffi...

diff --git a/CHANGELOG b/CHANGELOG
index 00a47ab3c2977338e3d9a44d63f8e3937af224f7..5127284332be0e215b9af978235ff93e462be324 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,6 +33,12 @@ Producers
     + Increased the max number of frames that audio/video can be badly\r
       interleaved with (Dimitry Ishenko).\r
 \r
+Mixer\r
+-----\r
+\r
+  o Fixed bug in the contrast/saturation/brightness code where the wrong luma\r
+    coefficients was used.\r
+\r
 AMCP\r
 ----\r
 \r

diff --git a/accelerator/ogl/image/blending_glsl.h b/accelerator/ogl/image/blending_glsl.h
index 42e95f37f83a9775a76369955d587ce49dc3c459..2dc65f4ccf69b1ecff6704b48019d7084245dbd5 100644 (file)
--- a/accelerator/ogl/image/blending_glsl.h
+++ b/accelerator/ogl/image/blending_glsl.h
@@ -36,7 +36,9 @@ static std::string get_adjustement_glsl()
                                const float AvgLumG = 0.5;
                                const float AvgLumB = 0.5;
 
-                               const vec3 LumCoeff = vec3(0.2125, 0.7154, 0.0721);
+                               vec3 LumCoeff = is_hd
+                                               ? vec3(0.0722, 0.7152, 0.2126)
+                                               : vec3(0.114, 0.587, 0.299);
 
                                vec3 AvgLumin = vec3(AvgLumR, AvgLumG, AvgLumB);
                                vec3 brtColor = color * brt;