virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avcodec/sheervideo: fix Y prediction in decode_ybr(i) for older formats

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-09-18 18:19:15 +02:00
parent 6cbd47bf90
commit 260de8a264
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/sheervideo.c
View File

@ -31,6 +31,7 @@
typedef struct SheerVideoContext { typedef struct SheerVideoContext {
unsigned format; unsigned format;
int alt;
VLC vlc[2]; VLC vlc[2];
void (*decode_frame)(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb); void (*decode_frame)(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb);
} SheerVideoContext; } SheerVideoContext;
@ -2038,7 +2039,7 @@ static void decode_ybri(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb)
dst_v[x] = get_bits(gb, 8); dst_v[x] = get_bits(gb, 8);
} }
} else { } else {
int pred[4] = { 125, -128, -128, -128 }; int pred[4] = { s->alt ? 125 : -146, -128, -128, -128 };
for (x = 0; x < avctx->width; x++) { for (x = 0; x < avctx->width; x++) {
int y, u, v; int y, u, v;
@ -2106,7 +2107,7 @@ static void decode_ybr(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb)
dst_v[x] = get_bits(gb, 8); dst_v[x] = get_bits(gb, 8);
} }
} else { } else {
int pred[4] = { 125, -128, -128, -128 }; int pred[4] = { s->alt ? 125 : -146, -128, -128, -128 };
for (x = 0; x < avctx->width; x++) { for (x = 0; x < avctx->width; x++) {
int y, u, v; int y, u, v;
@ -2887,6 +2888,7 @@ static int decode_frame(AVCodecContext *avctx,
AV_RL32(avpkt->data) != MKTAG('Z','w','a','k')) AV_RL32(avpkt->data) != MKTAG('Z','w','a','k'))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
s->alt = 0;
format = AV_RL32(avpkt->data + 16); format = AV_RL32(avpkt->data + 16);
switch (format) { switch (format) {
case MKTAG(' ', 'R', 'G', 'B'): case MKTAG(' ', 'R', 'G', 'B'):
@ -2972,6 +2974,7 @@ static int decode_frame(AVCodecContext *avctx,
} }
break; break;
case MKTAG(' ', 'Y', 'B', 'R'): case MKTAG(' ', 'Y', 'B', 'R'):
s->alt = 1;
case MKTAG(' ', 'Y', 'b', 'R'): case MKTAG(' ', 'Y', 'b', 'R'):
avctx->pix_fmt = AV_PIX_FMT_YUV444P; avctx->pix_fmt = AV_PIX_FMT_YUV444P;
s->decode_frame = decode_ybr; s->decode_frame = decode_ybr;
@ -2981,6 +2984,7 @@ static int decode_frame(AVCodecContext *avctx,
} }
break; break;
case MKTAG(' ', 'y', 'B', 'R'): case MKTAG(' ', 'y', 'B', 'R'):
s->alt = 1;
case MKTAG(' ', 'y', 'b', 'R'): case MKTAG(' ', 'y', 'b', 'R'):
avctx->pix_fmt = AV_PIX_FMT_YUV444P; avctx->pix_fmt = AV_PIX_FMT_YUV444P;
s->decode_frame = decode_ybri; s->decode_frame = decode_ybri;