From 454064ad1eb39ffbea4906dbe2e246e18a5d5d67 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 19 Apr 2008 01:50:40 +0000 Subject: Change aac and ac3 parsers to use ff_combine_frame(). Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aac_ac3_parser.c | 69 +++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 37 deletions(-) (limited to 'libavcodec/aac_ac3_parser.c') diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index c72965a76f..b3d4556734 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -29,34 +29,40 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1, const uint8_t *buf, int buf_size) { AACAC3ParseContext *s = s1->priv_data; - const uint8_t *buf_ptr; - int len; + ParseContext *pc = &s->pc; + int len, i; - *poutbuf = NULL; - *poutbuf_size = 0; + i=END_NOT_FOUND; + if(s->remaining_size <= buf_size){ + if(s->remaining_size){ + i= s->remaining_size; + s->remaining_size = 0; + }else{ //we need a header first + len=0; + for(i=s->remaining_size; istate = (s->state<<8) + buf[i]; + if((len=s->sync(s->state, s))) + break; + } + if(len<=0){ + i=END_NOT_FOUND; + }else{ + i-= s->header_size -1; + s->remaining_size = len + i; + } + } + } - buf_ptr = buf; - while (buf_size > 0) { - int size_needed= s->frame_size ? s->frame_size : s->header_size; - len = s->inbuf_ptr - s->inbuf; + if(ff_combine_frame(pc, i, &buf, &buf_size)<0){ + s->remaining_size -= FFMIN(s->remaining_size, buf_size); + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } - if(leninbuf_ptr, buf_ptr, len); - buf_ptr += len; - s->inbuf_ptr += len; - buf_size -= len; - } + *poutbuf = buf; + *poutbuf_size = buf_size; - if (s->frame_size == 0) { - if ((s->inbuf_ptr - s->inbuf) == s->header_size) { - len = s->sync(s); - if (len == 0) { - /* no sync found : move by one byte (inefficient, but simple!) */ - memmove(s->inbuf, s->inbuf + 1, s->header_size - 1); - s->inbuf_ptr--; - } else { - s->frame_size = len; /* update codec info */ avctx->sample_rate = s->sample_rate; /* allow downmixing to stereo (or mono for AC3) */ @@ -71,17 +77,6 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1, } avctx->bit_rate = s->bit_rate; avctx->frame_size = s->samples; - } - } - } else { - if(s->inbuf_ptr - s->inbuf == s->frame_size){ - *poutbuf = s->inbuf; - *poutbuf_size = s->frame_size; - s->inbuf_ptr = s->inbuf; - s->frame_size = 0; - break; - } - } - } - return buf_ptr - buf; + + return i; } -- cgit v1.2.3