RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

utvideodec: Fix decoding odd sizes with interlaced video with some formats 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Paul B Mahol 2017-04-21 12:27:17 +02:00 committed by Luca Barbato
parent 8c0cadd17e
commit 7c25523cc8
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/utvideodec.c
View File

@ -228,6 +228,16 @@ fail:
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
static int compute_cmask(int plane_no, int interlaced, int pix_fmt)
{
const int is_luma = (pix_fmt == AV_PIX_FMT_YUV420P) && !plane_no;
if (interlaced)
return ~(1 + 2 * is_luma);
return ~is_luma;
}
static int decode_plane(UtvideoContext *c, int plane_no, static int decode_plane(UtvideoContext *c, int plane_no,
uint8_t *dst, int step, ptrdiff_t stride, uint8_t *dst, int step, ptrdiff_t stride,
int width, int height, int width, int height,
@ -238,7 +248,7 @@ static int decode_plane(UtvideoContext *c, int plane_no,
VLC vlc; VLC vlc;
BitstreamContext bc; BitstreamContext bc;
int prev, fsym; int prev, fsym;
const int cmask = ~(!plane_no && c->avctx->pix_fmt == AV_PIX_FMT_YUV420P); const int cmask = compute_cmask(plane_no, c->interlaced, c->avctx->pix_fmt);
if (build_huff(src, &vlc, &fsym)) { if (build_huff(src, &vlc, &fsym)) {
av_log(c->avctx, AV_LOG_ERROR, "Cannot build Huffman codes\n"); av_log(c->avctx, AV_LOG_ERROR, "Cannot build Huffman codes\n");