[FFmpeg-devel] [PATCH] vf_tonemap: Fix order of planes

[Vittorio Giovara]

On Wed, Jan 5, 2022 at 4:15 PM Vittorio Giovara <vittorio.giovara at gmail.com>
wrote:

> This resulted in a dimmed tonemapping due to bad resulting luma
> calculation.
>
> Found by: Derek Buitenhuis
>
> Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>
> ---
>  libavfilter/vf_tonemap.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c
> index 363df8034b..644c9fd9e3 100644
> --- a/libavfilter/vf_tonemap.c
> +++ b/libavfilter/vf_tonemap.c
> @@ -120,17 +120,17 @@ static void tonemap(TonemapContext *s, AVFrame *out,
> const AVFrame *in,
>                      const AVPixFmtDescriptor *desc, int x, int y, double
> peak)
>  {
>      const float *r_in = (const float *)(in->data[0] + x *
> desc->comp[0].step + y * in->linesize[0]);
> -    const float *b_in = (const float *)(in->data[1] + x *
> desc->comp[1].step + y * in->linesize[1]);
> -    const float *g_in = (const float *)(in->data[2] + x *
> desc->comp[2].step + y * in->linesize[2]);
> +    const float *g_in = (const float *)(in->data[1] + x *
> desc->comp[1].step + y * in->linesize[1]);
> +    const float *b_in = (const float *)(in->data[2] + x *
> desc->comp[2].step + y * in->linesize[2]);
>      float *r_out = (float *)(out->data[0] + x * desc->comp[0].step + y *
> out->linesize[0]);
> -    float *b_out = (float *)(out->data[1] + x * desc->comp[1].step + y *
> out->linesize[1]);
> -    float *g_out = (float *)(out->data[2] + x * desc->comp[2].step + y *
> out->linesize[2]);
> +    float *g_out = (float *)(out->data[1] + x * desc->comp[1].step + y *
> out->linesize[1]);
> +    float *b_out = (float *)(out->data[2] + x * desc->comp[2].step + y *
> out->linesize[2]);
>      float sig, sig_orig;
>
>      /* load values */
>      *r_out = *r_in;
> -    *b_out = *b_in;
>      *g_out = *g_in;
> +    *b_out = *b_in;
>
>      /* desaturate to prevent unnatural colors */
>      if (s->desat > 0) {
> --
> 2.34.1
>
>
Pushing soon unless objections. Possibly backporting it to 5.0 too.
-- 
Vittorio