diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 23:28:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 23:28:43 +0100 |
| commit | b1fbe29e51c4bda5419eb7b9239acf8055e7b0e8 (patch) | |
| tree | d16e9167aef6299589c527bb9330c17899c04b18 /libavcodec/mjpegdec.c | |
| parent | e15455891bc673f9767c1ececa3fa92f05267ce3 (diff) | |
avcodec/mjpegdec: Support 31111100 sampling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b7dc418ba2..4553152279 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -518,6 +518,13 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; } break; + case 0x31111100: + if (s->bits > 8) + goto unk_pixfmt; + 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; + s->upscale_h[1] = s->upscale_h[2] = 2; + break; case 0x22121100: case 0x22111200: if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV422P : AV_PIX_FMT_YUVJ422P; @@ -2162,13 +2169,26 @@ the_end: h = (h+1)>>1; av_assert0(w > 0); for (i = 0; i < h; i++) { - if (is16bit) ((uint16_t*)line)[w - 1] = ((uint16_t*)line)[(w - 1) / 2]; - else line[w - 1] = line[(w - 1) / 2]; - for (index = w - 2; index > 0; 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; + if (s->upscale_h[p] == 1) { + if (is16bit) ((uint16_t*)line)[w - 1] = ((uint16_t*)line)[(w - 1) / 2]; + else line[w - 1] = line[(w - 1) / 2]; + for (index = w - 2; index > 0; 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; + } + } else if (s->upscale_h[p] == 2) { + if (is16bit) { + ((uint16_t*)line)[w - 1] = + ((uint16_t*)line)[w - 2] = ((uint16_t*)line)[(w - 1) / 3]; + } else { + line[w - 1] = + line[w - 2] = line[(w - 1) / 3]; + } + for (index = w - 3; index > 0; index--) { + line[index] = (line[index / 3] + line[(index + 1) / 3] + line[(index + 2) / 3] + 1) / 3; + } } line += s->linesize[p]; } |