Mercurial > libavcodec.hg
diff aac_ac3_parser.c @ 6565:013def14c931 libavcodec
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
author | bwolowiec |
---|---|
date | Sat, 05 Apr 2008 20:09:36 +0000 |
parents | 04763b6fd4f0 |
children | 9b8a881e871c |
line wrap: on
line diff
--- a/aac_ac3_parser.c Fri Apr 04 00:43:34 2008 +0000 +++ b/aac_ac3_parser.c Sat Apr 05 20:09:36 2008 +0000 @@ -29,35 +29,32 @@ const uint8_t *buf, int buf_size) { AACAC3ParseContext *s = s1->priv_data; - AACAC3FrameFlag frame_flag; - const uint8_t *buf_ptr; - int len; - - *poutbuf = NULL; - *poutbuf_size = 0; - - 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; + ParseContext *pc = &s->pc; + int len, i; - if(len<size_needed){ - len = FFMIN(size_needed - len, buf_size); - memcpy(s->inbuf_ptr, buf_ptr, len); - buf_ptr += len; - s->inbuf_ptr += len; - buf_size -= len; - } + while(s->remaining_size <= buf_size){ + if(s->remaining_size && !s->need_next_header){ + i= s->remaining_size; + s->remaining_size = 0; + goto output_frame; + }else{ //we need a header first + len=0; + for(i=s->remaining_size; i<buf_size; i++){ + s->state = (s->state<<8) + buf[i]; + if((len=s->sync(s->state, s, &s->need_next_header, &s->new_frame_start))) + break; + } + i-= s->header_size; + if(len>0){ + s->remaining_size = len + i; - if (s->frame_size == 0) { - if ((s->inbuf_ptr - s->inbuf) == s->header_size) { - len = s->sync(s, &frame_flag); - 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; + if(pc->index+i > 0 && s->new_frame_start){ + s->remaining_size -= i; // remaining_size=len +output_frame: + ff_combine_frame(pc, i, &buf, &buf_size); + *poutbuf = buf; + *poutbuf_size = buf_size; + /* update codec info */ avctx->sample_rate = s->sample_rate; /* allow downmixing to stereo (or mono for AC3) */ @@ -72,17 +69,18 @@ } avctx->bit_rate = s->bit_rate; avctx->frame_size = s->samples; + + return i; } - } - } 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; + }else{ break; } } } - return buf_ptr - buf; + + ff_combine_frame(pc, END_NOT_FOUND, &buf, &buf_size); + s->remaining_size -= FFMIN(s->remaining_size, buf_size); + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; }