comparison aac_ac3_parser.c @ 6566:9b8a881e871c libavcodec

Corrections of errors in aac_ac3_parser
author bwolowiec
date Mon, 07 Apr 2008 20:54:08 +0000
parents 013def14c931
children c92b7e617a0a
comparison
equal deleted inserted replaced
6565:013def14c931 6566:9b8a881e871c
42 for(i=s->remaining_size; i<buf_size; i++){ 42 for(i=s->remaining_size; i<buf_size; i++){
43 s->state = (s->state<<8) + buf[i]; 43 s->state = (s->state<<8) + buf[i];
44 if((len=s->sync(s->state, s, &s->need_next_header, &s->new_frame_start))) 44 if((len=s->sync(s->state, s, &s->need_next_header, &s->new_frame_start)))
45 break; 45 break;
46 } 46 }
47 i-= s->header_size; 47 i-= s->header_size -1;
48 if(len>0){ 48 if(len>0){
49 s->remaining_size = len + i; 49 s->remaining_size = len + i;
50 50
51 if(pc->index+i > 0 && s->new_frame_start){ 51 if(pc->index+i > 0 && s->new_frame_start){
52 s->remaining_size -= i; // remaining_size=len 52 s->remaining_size -= i; // remaining_size=len
53 output_frame: 53 output_frame:
54 if(!s->frame_in_buffer && 0){
55 s->frame_in_buffer=1;
56 buf+=i;
57 buf_size-=i;
58 continue;
59 }
54 ff_combine_frame(pc, i, &buf, &buf_size); 60 ff_combine_frame(pc, i, &buf, &buf_size);
55 *poutbuf = buf; 61 *poutbuf = buf;
56 *poutbuf_size = buf_size; 62 *poutbuf_size = buf_size;
57 63
58 /* update codec info */ 64 /* update codec info */
70 avctx->bit_rate = s->bit_rate; 76 avctx->bit_rate = s->bit_rate;
71 avctx->frame_size = s->samples; 77 avctx->frame_size = s->samples;
72 78
73 return i; 79 return i;
74 } 80 }
81 s->frame_in_buffer=1;
75 }else{ 82 }else{
76 break; 83 break;
77 } 84 }
78 } 85 }
79 } 86 }