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

dxa: fix decoding of first I-frame by separating I/P-frame decoding

Browse Source 
5ef7c84 broke decoding for the first keyframe due to an unnecessary
check for a reference frame.

CC: libav-stable@libav.org
This commit is contained in:
Janne Grunau 2013-08-17 12:36:36 +02:00
parent 5ef7c84a93
commit c34a96a5dd
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/dxa.c
View File

@ -252,22 +252,27 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
} }
break; break;
case 2: case 2:
case 3:
case 4: case 4:
frame->key_frame = 1;
frame->pict_type = AV_PICTURE_TYPE_I;
for (j = 0; j < avctx->height; j++) {
memcpy(outptr, srcptr, avctx->width);
outptr += stride;
srcptr += avctx->width;
}
break;
case 3:
case 5: case 5:
if (!tmpptr) { if (!tmpptr) {
av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n"); av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
frame->key_frame = !(compr & 1); frame->key_frame = 0;
frame->pict_type = (compr & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; frame->pict_type = AV_PICTURE_TYPE_P;
for(j = 0; j < avctx->height; j++){ for (j = 0; j < avctx->height; j++) {
if(compr & 1){ for (i = 0; i < avctx->width; i++)
for(i = 0; i < avctx->width; i++) outptr[i] = srcptr[i] ^ tmpptr[i];
outptr[i] = srcptr[i] ^ tmpptr[i]; tmpptr += stride;
tmpptr += stride;
}else
memcpy(outptr, srcptr, avctx->width);
outptr += stride; outptr += stride;
srcptr += avctx->width; srcptr += avctx->width;
} }