har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/exr: remove wrong scaling for 32bit DWA compression

Browse Source
This commit is contained in:
Paul B Mahol 2023-06-08 12:05:47 +02:00
parent b7e79ba395
commit 024c30aa3b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/exr.c
View File

@ -1119,7 +1119,6 @@ static int dwa_uncompress(const EXRContext *s, const uint8_t *src, int compresse
} }
{ {
const float scale = s->pixel_type == EXR_FLOAT ? 2.f : 1.f;
const int o = s->nb_channels == 4; const int o = s->nb_channels == 4;
float *bo = ((float *)td->uncompressed_data) + float *bo = ((float *)td->uncompressed_data) +
y * td->xsize * s->nb_channels + td->xsize * (o + 0) + x; y * td->xsize * s->nb_channels + td->xsize * (o + 0) + x;
@ -1137,9 +1136,9 @@ static int dwa_uncompress(const EXRContext *s, const uint8_t *src, int compresse
convert(yb[idx], ub[idx], vb[idx], &bo[xx], &go[xx], &ro[xx]); convert(yb[idx], ub[idx], vb[idx], &bo[xx], &go[xx], &ro[xx]);
bo[xx] = to_linear(bo[xx], scale); bo[xx] = to_linear(bo[xx], 1.f);
go[xx] = to_linear(go[xx], scale); go[xx] = to_linear(go[xx], 1.f);
ro[xx] = to_linear(ro[xx], scale); ro[xx] = to_linear(ro[xx], 1.f);
} }
bo += td->xsize * s->nb_channels; bo += td->xsize * s->nb_channels;