annotate parser.c @ 4931:0d1cc37d9430 libavcodec

make some parser parameters const to avoid casting const to non-const
author aurel
date Mon, 07 May 2007 00:47:03 +0000
parents b7bde71aa752
children c3ee5c30c297
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
1 /*
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
2 * Audio and Video frame extraction
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
3 * Copyright (c) 2003 Fabrice Bellard.
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
4 * Copyright (c) 2003 Michael Niedermayer.
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
5 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
6 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
7 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
8 * FFmpeg is free software; you can redistribute it and/or
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
10 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
12 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
16 * Lesser General Public License for more details.
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
17 *
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
19 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
21 */
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
22 #include "avcodec.h"
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
23 #include "mpegvideo.h"
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
24 #include "mpegaudio.h"
4150
2205aefb22b7 move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents: 4146
diff changeset
25 #include "parser.h"
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
26
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
27 AVCodecParser *av_first_parser = NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
28
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
29 void av_register_codec_parser(AVCodecParser *parser)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
30 {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
31 parser->next = av_first_parser;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
32 av_first_parser = parser;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
33 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
34
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
35 AVCodecParserContext *av_parser_init(int codec_id)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
36 {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
37 AVCodecParserContext *s;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
38 AVCodecParser *parser;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
39 int ret;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
40
2486
f2a9559db6ac 10l (array gets padded with 0 which is CODEC_ID_NONE -> parsers claim to support CODEC_ID_NONE)
michael
parents: 2480
diff changeset
41 if(codec_id == CODEC_ID_NONE)
f2a9559db6ac 10l (array gets padded with 0 which is CODEC_ID_NONE -> parsers claim to support CODEC_ID_NONE)
michael
parents: 2480
diff changeset
42 return NULL;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
43
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
44 for(parser = av_first_parser; parser != NULL; parser = parser->next) {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
45 if (parser->codec_ids[0] == codec_id ||
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
46 parser->codec_ids[1] == codec_id ||
2348
d02fb928ca44 pnm parser
michael
parents: 2270
diff changeset
47 parser->codec_ids[2] == codec_id ||
d02fb928ca44 pnm parser
michael
parents: 2270
diff changeset
48 parser->codec_ids[3] == codec_id ||
d02fb928ca44 pnm parser
michael
parents: 2270
diff changeset
49 parser->codec_ids[4] == codec_id)
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
50 goto found;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
51 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
52 return NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
53 found:
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
54 s = av_mallocz(sizeof(AVCodecParserContext));
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
55 if (!s)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
56 return NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
57 s->parser = parser;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
58 s->priv_data = av_mallocz(parser->priv_data_size);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
59 if (!s->priv_data) {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
60 av_free(s);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
61 return NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
62 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
63 if (parser->parser_init) {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
64 ret = parser->parser_init(s);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
65 if (ret != 0) {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
66 av_free(s->priv_data);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
67 av_free(s);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
68 return NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
69 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
70 }
2030
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
71 s->fetch_timestamp=1;
4739
9b4c5d2fb8ce set pict_type to I type during init so parsers which dont set it get all i frames, fixes mp3 seeking
michael
parents: 4679
diff changeset
72 s->pict_type = FF_I_TYPE;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
73 return s;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
74 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
75
3989
michael
parents: 3947
diff changeset
76 /**
michael
parents: 3947
diff changeset
77 *
michael
parents: 3947
diff changeset
78 * @param buf input
michael
parents: 3947
diff changeset
79 * @param buf_size input length, to signal EOF, this should be 0 (so that the last frame can be output)
michael
parents: 3947
diff changeset
80 * @param pts input presentation timestamp
michael
parents: 3947
diff changeset
81 * @param dts input decoding timestamp
michael
parents: 3947
diff changeset
82 * @param poutbuf will contain a pointer to the first byte of the output frame
michael
parents: 3947
diff changeset
83 * @param poutbuf_size will contain the length of the output frame
michael
parents: 3947
diff changeset
84 * @return the number of bytes of the input bitstream used
michael
parents: 3947
diff changeset
85 *
michael
parents: 3947
diff changeset
86 * Example:
michael
parents: 3947
diff changeset
87 * @code
michael
parents: 3947
diff changeset
88 * while(in_len){
michael
parents: 3947
diff changeset
89 * len = av_parser_parse(myparser, AVCodecContext, &data, &size,
michael
parents: 3947
diff changeset
90 * in_data, in_len,
michael
parents: 3947
diff changeset
91 * pts, dts);
michael
parents: 3947
diff changeset
92 * in_data += len;
michael
parents: 3947
diff changeset
93 * in_len -= len;
michael
parents: 3947
diff changeset
94 *
4310
a0c0c7bebd64 minor doc fix
michael
parents: 4177
diff changeset
95 * if(size)
a0c0c7bebd64 minor doc fix
michael
parents: 4177
diff changeset
96 * decode_frame(data, size);
3989
michael
parents: 3947
diff changeset
97 * }
michael
parents: 3947
diff changeset
98 * @endcode
michael
parents: 3947
diff changeset
99 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
100 int av_parser_parse(AVCodecParserContext *s,
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
101 AVCodecContext *avctx,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
102 uint8_t **poutbuf, int *poutbuf_size,
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
103 const uint8_t *buf, int buf_size,
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
104 int64_t pts, int64_t dts)
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
105 {
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
106 int index, i, k;
1694
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
107 uint8_t dummy_buf[FF_INPUT_BUFFER_PADDING_SIZE];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
108
1694
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
109 if (buf_size == 0) {
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
110 /* padding is always necessary even if EOF, so we add it here */
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
111 memset(dummy_buf, 0, sizeof(dummy_buf));
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
112 buf = dummy_buf;
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
113 } else {
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
114 /* add a new packet descriptor */
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
115 k = (s->cur_frame_start_index + 1) & (AV_PARSER_PTS_NB - 1);
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
116 s->cur_frame_start_index = k;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
117 s->cur_frame_offset[k] = s->cur_offset;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
118 s->cur_frame_pts[k] = pts;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
119 s->cur_frame_dts[k] = dts;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
120
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
121 /* fill first PTS/DTS */
2030
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
122 if (s->fetch_timestamp){
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
123 s->fetch_timestamp=0;
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
124 s->last_pts = pts;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
125 s->last_dts = dts;
4846
841ecebff8c8 timestamps generation improvement when parsing avi
benoit
parents: 4795
diff changeset
126 s->last_offset = 0;
2107
bec4623c2201 timestamp duplication bugfix
michael
parents: 2030
diff changeset
127 s->cur_frame_pts[k] =
bec4623c2201 timestamp duplication bugfix
michael
parents: 2030
diff changeset
128 s->cur_frame_dts[k] = AV_NOPTS_VALUE;
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
129 }
1694
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
130 }
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
131
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
132 /* WARNING: the returned index can be negative */
4931
0d1cc37d9430 make some parser parameters const to avoid casting const to non-const
aurel
parents: 4913
diff changeset
133 index = s->parser->parser_parse(s, avctx, (const uint8_t **)poutbuf, poutbuf_size, buf, buf_size);
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4104
diff changeset
134 //av_log(NULL, AV_LOG_DEBUG, "parser: in:%"PRId64", %"PRId64", out:%"PRId64", %"PRId64", in:%d out:%d id:%d\n", pts, dts, s->last_pts, s->last_dts, buf_size, *poutbuf_size, avctx->codec_id);
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
135 /* update the file pointer */
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
136 if (*poutbuf_size) {
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
137 /* fill the data for the current frame */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
138 s->frame_offset = s->last_frame_offset;
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
139 s->pts = s->last_pts;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
140 s->dts = s->last_dts;
4846
841ecebff8c8 timestamps generation improvement when parsing avi
benoit
parents: 4795
diff changeset
141 s->offset = s->last_offset;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
142
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
143 /* offset of the next frame */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
144 s->last_frame_offset = s->cur_offset + index;
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
145 /* find the packet in which the new frame starts. It
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
146 is tricky because of MPEG video start codes
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
147 which can begin in one packet and finish in
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
148 another packet. In the worst case, an MPEG
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
149 video start code could be in 4 different
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
150 packets. */
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
151 k = s->cur_frame_start_index;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
152 for(i = 0; i < AV_PARSER_PTS_NB; i++) {
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
153 if (s->last_frame_offset >= s->cur_frame_offset[k])
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
154 break;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
155 k = (k - 1) & (AV_PARSER_PTS_NB - 1);
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
156 }
2030
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
157
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
158 s->last_pts = s->cur_frame_pts[k];
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
159 s->last_dts = s->cur_frame_dts[k];
4846
841ecebff8c8 timestamps generation improvement when parsing avi
benoit
parents: 4795
diff changeset
160 s->last_offset = s->last_frame_offset - s->cur_frame_offset[k];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
161
2030
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
162 /* some parsers tell us the packet size even before seeing the first byte of the next packet,
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
163 so the next pts/dts is in the next chunk */
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
164 if(index == buf_size){
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
165 s->fetch_timestamp=1;
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
166 }
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
167 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
168 if (index < 0)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
169 index = 0;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
170 s->cur_offset += index;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
171 return index;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
172 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
173
2777
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
174 /**
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
175 *
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
176 * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
3421
b7826511f7b6 AVBitStreamFilter (some thingy which can modify the bitstream like add or remove global headers or change the headers or ...)
michael
parents: 3395
diff changeset
177 * @deprecated use AVBitstreamFilter
2777
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
178 */
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
179 int av_parser_change(AVCodecParserContext *s,
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
180 AVCodecContext *avctx,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
181 uint8_t **poutbuf, int *poutbuf_size,
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
182 const uint8_t *buf, int buf_size, int keyframe){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
183
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
184 if(s && s->parser->split){
2777
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
185 if((avctx->flags & CODEC_FLAG_GLOBAL_HEADER) || (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)){
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
186 int i= s->parser->split(avctx, buf, buf_size);
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
187 buf += i;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
188 buf_size -= i;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
189 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
190 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
191
2864
95bac7109ff0 Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents: 2846
diff changeset
192 /* cast to avoid warning about discarding qualifiers */
95bac7109ff0 Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents: 2846
diff changeset
193 *poutbuf= (uint8_t *) buf;
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
194 *poutbuf_size= buf_size;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
195 if(avctx->extradata){
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
196 if( (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER))
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
197 /*||(s->pict_type != I_TYPE && (s->flags & PARSER_FLAG_DUMP_EXTRADATA_AT_NOKEY))*/
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
198 /*||(? && (s->flags & PARSER_FLAG_DUMP_EXTRADATA_AT_BEGIN)*/){
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
199 int size= buf_size + avctx->extradata_size;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
200 *poutbuf_size= size;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
201 *poutbuf= av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
202
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
203 memcpy(*poutbuf, avctx->extradata, avctx->extradata_size);
2777
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
204 memcpy((*poutbuf) + avctx->extradata_size, buf, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
205 return 1;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
206 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
207 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
208
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
209 return 0;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
210 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
211
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
212 void av_parser_close(AVCodecParserContext *s)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
213 {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
214 if (s->parser->parser_close)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
215 s->parser->parser_close(s);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
216 av_free(s->priv_data);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
217 av_free(s);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
218 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
219
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
220 /*****************************************************/
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
221
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
222 /**
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
223 * combines the (truncated) bitstream to a complete frame
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
224 * @returns -1 if no complete frame could be created
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
225 */
4931
0d1cc37d9430 make some parser parameters const to avoid casting const to non-const
aurel
parents: 4913
diff changeset
226 int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size)
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
227 {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
228 #if 0
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
229 if(pc->overread){
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
230 printf("overread %d, state:%X next:%d index:%d o_index:%d\n", pc->overread, pc->state, next, pc->index, pc->overread_index);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
231 printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
232 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
233 #endif
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
234
4795
522e52c630bd typos/grammar
diego
parents: 4739
diff changeset
235 /* Copy overread bytes from last frame into buffer. */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
236 for(; pc->overread>0; pc->overread--){
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
237 pc->buffer[pc->index++]= pc->buffer[pc->overread_index++];
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
238 }
2386
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
239
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
240 /* flush remaining if EOF */
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
241 if(!*buf_size && next == END_NOT_FOUND){
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
242 next= 0;
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
243 }
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
244
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
245 pc->last_index= pc->index;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
246
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
247 /* copy into buffer end return */
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
248 if(next == END_NOT_FOUND){
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
249 pc->buffer= av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
250
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
251 memcpy(&pc->buffer[pc->index], *buf, *buf_size);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
252 pc->index += *buf_size;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
253 return -1;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
254 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
255
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
256 *buf_size=
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
257 pc->overread_index= pc->index + next;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
258
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
259 /* append to buffer */
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
260 if(pc->index){
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
261 pc->buffer= av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
262
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
263 memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE );
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
264 pc->index = 0;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
265 *buf= pc->buffer;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
266 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
267
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
268 /* store overread bytes */
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
269 for(;next < 0; next++){
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
270 pc->state = (pc->state<<8) | pc->buffer[pc->last_index + next];
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
271 pc->overread++;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
272 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
273
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
274 #if 0
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
275 if(pc->overread){
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
276 printf("overread %d, state:%X next:%d index:%d o_index:%d\n", pc->overread, pc->state, next, pc->index, pc->overread_index);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
277 printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
278 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
279 #endif
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
280
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
281 return 0;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
282 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
283
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
284 void ff_parse_close(AVCodecParserContext *s)
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
285 {
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
286 ParseContext *pc = s->priv_data;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
287
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
288 av_free(pc->buffer);
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
289 }
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
290
4150
2205aefb22b7 move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents: 4146
diff changeset
291 void ff_parse1_close(AVCodecParserContext *s)
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
292 {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
293 ParseContext1 *pc1 = s->priv_data;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
294
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
295 av_free(pc1->pc.buffer);
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
296 av_free(pc1->enc);
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
297 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
298
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
299 /*************************/
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
300
4175
b3328ed50a5e make mpeg4video_split public as ff_mpeg4video_split
stefang
parents: 4150
diff changeset
301 int ff_mpeg4video_split(AVCodecContext *avctx,
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
302 const uint8_t *buf, int buf_size)
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
303 {
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
304 int i;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
305 uint32_t state= -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
306
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
307 for(i=0; i<buf_size; i++){
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
308 state= (state<<8) | buf[i];
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
309 if(state == 0x1B3 || state == 0x1B6)
2777
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
310 return i-3;
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
311 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
312 return 0;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
313 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
314
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
315 /*************************/
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
316
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
317 #if defined(CONFIG_AC3_PARSER) || defined(CONFIG_AAC_PARSER)
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
318 /* also used for ADTS AAC */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
319 typedef struct AC3ParseContext {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
320 uint8_t *inbuf_ptr;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
321 int frame_size;
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
322 int header_size;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
323 int (*sync)(const uint8_t *buf, int *channels, int *sample_rate,
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
324 int *bit_rate, int *samples);
3344
f9d739057d6c The AAC frame header uses 13 bits for the frame size, so the buffer should
mru
parents: 3104
diff changeset
325 uint8_t inbuf[8192]; /* input buffer */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
326 } AC3ParseContext;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
327
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
328 #define AC3_HEADER_SIZE 7
3104
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
329 #define AAC_HEADER_SIZE 7
3059
61b4cc042988 native ac3 parser
mru
parents: 3036
diff changeset
330
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
331 #ifdef CONFIG_AC3_PARSER
4397
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
332
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
333 static const uint8_t eac3_blocks[4] = {
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
334 1, 2, 3, 6
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
335 };
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
336
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
337 #endif /* CONFIG_AC3_PARSER */
3059
61b4cc042988 native ac3 parser
mru
parents: 3036
diff changeset
338
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
339 #ifdef CONFIG_AAC_PARSER
3456
fa0b285144f0 make some tables const
mru
parents: 3455
diff changeset
340 static const int aac_sample_rates[16] = {
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
341 96000, 88200, 64000, 48000, 44100, 32000,
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
342 24000, 22050, 16000, 12000, 11025, 8000, 7350
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
343 };
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
344
3456
fa0b285144f0 make some tables const
mru
parents: 3455
diff changeset
345 static const int aac_channels[8] = {
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
346 0, 1, 2, 3, 4, 5, 6, 8
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
347 };
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
348 #endif
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
349
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
350 #ifdef CONFIG_AC3_PARSER
4855
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
351 int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr)
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
352 {
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
353 GetBitContext gbc;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
354
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
355 memset(hdr, 0, sizeof(*hdr));
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
356
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
357 init_get_bits(&gbc, buf, 54);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
358
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
359 hdr->sync_word = get_bits(&gbc, 16);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
360 if(hdr->sync_word != 0x0B77)
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
361 return -1;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
362
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
363 /* read ahead to bsid to make sure this is AC-3, not E-AC-3 */
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
364 hdr->bsid = show_bits_long(&gbc, 29) & 0x1F;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
365 if(hdr->bsid > 10)
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
366 return -2;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
367
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
368 hdr->crc1 = get_bits(&gbc, 16);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
369 hdr->fscod = get_bits(&gbc, 2);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
370 if(hdr->fscod == 3)
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
371 return -3;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
372
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
373 hdr->frmsizecod = get_bits(&gbc, 6);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
374 if(hdr->frmsizecod > 37)
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
375 return -4;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
376
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
377 skip_bits(&gbc, 5); // skip bsid, already got it
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
378
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
379 hdr->bsmod = get_bits(&gbc, 3);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
380 hdr->acmod = get_bits(&gbc, 3);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
381 if((hdr->acmod & 1) && hdr->acmod != 1) {
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
382 hdr->cmixlev = get_bits(&gbc, 2);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
383 }
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
384 if(hdr->acmod & 4) {
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
385 hdr->surmixlev = get_bits(&gbc, 2);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
386 }
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
387 if(hdr->acmod == 2) {
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
388 hdr->dsurmod = get_bits(&gbc, 2);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
389 }
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
390 hdr->lfeon = get_bits1(&gbc);
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
391
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
392 hdr->halfratecod = FFMAX(hdr->bsid, 8) - 8;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
393 hdr->sample_rate = ff_ac3_freqs[hdr->fscod] >> hdr->halfratecod;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
394 hdr->bit_rate = (ff_ac3_bitratetab[hdr->frmsizecod>>1] * 1000) >> hdr->halfratecod;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
395 hdr->channels = ff_ac3_channels[hdr->acmod] + hdr->lfeon;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
396 hdr->frame_size = ff_ac3_frame_sizes[hdr->frmsizecod][hdr->fscod] * 2;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
397
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
398 return 0;
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
399 }
40f3a7f2b1fd Move AC3 header parsing code together with the rest of the AC3 parsing code.
diego
parents: 4846
diff changeset
400
3059
61b4cc042988 native ac3 parser
mru
parents: 3036
diff changeset
401 static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate,
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
402 int *bit_rate, int *samples)
3059
61b4cc042988 native ac3 parser
mru
parents: 3036
diff changeset
403 {
4648
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
404 int err;
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
405 unsigned int fscod, acmod, bsid, lfeon;
4397
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
406 unsigned int strmtyp, substreamid, frmsiz, fscod2, numblkscod;
3059
61b4cc042988 native ac3 parser
mru
parents: 3036
diff changeset
407 GetBitContext bits;
4648
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
408 AC3HeaderInfo hdr;
3059
61b4cc042988 native ac3 parser
mru
parents: 3036
diff changeset
409
4648
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
410 err = ff_ac3_parse_header(buf, &hdr);
3059
61b4cc042988 native ac3 parser
mru
parents: 3036
diff changeset
411
4648
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
412 if(err < 0 && err != -2)
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3059
diff changeset
413 return 0;
3059
61b4cc042988 native ac3 parser
mru
parents: 3036
diff changeset
414
4648
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
415 bsid = hdr.bsid;
4501
665d7cd95fd3 fix parsing of RealAudio AC-3/DolbyNet
jbr
parents: 4398
diff changeset
416 if(bsid <= 10) { /* Normal AC-3 */
4648
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
417 *sample_rate = hdr.sample_rate;
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
418 *bit_rate = hdr.bit_rate;
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
419 *channels = hdr.channels;
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
420 *samples = AC3_FRAME_SIZE;
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
421 return hdr.frame_size;
4501
665d7cd95fd3 fix parsing of RealAudio AC-3/DolbyNet
jbr
parents: 4398
diff changeset
422 } else if (bsid > 10 && bsid <= 16) { /* Enhanced AC-3 */
4648
5683b496ffbc move AC-3 header parsing to ac3.c
jbr
parents: 4645
diff changeset
423 init_get_bits(&bits, &buf[2], (AC3_HEADER_SIZE-2) * 8);
4397
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
424 strmtyp = get_bits(&bits, 2);
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
425 substreamid = get_bits(&bits, 3);
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
426
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
427 if (strmtyp != 0 || substreamid != 0)
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
428 return 0; /* Currently don't support additional streams */
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
429
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
430 frmsiz = get_bits(&bits, 11) + 1;
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
431 fscod = get_bits(&bits, 2);
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
432 if (fscod == 3) {
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
433 fscod2 = get_bits(&bits, 2);
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
434 numblkscod = 3;
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
435
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
436 if(fscod2 == 3)
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
437 return 0;
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
438
4645
056127e5df89 remove redundancy in AC-3 parser by using common tables from ac3tab.h
jbr
parents: 4501
diff changeset
439 *sample_rate = ff_ac3_freqs[fscod2] / 2;
4397
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
440 } else {
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
441 numblkscod = get_bits(&bits, 2);
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
442
4645
056127e5df89 remove redundancy in AC-3 parser by using common tables from ac3tab.h
jbr
parents: 4501
diff changeset
443 *sample_rate = ff_ac3_freqs[fscod];
4397
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
444 }
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
445
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
446 acmod = get_bits(&bits, 3);
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
447 lfeon = get_bits1(&bits);
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
448
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
449 *samples = eac3_blocks[numblkscod] * 256;
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
450 *bit_rate = frmsiz * (*sample_rate) * 16 / (*samples);
4645
056127e5df89 remove redundancy in AC-3 parser by using common tables from ac3tab.h
jbr
parents: 4501
diff changeset
451 *channels = ff_ac3_channels[acmod] + lfeon;
4397
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
452
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
453 return frmsiz * 2;
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
454 }
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
455
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
456 /* Unsupported bitstream version */
acb9faabab8d Allows the AC3 parser to read the frame size and codec parameters from E-AC3 streams,
gpoirier
parents: 4310
diff changeset
457 return 0;
3059
61b4cc042988 native ac3 parser
mru
parents: 3036
diff changeset
458 }
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
459 #endif /* CONFIG_AC3_PARSER */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
460
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
461 #ifdef CONFIG_AAC_PARSER
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
462 static int aac_sync(const uint8_t *buf, int *channels, int *sample_rate,
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
463 int *bit_rate, int *samples)
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
464 {
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
465 GetBitContext bits;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
466 int size, rdb, ch, sr;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
467
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
468 init_get_bits(&bits, buf, AAC_HEADER_SIZE * 8);
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
469
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
470 if(get_bits(&bits, 12) != 0xfff)
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
471 return 0;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
472
3104
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
473 skip_bits1(&bits); /* id */
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
474 skip_bits(&bits, 2); /* layer */
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
475 skip_bits1(&bits); /* protection_absent */
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
476 skip_bits(&bits, 2); /* profile_objecttype */
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
477 sr = get_bits(&bits, 4); /* sample_frequency_index */
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
478 if(!aac_sample_rates[sr])
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
479 return 0;
3104
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
480 skip_bits1(&bits); /* private_bit */
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
481 ch = get_bits(&bits, 3); /* channel_configuration */
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
482 if(!aac_channels[ch])
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
483 return 0;
3104
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
484 skip_bits1(&bits); /* original/copy */
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
485 skip_bits1(&bits); /* home */
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
486
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
487 /* adts_variable_header */
3104
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
488 skip_bits1(&bits); /* copyright_identification_bit */
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
489 skip_bits1(&bits); /* copyright_identification_start */
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
490 size = get_bits(&bits, 13); /* aac_frame_length */
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
491 skip_bits(&bits, 11); /* adts_buffer_fullness */
78d6bfc238f3 use get_bits1/skip_bits[1] in ac3 and aac parsers
mru
parents: 3098
diff changeset
492 rdb = get_bits(&bits, 2); /* number_of_raw_data_blocks_in_frame */
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
493
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
494 *channels = aac_channels[ch];
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
495 *sample_rate = aac_sample_rates[sr];
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
496 *samples = (rdb + 1) * 1024;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
497 *bit_rate = size * 8 * *sample_rate / *samples;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
498
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
499 return size;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
500 }
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
501 #endif /* CONFIG_AAC_PARSER */
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
502
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
503 #ifdef CONFIG_AC3_PARSER
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
504 static int ac3_parse_init(AVCodecParserContext *s1)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
505 {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
506 AC3ParseContext *s = s1->priv_data;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
507 s->inbuf_ptr = s->inbuf;
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
508 s->header_size = AC3_HEADER_SIZE;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
509 s->sync = ac3_sync;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
510 return 0;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
511 }
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
512 #endif
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
513
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
514 #ifdef CONFIG_AAC_PARSER
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
515 static int aac_parse_init(AVCodecParserContext *s1)
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
516 {
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
517 AC3ParseContext *s = s1->priv_data;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
518 s->inbuf_ptr = s->inbuf;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
519 s->header_size = AAC_HEADER_SIZE;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
520 s->sync = aac_sync;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
521 return 0;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
522 }
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
523 #endif
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
524
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
525 /* also used for ADTS AAC */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
526 static int ac3_parse(AVCodecParserContext *s1,
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
527 AVCodecContext *avctx,
4931
0d1cc37d9430 make some parser parameters const to avoid casting const to non-const
aurel
parents: 4913
diff changeset
528 const uint8_t **poutbuf, int *poutbuf_size,
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
529 const uint8_t *buf, int buf_size)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
530 {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
531 AC3ParseContext *s = s1->priv_data;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
532 const uint8_t *buf_ptr;
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
533 int len, sample_rate, bit_rate, channels, samples;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
534
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
535 *poutbuf = NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
536 *poutbuf_size = 0;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
537
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
538 buf_ptr = buf;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
539 while (buf_size > 0) {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
540 len = s->inbuf_ptr - s->inbuf;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
541 if (s->frame_size == 0) {
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
542 /* no header seen : find one. We need at least s->header_size
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
543 bytes to parse it */
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
544 len = FFMIN(s->header_size - len, buf_size);
3082
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
545
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
546 memcpy(s->inbuf_ptr, buf_ptr, len);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
547 buf_ptr += len;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
548 s->inbuf_ptr += len;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
549 buf_size -= len;
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
550 if ((s->inbuf_ptr - s->inbuf) == s->header_size) {
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
551 len = s->sync(s->inbuf, &channels, &sample_rate, &bit_rate,
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
552 &samples);
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
553 if (len == 0) {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
554 /* no sync found : move by one byte (inefficient, but simple!) */
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
555 memmove(s->inbuf, s->inbuf + 1, s->header_size - 1);
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
556 s->inbuf_ptr--;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
557 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
558 s->frame_size = len;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
559 /* update codec info */
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
560 avctx->sample_rate = sample_rate;
1987
d9e067853051 >2 channels decoding fix
michael
parents: 1696
diff changeset
561 /* set channels,except if the user explicitly requests 1 or 2 channels, XXX/FIXME this is a bit ugly */
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
562 if(avctx->codec_id == CODEC_ID_AC3){
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
563 if(avctx->channels!=1 && avctx->channels!=2){
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
564 avctx->channels = channels;
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
565 }
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
566 } else {
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3059
diff changeset
567 avctx->channels = channels;
1987
d9e067853051 >2 channels decoding fix
michael
parents: 1696
diff changeset
568 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
569 avctx->bit_rate = bit_rate;
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
570 avctx->frame_size = samples;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
571 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
572 }
3082
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
573 } else {
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
574 len = FFMIN(s->frame_size - len, buf_size);
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
575
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
576 memcpy(s->inbuf_ptr, buf_ptr, len);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
577 buf_ptr += len;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
578 s->inbuf_ptr += len;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
579 buf_size -= len;
3082
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
580
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
581 if(s->inbuf_ptr - s->inbuf == s->frame_size){
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
582 *poutbuf = s->inbuf;
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
583 *poutbuf_size = s->frame_size;
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
584 s->inbuf_ptr = s->inbuf;
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
585 s->frame_size = 0;
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
586 break;
d85afa120256 output last ac3 frame and simplify
michael
parents: 3063
diff changeset
587 }
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
588 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
589 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
590 return buf_ptr - buf;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
591 }
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
592 #endif /* CONFIG_AC3_PARSER || CONFIG_AAC_PARSER */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
593
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
594 #ifdef CONFIG_AC3_PARSER
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
595 AVCodecParser ac3_parser = {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
596 { CODEC_ID_AC3 },
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
597 sizeof(AC3ParseContext),
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
598 ac3_parse_init,
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
599 ac3_parse,
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
600 NULL,
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
601 };
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
602 #endif
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
603 #ifdef CONFIG_AAC_PARSER
3098
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
604 AVCodecParser aac_parser = {
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
605 { CODEC_ID_AAC },
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
606 sizeof(AC3ParseContext),
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
607 aac_parse_init,
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
608 ac3_parse,
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
609 NULL,
eb3d3988aff2 adts aac parser
mru
parents: 3086
diff changeset
610 };
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3432
diff changeset
611 #endif