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

avcodec/lcldec: Make PNG filter addressing match the code afterwards

Browse Source 
Also update check accordingly

Fixes: tickets/10237/mszh_306_306_yuv422_nocompress.avi
Fixes: tickets/10237/mszh_306_306_yuv411_nocompress.avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit d11b8bd0c610c212d2a28767f94dc07a8ec473cf)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-06-01 00:50:15 +02:00
parent 8101135606
commit 5371943592
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/lcldec.c
View File

@ -226,16 +226,19 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
break; break;
case COMP_MSZH_NOCOMP: { case COMP_MSZH_NOCOMP: {
int bppx2; int bppx2;
int aligned_width = width;
switch (c->imgtype) { switch (c->imgtype) {
case IMGTYPE_YUV111: case IMGTYPE_YUV111:
case IMGTYPE_RGB24: case IMGTYPE_RGB24:
bppx2 = 6; bppx2 = 6;
break; break;
case IMGTYPE_YUV422: case IMGTYPE_YUV422:
aligned_width &= ~3;
case IMGTYPE_YUV211: case IMGTYPE_YUV211:
bppx2 = 4; bppx2 = 4;
break; break;
case IMGTYPE_YUV411: case IMGTYPE_YUV411:
aligned_width &= ~3;
case IMGTYPE_YUV420: case IMGTYPE_YUV420:
bppx2 = 3; bppx2 = 3;
break; break;
@ -243,7 +246,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
bppx2 = 0; // will error out below bppx2 = 0; // will error out below
break; break;
} }
if (len < ((width * height * bppx2) >> 1)) if (len < ((aligned_width * height * bppx2) >> 1))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
break; break;
} }
@ -309,8 +312,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
} }
break; break;
case IMGTYPE_YUV422: case IMGTYPE_YUV422:
pixel_ptr = 0;
for (row = 0; row < height; row++) { for (row = 0; row < height; row++) {
pixel_ptr = row * width * 2;
yq = uq = vq =0; yq = uq = vq =0;
for (col = 0; col < width/4; col++) { for (col = 0; col < width/4; col++) {
encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
@ -326,8 +329,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
} }
break; break;
case IMGTYPE_YUV411: case IMGTYPE_YUV411:
pixel_ptr = 0;
for (row = 0; row < height; row++) { for (row = 0; row < height; row++) {
pixel_ptr = row * width / 2 * 3;
yq = uq = vq =0; yq = uq = vq =0;
for (col = 0; col < width/4; col++) { for (col = 0; col < width/4; col++) {
encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; encoded[pixel_ptr] = yq -= encoded[pixel_ptr];