virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/mjpegdec: Support 31111100 sampling

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-18 23:28:43 +01:00
parent e15455891b
commit b1fbe29e51
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/mjpegdec.c
View File

@ -518,6 +518,13 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
} }
break; 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 0x22121100:
case 0x22111200: case 0x22111200:
if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV422P : AV_PIX_FMT_YUVJ422P; 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; h = (h+1)>>1;
av_assert0(w > 0); av_assert0(w > 0);
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
if (is16bit) ((uint16_t*)line)[w - 1] = ((uint16_t*)line)[(w - 1) / 2]; if (s->upscale_h[p] == 1) {
else line[w - 1] = line[(w - 1) / 2]; if (is16bit) ((uint16_t*)line)[w - 1] = ((uint16_t*)line)[(w - 1) / 2];
for (index = w - 2; index > 0; index--) { else line[w - 1] = line[(w - 1) / 2];
if (is16bit) for (index = w - 2; index > 0; index--) {
((uint16_t*)line)[index] = (((uint16_t*)line)[index / 2] + ((uint16_t*)line)[(index + 1) / 2]) >> 1; if (is16bit)
else ((uint16_t*)line)[index] = (((uint16_t*)line)[index / 2] + ((uint16_t*)line)[(index + 1) / 2]) >> 1;
line[index] = (line[index / 2] + 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]; line += s->linesize[p];
} }