From 92bff92f7943ea3f5e855a6caa51128c4c7df417 Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Thu, 24 Nov 2016 22:27:18 +0100 Subject: [PATCH] #174 Fixed bug in the contrast/saturation/brightness code where the wrong luma coefficients was used. --- CHANGELOG | 6 ++++++ accelerator/ogl/image/blending_glsl.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 00a47ab3c..512728433 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -33,6 +33,12 @@ Producers + Increased the max number of frames that audio/video can be badly interleaved with (Dimitry Ishenko). +Mixer +----- + + o Fixed bug in the contrast/saturation/brightness code where the wrong luma + coefficients was used. + AMCP ---- diff --git a/accelerator/ogl/image/blending_glsl.h b/accelerator/ogl/image/blending_glsl.h index 42e95f37f..2dc65f4cc 100644 --- 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; -- 2.39.2