har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libavcodec: correct consumed bytes for decoders

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-21 20:12:46 +02:00
parent 307562be98
commit a1bb0823a9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/utils.c
View File

@ -1482,8 +1482,11 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
emms_c(); //needed to avoid an emms_c() call before every return; emms_c(); //needed to avoid an emms_c() call before every return;
avctx->pkt = NULL; avctx->pkt = NULL;
if (did_split) if (did_split) {
ff_packet_free_side_data(&tmp); ff_packet_free_side_data(&tmp);
if(ret == tmp.size)
ret = avpkt->size;
}
if (*got_picture_ptr){ if (*got_picture_ptr){
avctx->frame_number++; avctx->frame_number++;
@ -1583,8 +1586,11 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
} }
avctx->pkt = NULL; avctx->pkt = NULL;
if (did_split) if (did_split) {
ff_packet_free_side_data(&tmp); ff_packet_free_side_data(&tmp);
if(ret == tmp.size)
ret = avpkt->size;
}
} }
return ret; return ret;
} }

6
tests/fate/audio.mak
View File

@ -40,10 +40,8 @@ fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymo
fate-nellymoser-aref-encode: CMP = stddev fate-nellymoser-aref-encode: CMP = stddev
fate-nellymoser-aref-encode: REF = ./tests/data/acodec-16000-1.ref.wav fate-nellymoser-aref-encode: REF = ./tests/data/acodec-16000-1.ref.wav
fate-nellymoser-aref-encode: CMP_SHIFT = -1172 fate-nellymoser-aref-encode: CMP_SHIFT = -1172
#fate-nellymoser-aref-encode: CMP_TARGET = 9617 fate-nellymoser-aref-encode: CMP_TARGET = 9617
#fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268 fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268
fate-nellymoser-aref-encode: CMP_TARGET = 10216
fate-nellymoser-aref-encode: SIZE_TOLERANCE = 1300
FATE_SAMPLES_AUDIO += fate-sierra-vmd-audio FATE_SAMPLES_AUDIO += fate-sierra-vmd-audio
fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn