highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix interlaced AVUI decoding.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2012-05-19 19:20:22 +02:00
parent 9d30a96aa1
commit 2596d7261d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/avuidec.c
View File

@ -53,8 +53,8 @@ static int avui_decode_frame(AVCodecContext *avctx, void *data,
interlaced = avctx->extradata[19] != 1; interlaced = avctx->extradata[19] != 1;
skip[0] = skip[1] = 16; skip[0] = skip[1] = 16;
if (avctx->height == 486) { if (avctx->height == 486) {
skip[0] = 8; skip[0] = 10;
skip[1] = 12; skip[1] = 10;
} }
if (avpkt->size < avctx->width * (2 * avctx->height + skip[0] + skip[1]) if (avpkt->size < avctx->width * (2 * avctx->height + skip[0] + skip[1])
+ 4 * interlaced) { + 4 * interlaced) {
@ -85,10 +85,17 @@ static int avui_decode_frame(AVCodecContext *avctx, void *data,
for (i = 0; i < interlaced + 1; i++) { for (i = 0; i < interlaced + 1; i++) {
src += avctx->width * skip[i]; src += avctx->width * skip[i];
srca += avctx->width * skip[i]; srca += avctx->width * skip[i];
if (interlaced && avctx->height == 486) {
y = pic->data[0] + (1 - i) * pic->linesize[0];
u = pic->data[1] + (1 - i) * pic->linesize[1];
v = pic->data[2] + (1 - i) * pic->linesize[2];
a = pic->data[3] + (1 - i) * pic->linesize[3];
} else {
y = pic->data[0] + i * pic->linesize[0]; y = pic->data[0] + i * pic->linesize[0];
u = pic->data[1] + i * pic->linesize[1]; u = pic->data[1] + i * pic->linesize[1];
v = pic->data[2] + i * pic->linesize[2]; v = pic->data[2] + i * pic->linesize[2];
a = pic->data[3] + i * pic->linesize[3]; a = pic->data[3] + i * pic->linesize[3];
}
for (j = 0; j < avctx->height >> interlaced; j++) { for (j = 0; j < avctx->height >> interlaced; j++) {
for (k = 0; k < avctx->width >> 1; k++) { for (k = 0; k < avctx->width >> 1; k++) {