ffmpeg | branch: release/2.3 | Michael Niedermayer <[email protected]> | Thu Aug 14 16:19:53 2014 +0200| [10c2d22ba19565ef65f6fd9cf6c8a931339470d4] | committer: Michael Niedermayer
avcodec/mjpegdec: Support AV_PIX_FMT_YUV420P16 with upscale_h Fixes assertion failure Fixes: test42f.jpg Found-by: Piotr Bandurski <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 5c7899a4834ee927f5629e4c02bfa225b846f016) Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10c2d22ba19565ef65f6fd9cf6c8a931339470d4 --- libavcodec/mjpegdec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 1a774dd..19fd929 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1894,6 +1894,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int start_code; int i, index; int ret = 0; + int is16bit; av_dict_free(&s->exif_metadata); av_freep(&s->stereo3d); @@ -2072,6 +2073,9 @@ fail: s->got_picture = 0; return ret; the_end: + + is16bit = av_pix_fmt_desc_get(s->avctx->pix_fmt)->comp[0].step_minus1; + if (s->upscale_h) { int p; av_assert0(avctx->pix_fmt == AV_PIX_FMT_YUVJ444P || @@ -2081,6 +2085,7 @@ the_end: avctx->pix_fmt == AV_PIX_FMT_YUVA444P || avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || avctx->pix_fmt == AV_PIX_FMT_YUV420P || + avctx->pix_fmt == AV_PIX_FMT_YUV420P16|| avctx->pix_fmt == AV_PIX_FMT_GBRAP ); avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &hshift, &vshift); @@ -2092,8 +2097,12 @@ the_end: if (p==1 || p==2) w >>= hshift; for (i = 0; i < s->chroma_height; i++) { - for (index = w - 1; index; index--) - line[index] = (line[index / 2] + line[(index + 1) / 2]) >> 1; + for (index = w - 1; index; index--) { + if (is16bit) + ((uint16_t*)line)[index] = (((uint16_t*)line)[index / 2] + ((uint16_t*)line)[(index + 1) / 2]) >> 1; + else + line[index] = (line[index / 2] + line[(index + 1) / 2]) >> 1; + } line += s->linesize[p]; } } _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
