highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mjpegdec: support weird RGB subsampling with progressive

Browse Source 
This allows weird subsampling with progressive JPEGs to be decoded,
such as full-RG and only B subsampled.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
This commit is contained in:
Leo Izen 2023-03-16 15:32:14 -04:00
parent f098eaee56
commit b18a9c2971
No known key found for this signature in database
GPG Key ID: 5A71C331FD2FA19A
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/mjpegdec.c
View File

@ -571,10 +571,15 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
case 0x22221100: case 0x22221100:
case 0x22112200: case 0x22112200:
case 0x11222200: case 0x11222200:
if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; if (s->bits > 8)
else
goto unk_pixfmt; goto unk_pixfmt;
s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; if (s->adobe_transform == 0 || s->component_id[0] == 'R' &&
s->component_id[1] == 'G' && s->component_id[2] == 'B') {
s->avctx->pix_fmt = AV_PIX_FMT_GBRP;
} else {
s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P;
s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
}
break; break;
case 0x11000000: case 0x11000000:
case 0x13000000: case 0x13000000:
@ -673,10 +678,6 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
avpriv_report_missing_feature(s->avctx, "Lowres for weird subsampling"); avpriv_report_missing_feature(s->avctx, "Lowres for weird subsampling");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if ((AV_RB32(s->upscale_h) || AV_RB32(s->upscale_v)) && s->progressive && s->avctx->pix_fmt == AV_PIX_FMT_GBRP) {
avpriv_report_missing_feature(s->avctx, "progressive for weird subsampling");
return AVERROR_PATCHWELCOME;
}
if (s->ls) { if (s->ls) {
memset(s->upscale_h, 0, sizeof(s->upscale_h)); memset(s->upscale_h, 0, sizeof(s->upscale_h));
memset(s->upscale_v, 0, sizeof(s->upscale_v)); memset(s->upscale_v, 0, sizeof(s->upscale_v));
@ -1697,9 +1698,6 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask,
s->h_scount[i] = s->h_count[index]; s->h_scount[i] = s->h_count[index];
s->v_scount[i] = s->v_count[index]; s->v_scount[i] = s->v_count[index];
if((nb_components == 1 || nb_components == 3) && s->nb_components == 3 && s->avctx->pix_fmt == AV_PIX_FMT_GBR24P)
index = (index+2)%3;
s->comp_index[i] = index; s->comp_index[i] = index;
s->dc_index[i] = get_bits(&s->gb, 4); s->dc_index[i] = get_bits(&s->gb, 4);
@ -2722,6 +2720,15 @@ the_end:
} }
} }
} }
if (s->avctx->pix_fmt == AV_PIX_FMT_GBRP) {
av_assert0(s->nb_components == 3);
FFSWAP(uint8_t *, frame->data[0], frame->data[2]);
FFSWAP(uint8_t *, frame->data[0], frame->data[1]);
FFSWAP(int, frame->linesize[0], frame->linesize[2]);
FFSWAP(int, frame->linesize[0], frame->linesize[1]);
}
if (s->adobe_transform == 0 && s->avctx->pix_fmt == AV_PIX_FMT_GBRAP) { if (s->adobe_transform == 0 && s->avctx->pix_fmt == AV_PIX_FMT_GBRAP) {
int w = s->picture_ptr->width; int w = s->picture_ptr->width;
int h = s->picture_ptr->height; int h = s->picture_ptr->height;