diff options
author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-01-13 02:20:33 +0400 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-01-13 02:20:33 +0400 |
commit | 2c902045981598a729178e27abd528a48dd384ca (patch) | |
tree | faa1b0588fb81cb0a28354af6a5c3571ce8cef67 /libavcodec/mjpegdec.c | |
parent | 7cbb32e461cdbe8b745d560c1700c711ba5933cc (diff) |
Fix decoding of progressive jpgs with unusual pixel formats.
Fixes ticket #892.
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r-- | libavcodec/mjpegdec.c | 55 |
1 files changed, 33 insertions, 22 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 458d132fce..64e5839231 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -219,6 +219,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) int len, nb_components, i, width, height, pix_fmt_id; s->cur_scan = 0; + s->upscale_h = s->upscale_v = 0; /* XXX: verify len field validity */ len = get_bits(&s->gb, 16); @@ -401,6 +402,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) return -1; } if (s->ls) { + s->upscale_h = s->upscale_v = 0; if (s->nb_components > 1) s->avctx->pix_fmt = PIX_FMT_RGB24; else if (s->bits <= 8) @@ -1233,28 +1235,6 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask, return -1; } } - if (s->upscale_h) { - uint8_t *line = s->picture_ptr->data[s->upscale_h]; - for (i = 0; i < s->chroma_height; i++) { - for (index = s->width - 1; index; index--) - line[index] = (line[index / 2] + line[(index + 1) / 2]) >> 1; - line += s->linesize[s->upscale_h]; - } - } - if (s->upscale_v) { - uint8_t *dst = &((uint8_t *)s->picture_ptr->data[s->upscale_v])[(s->height - 1) * s->linesize[s->upscale_v]]; - for (i = s->height - 1; i; i--) { - uint8_t *src1 = &((uint8_t *)s->picture_ptr->data[s->upscale_v])[i / 2 * s->linesize[s->upscale_v]]; - uint8_t *src2 = &((uint8_t *)s->picture_ptr->data[s->upscale_v])[(i + 1) / 2 * s->linesize[s->upscale_v]]; - if (src1 == src2) { - memcpy(dst, src1, s->width); - } else { - for (index = 0; index < s->width; index++) - dst[index] = (src1[index] + src2[index]) >> 1; - } - dst -= s->linesize[s->upscale_v]; - } - } emms_c(); return 0; out_of_range: @@ -1576,6 +1556,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *unescaped_buf_ptr; int unescaped_buf_size; int start_code; + int i, index; AVFrame *picture = data; s->got_picture = 0; // picture from previous image can not be reused @@ -1735,6 +1716,36 @@ eoi_parser: av_log(avctx, AV_LOG_FATAL, "No JPEG data found in image\n"); return -1; the_end: + if (s->upscale_h) { + uint8_t *line = s->picture_ptr->data[s->upscale_h]; + av_assert0(avctx->pix_fmt == PIX_FMT_YUVJ444P || + avctx->pix_fmt == PIX_FMT_YUV444P || + avctx->pix_fmt == PIX_FMT_YUVJ440P || + avctx->pix_fmt == PIX_FMT_YUV440P); + for (i = 0; i < s->chroma_height; i++) { + for (index = s->width - 1; index; index--) + line[index] = (line[index / 2] + line[(index + 1) / 2]) >> 1; + line += s->linesize[s->upscale_h]; + } + } + if (s->upscale_v) { + uint8_t *dst = &((uint8_t *)s->picture_ptr->data[s->upscale_v])[(s->height - 1) * s->linesize[s->upscale_v]]; + av_assert0(avctx->pix_fmt == PIX_FMT_YUVJ444P || + avctx->pix_fmt == PIX_FMT_YUV444P || + avctx->pix_fmt == PIX_FMT_YUVJ422P || + avctx->pix_fmt == PIX_FMT_YUV422P); + for (i = s->height - 1; i; i--) { + uint8_t *src1 = &((uint8_t *)s->picture_ptr->data[s->upscale_v])[i / 2 * s->linesize[s->upscale_v]]; + uint8_t *src2 = &((uint8_t *)s->picture_ptr->data[s->upscale_v])[(i + 1) / 2 * s->linesize[s->upscale_v]]; + if (src1 == src2) { + memcpy(dst, src1, s->width); + } else { + for (index = 0; index < s->width; index++) + dst[index] = (src1[index] + src2[index]) >> 1; + } + dst -= s->linesize[s->upscale_v]; + } + } av_log(avctx, AV_LOG_DEBUG, "mjpeg decode frame unused %td bytes\n", buf_end - buf_ptr); // return buf_end - buf_ptr; |