Mercurial > libavcodec.hg
annotate aac_ac3_parser.c @ 6572:c92b7e617a0a libavcodec
Correction of typo in aac_ac3_parser
author | bwolowiec |
---|---|
date | Tue, 08 Apr 2008 06:18:36 +0000 |
parents | 9b8a881e871c |
children | 5e7c69ebc019 |
rev | line source |
---|---|
4941 | 1 /* |
2 * Common AAC and AC3 parser | |
3 * Copyright (c) 2003 Fabrice Bellard. | |
4 * Copyright (c) 2003 Michael Niedermayer. | |
5 * | |
6 * This file is part of FFmpeg. | |
7 * | |
8 * FFmpeg is free software; you can redistribute it and/or | |
9 * modify it under the terms of the GNU Lesser General Public | |
10 * License as published by the Free Software Foundation; either | |
11 * version 2.1 of the License, or (at your option) any later version. | |
12 * | |
13 * FFmpeg is distributed in the hope that it will be useful, | |
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Lesser General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU Lesser General Public | |
19 * License along with FFmpeg; if not, write to the Free Software | |
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
21 */ | |
22 | |
23 #include "parser.h" | |
24 #include "aac_ac3_parser.h" | |
25 | |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
26 int ff_aac_ac3_parse(AVCodecParserContext *s1, |
4941 | 27 AVCodecContext *avctx, |
28 const uint8_t **poutbuf, int *poutbuf_size, | |
29 const uint8_t *buf, int buf_size) | |
30 { | |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
31 AACAC3ParseContext *s = s1->priv_data; |
6565
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
32 ParseContext *pc = &s->pc; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
33 int len, i; |
5816
0168cd384df3
factorize code and add safety check to prevent memcpying negative amounts
michael
parents:
4942
diff
changeset
|
34 |
6565
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
35 while(s->remaining_size <= buf_size){ |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
36 if(s->remaining_size && !s->need_next_header){ |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
37 i= s->remaining_size; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
38 s->remaining_size = 0; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
39 goto output_frame; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
40 }else{ //we need a header first |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
41 len=0; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
42 for(i=s->remaining_size; i<buf_size; i++){ |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
43 s->state = (s->state<<8) + buf[i]; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
44 if((len=s->sync(s->state, s, &s->need_next_header, &s->new_frame_start))) |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
45 break; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
46 } |
6566 | 47 i-= s->header_size -1; |
6565
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
48 if(len>0){ |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
49 s->remaining_size = len + i; |
5816
0168cd384df3
factorize code and add safety check to prevent memcpying negative amounts
michael
parents:
4942
diff
changeset
|
50 |
6565
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
51 if(pc->index+i > 0 && s->new_frame_start){ |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
52 s->remaining_size -= i; // remaining_size=len |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
53 output_frame: |
6572 | 54 if(!s->frame_in_buffer){ |
6566 | 55 s->frame_in_buffer=1; |
56 buf+=i; | |
57 buf_size-=i; | |
58 continue; | |
59 } | |
6565
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
60 ff_combine_frame(pc, i, &buf, &buf_size); |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
61 *poutbuf = buf; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
62 *poutbuf_size = buf_size; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
63 |
4941 | 64 /* update codec info */ |
6527
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
6119
diff
changeset
|
65 avctx->sample_rate = s->sample_rate; |
6119 | 66 /* allow downmixing to stereo (or mono for AC3) */ |
6110
356a3c897bd2
adjust output channels based on AVCodecContext.request_channels in AC3 parser
jbr
parents:
6101
diff
changeset
|
67 if(avctx->request_channels > 0 && |
6527
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
6119
diff
changeset
|
68 avctx->request_channels < s->channels && |
6119 | 69 (avctx->request_channels <= 2 || |
70 (avctx->request_channels == 1 && | |
71 avctx->codec_id == CODEC_ID_AC3))) { | |
6110
356a3c897bd2
adjust output channels based on AVCodecContext.request_channels in AC3 parser
jbr
parents:
6101
diff
changeset
|
72 avctx->channels = avctx->request_channels; |
6111 | 73 } else { |
6527
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
6119
diff
changeset
|
74 avctx->channels = s->channels; |
6110
356a3c897bd2
adjust output channels based on AVCodecContext.request_channels in AC3 parser
jbr
parents:
6101
diff
changeset
|
75 } |
6527
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
6119
diff
changeset
|
76 avctx->bit_rate = s->bit_rate; |
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
6119
diff
changeset
|
77 avctx->frame_size = s->samples; |
6565
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
78 |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
79 return i; |
4941 | 80 } |
6566 | 81 s->frame_in_buffer=1; |
6565
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
82 }else{ |
4941 | 83 break; |
84 } | |
85 } | |
86 } | |
6565
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
87 |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
88 ff_combine_frame(pc, END_NOT_FOUND, &buf, &buf_size); |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
89 s->remaining_size -= FFMIN(s->remaining_size, buf_size); |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
90 *poutbuf = NULL; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
91 *poutbuf_size = 0; |
013def14c931
change of aac_ac3_parser, so it is able to send complete portion of data to decoder
bwolowiec
parents:
6539
diff
changeset
|
92 return buf_size; |
4941 | 93 } |