[FFmpeg-cvslog] avcodec/mjpegdec: Support pix_fmt_id== 0x42111100

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 28 16:23:25 2014 +0200| [ec33f59fed82e0a92912639c79ac1b3ac0f23c4a] | committer: Michael Niedermayer

avcodec/mjpegdec: Support pix_fmt_id== 0x42111100

Fixes: 538782_300.jpg
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec33f59fed82e0a92912639c79ac1b3ac0f23c4a
---

 libavcodec/mjpegdec.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 7150d4a..ccbdf48 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -494,9 +494,14 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
         s->upscale_v = 2 << (pix_fmt_id == 0x22121100);
         break;
     case 0x22111100:
+    case 0x42111100:
         if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUVJ420P;
         else              s->avctx->pix_fmt = AV_PIX_FMT_YUV420P16;
         s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
+        if (pix_fmt_id == 0x42111100) {
+            s->upscale_h = 6;
+            s->chroma_height = s->height / 2;
+        }
         break;
     case 0x41111100:
         if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV411P : AV_PIX_FMT_YUVJ411P;
@@ -2060,14 +2065,19 @@ the_end:
                    avctx->pix_fmt == AV_PIX_FMT_YUVJ440P ||
                    avctx->pix_fmt == AV_PIX_FMT_YUV440P  ||
                    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_GBRAP
                   );
+        avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &hshift, &vshift);
         for (p = 1; p<4; p++) {
             uint8_t *line = s->picture_ptr->data[p];
+            int w;
             if (!(s->upscale_h & (1<<p)))
                 continue;
+            w = s->width >> hshift;
             for (i = 0; i < s->chroma_height; i++) {
-                for (index = s->width - 1; index; index--)
+                for (index = w - 1; index; index--)
                     line[index] = (line[index / 2] + line[(index + 1) / 2]) >> 1;
                 line += s->linesize[p];
             }