videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-21 00:35:05 +02:00
Code Releases Activity

Do not scan for MP3 header after the given buffer and return skipped

Browse Source 
bytes along with consumed bytes on successful decoding.
patch by Zdenek Kabelac, zdenek.kabelac gmail com

Originally committed as revision 18736 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Zdenek Kabelac 2009-05-04 14:23:48 +00:00 committed by Diego Biurrun
parent c7279693ae
commit e2fa5cf4c9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpegaudiodec.c
View File

@ -2263,6 +2263,7 @@ static int decode_frame(AVCodecContext * avctx,
MPADecodeContext *s = avctx->priv_data;
uint32_t header;
int out_size;
int skipped = 0;
OUT_INT *out_samples = data;
retry:
@ -2272,7 +2273,8 @@ retry:
header = AV_RB32(buf);
if(ff_mpa_check_header(header) < 0){
buf++;
// buf_size--;
buf_size--;
skipped++;
av_log(avctx, AV_LOG_ERROR, "Header missing skipping one byte.\n");
goto retry;
}
@ -2303,7 +2305,7 @@ retry:
}else
av_log(avctx, AV_LOG_DEBUG, "Error while decoding MPEG audio frame.\n"); //FIXME return -1 / but also return the number of bytes consumed
s->frame_size = 0;
return buf_size;
return buf_size + skipped;
}
static void flush(AVCodecContext *avctx){