annotate parser.c @ 6582:7d40da88f0c7 libavcodec

Crop parameters are unsigned, having them negative could be bad and lead to crashes or maybe exploits (not checked at all if this is possible).
author michael
date Fri, 11 Apr 2008 12:57:49 +0000
parents 23b2a64342f2
children d7051562c2b3
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 */
4943
25cd2084129a remove no more useful includes
aurel
parents: 4941
diff changeset
22
4150
2205aefb22b7 move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents: 4146
diff changeset
23 #include "parser.h"
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
24
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
25 AVCodecParser *av_first_parser = NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
26
6011
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 4943
diff changeset
27 AVCodecParser* av_parser_next(AVCodecParser *p){
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 4943
diff changeset
28 if(p) return p->next;
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 4943
diff changeset
29 else return av_first_parser;
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 4943
diff changeset
30 }
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 4943
diff changeset
31
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
32 void av_register_codec_parser(AVCodecParser *parser)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
33 {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
34 parser->next = av_first_parser;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
35 av_first_parser = parser;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
36 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
37
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
38 AVCodecParserContext *av_parser_init(int codec_id)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
39 {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
40 AVCodecParserContext *s;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
41 AVCodecParser *parser;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
42 int ret;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
43
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
44 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
45 return NULL;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
46
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
47 for(parser = av_first_parser; parser != NULL; parser = parser->next) {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
48 if (parser->codec_ids[0] == codec_id ||
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
49 parser->codec_ids[1] == codec_id ||
2348
d02fb928ca44 pnm parser
michael
parents: 2270
diff changeset
50 parser->codec_ids[2] == codec_id ||
d02fb928ca44 pnm parser
michael
parents: 2270
diff changeset
51 parser->codec_ids[3] == codec_id ||
d02fb928ca44 pnm parser
michael
parents: 2270
diff changeset
52 parser->codec_ids[4] == codec_id)
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
53 goto found;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
54 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
55 return NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
56 found:
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
57 s = av_mallocz(sizeof(AVCodecParserContext));
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
58 if (!s)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
59 return NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
60 s->parser = parser;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
61 s->priv_data = av_mallocz(parser->priv_data_size);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
62 if (!s->priv_data) {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
63 av_free(s);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
64 return NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
65 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
66 if (parser->parser_init) {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
67 ret = parser->parser_init(s);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
68 if (ret != 0) {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
69 av_free(s->priv_data);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
70 av_free(s);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
71 return NULL;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
72 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
73 }
2030
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
74 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
75 s->pict_type = FF_I_TYPE;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
76 return s;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
77 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
78
3989
michael
parents: 3947
diff changeset
79 /**
michael
parents: 3947
diff changeset
80 *
michael
parents: 3947
diff changeset
81 * @param buf input
michael
parents: 3947
diff changeset
82 * @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
83 * @param pts input presentation timestamp
michael
parents: 3947
diff changeset
84 * @param dts input decoding timestamp
michael
parents: 3947
diff changeset
85 * @param poutbuf will contain a pointer to the first byte of the output frame
michael
parents: 3947
diff changeset
86 * @param poutbuf_size will contain the length of the output frame
michael
parents: 3947
diff changeset
87 * @return the number of bytes of the input bitstream used
michael
parents: 3947
diff changeset
88 *
michael
parents: 3947
diff changeset
89 * Example:
michael
parents: 3947
diff changeset
90 * @code
michael
parents: 3947
diff changeset
91 * while(in_len){
michael
parents: 3947
diff changeset
92 * len = av_parser_parse(myparser, AVCodecContext, &data, &size,
michael
parents: 3947
diff changeset
93 * in_data, in_len,
michael
parents: 3947
diff changeset
94 * pts, dts);
michael
parents: 3947
diff changeset
95 * in_data += len;
michael
parents: 3947
diff changeset
96 * in_len -= len;
michael
parents: 3947
diff changeset
97 *
4310
a0c0c7bebd64 minor doc fix
michael
parents: 4177
diff changeset
98 * if(size)
a0c0c7bebd64 minor doc fix
michael
parents: 4177
diff changeset
99 * decode_frame(data, size);
3989
michael
parents: 3947
diff changeset
100 * }
michael
parents: 3947
diff changeset
101 * @endcode
michael
parents: 3947
diff changeset
102 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
103 int av_parser_parse(AVCodecParserContext *s,
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
104 AVCodecContext *avctx,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
105 uint8_t **poutbuf, int *poutbuf_size,
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
106 const uint8_t *buf, int buf_size,
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
107 int64_t pts, int64_t dts)
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
108 {
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
109 int index, i, k;
1694
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
110 uint8_t dummy_buf[FF_INPUT_BUFFER_PADDING_SIZE];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
111
1694
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
112 if (buf_size == 0) {
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
113 /* 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
114 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
115 buf = dummy_buf;
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
116 } else {
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
117 /* add a new packet descriptor */
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
118 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
119 s->cur_frame_start_index = k;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
120 s->cur_frame_offset[k] = s->cur_offset;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
121 s->cur_frame_pts[k] = pts;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
122 s->cur_frame_dts[k] = dts;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
123
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
124 /* fill first PTS/DTS */
2030
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
125 if (s->fetch_timestamp){
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
126 s->fetch_timestamp=0;
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
127 s->last_pts = pts;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
128 s->last_dts = dts;
4846
841ecebff8c8 timestamps generation improvement when parsing avi
benoit
parents: 4795
diff changeset
129 s->last_offset = 0;
2107
bec4623c2201 timestamp duplication bugfix
michael
parents: 2030
diff changeset
130 s->cur_frame_pts[k] =
bec4623c2201 timestamp duplication bugfix
michael
parents: 2030
diff changeset
131 s->cur_frame_dts[k] = AV_NOPTS_VALUE;
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
132 }
1694
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
133 }
13169235c306 added End Of File handling to return last picture for MPEG1/2/4
bellard
parents: 1681
diff changeset
134
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
135 /* 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
136 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
137 //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
138 /* update the file pointer */
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
139 if (*poutbuf_size) {
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
140 /* fill the data for the current frame */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
141 s->frame_offset = s->last_frame_offset;
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
142 s->pts = s->last_pts;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
143 s->dts = s->last_dts;
4846
841ecebff8c8 timestamps generation improvement when parsing avi
benoit
parents: 4795
diff changeset
144 s->offset = s->last_offset;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
145
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
146 /* offset of the next frame */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
147 s->last_frame_offset = s->cur_offset + index;
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
148 /* find the packet in which the new frame starts. It
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
149 is tricky because of MPEG video start codes
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
150 which can begin in one packet and finish in
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
151 another packet. In the worst case, an MPEG
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
152 video start code could be in 4 different
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
153 packets. */
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
154 k = s->cur_frame_start_index;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
155 for(i = 0; i < AV_PARSER_PTS_NB; i++) {
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
156 if (s->last_frame_offset >= s->cur_frame_offset[k])
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
157 break;
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
158 k = (k - 1) & (AV_PARSER_PTS_NB - 1);
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
159 }
2030
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
160
1696
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
161 s->last_pts = s->cur_frame_pts[k];
f5af91b8be17 pts and dts support in parser API
bellard
parents: 1694
diff changeset
162 s->last_dts = s->cur_frame_dts[k];
4846
841ecebff8c8 timestamps generation improvement when parsing avi
benoit
parents: 4795
diff changeset
163 s->last_offset = s->last_frame_offset - s->cur_frame_offset[k];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
164
2030
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
165 /* 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
166 so the next pts/dts is in the next chunk */
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
167 if(index == buf_size){
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
168 s->fetch_timestamp=1;
f796043935f3 mpeg audio timestamp fix
michael
parents: 2024
diff changeset
169 }
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
170 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
171 if (index < 0)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
172 index = 0;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
173 s->cur_offset += index;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
174 return index;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
175 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
176
2777
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
177 /**
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
178 *
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
179 * @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
180 * @deprecated use AVBitstreamFilter
2777
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
181 */
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
182 int av_parser_change(AVCodecParserContext *s,
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
183 AVCodecContext *avctx,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
184 uint8_t **poutbuf, int *poutbuf_size,
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
185 const uint8_t *buf, int buf_size, int keyframe){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
186
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
187 if(s && s->parser->split){
2777
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
188 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
189 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
190 buf += i;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
191 buf_size -= i;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
192 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
193 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
194
2864
95bac7109ff0 Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents: 2846
diff changeset
195 /* cast to avoid warning about discarding qualifiers */
95bac7109ff0 Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents: 2846
diff changeset
196 *poutbuf= (uint8_t *) buf;
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
197 *poutbuf_size= buf_size;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
198 if(avctx->extradata){
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
199 if( (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER))
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6011
diff changeset
200 /*||(s->pict_type != FF_I_TYPE && (s->flags & PARSER_FLAG_DUMP_EXTRADATA_AT_NOKEY))*/
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
201 /*||(? && (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
202 int size= buf_size + avctx->extradata_size;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
203 *poutbuf_size= size;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
204 *poutbuf= av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
205
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
206 memcpy(*poutbuf, avctx->extradata, avctx->extradata_size);
2777
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
207 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
208 return 1;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
209 }
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
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
212 return 0;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
213 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
214
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
215 void av_parser_close(AVCodecParserContext *s)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
216 {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
217 if (s->parser->parser_close)
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
218 s->parser->parser_close(s);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
219 av_free(s->priv_data);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
220 av_free(s);
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 /*****************************************************/
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
224
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
225 /**
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
226 * combines the (truncated) bitstream to a complete frame
6534
23b2a64342f2 Return an error when realloc fails.
benoit
parents: 6481
diff changeset
227 * @returns -1 if no complete frame could be created, AVERROR(ENOMEM) if there was a memory allocation error
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
228 */
4931
0d1cc37d9430 make some parser parameters const to avoid casting const to non-const
aurel
parents: 4913
diff changeset
229 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
230 {
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
231 #if 0
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
232 if(pc->overread){
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
233 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
234 printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
235 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
236 #endif
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
237
4795
522e52c630bd typos/grammar
diego
parents: 4739
diff changeset
238 /* Copy overread bytes from last frame into buffer. */
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
239 for(; pc->overread>0; pc->overread--){
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
240 pc->buffer[pc->index++]= pc->buffer[pc->overread_index++];
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
241 }
2386
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
242
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
243 /* flush remaining if EOF */
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
244 if(!*buf_size && next == END_NOT_FOUND){
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
245 next= 0;
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
246 }
8d1983254e28 flush remaining data from parser at EOF
michael
parents: 2348
diff changeset
247
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
248 pc->last_index= pc->index;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
249
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
250 /* copy into buffer end return */
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
251 if(next == END_NOT_FOUND){
6534
23b2a64342f2 Return an error when realloc fails.
benoit
parents: 6481
diff changeset
252 void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
253
6534
23b2a64342f2 Return an error when realloc fails.
benoit
parents: 6481
diff changeset
254 if(!new_buffer)
23b2a64342f2 Return an error when realloc fails.
benoit
parents: 6481
diff changeset
255 return AVERROR(ENOMEM);
23b2a64342f2 Return an error when realloc fails.
benoit
parents: 6481
diff changeset
256 pc->buffer = new_buffer;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
257 memcpy(&pc->buffer[pc->index], *buf, *buf_size);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
258 pc->index += *buf_size;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
259 return -1;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
260 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
261
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
262 *buf_size=
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
263 pc->overread_index= pc->index + next;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
264
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
265 /* append to buffer */
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
266 if(pc->index){
6534
23b2a64342f2 Return an error when realloc fails.
benoit
parents: 6481
diff changeset
267 void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
268
6534
23b2a64342f2 Return an error when realloc fails.
benoit
parents: 6481
diff changeset
269 if(!new_buffer)
23b2a64342f2 Return an error when realloc fails.
benoit
parents: 6481
diff changeset
270 return AVERROR(ENOMEM);
23b2a64342f2 Return an error when realloc fails.
benoit
parents: 6481
diff changeset
271 pc->buffer = new_buffer;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
272 memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE );
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
273 pc->index = 0;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
274 *buf= pc->buffer;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
275 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
276
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
277 /* store overread bytes */
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
278 for(;next < 0; next++){
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
279 pc->state = (pc->state<<8) | pc->buffer[pc->last_index + next];
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
280 pc->overread++;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
281 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
282
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
283 #if 0
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
284 if(pc->overread){
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
285 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
286 printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
287 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
288 #endif
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
289
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
290 return 0;
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
291 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
292
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
293 void ff_parse_close(AVCodecParserContext *s)
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
294 {
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
295 ParseContext *pc = s->priv_data;
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
296
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
297 av_free(pc->buffer);
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
298 }
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
299
4150
2205aefb22b7 move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents: 4146
diff changeset
300 void ff_parse1_close(AVCodecParserContext *s)
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
301 {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
302 ParseContext1 *pc1 = s->priv_data;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
303
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
304 av_free(pc1->pc.buffer);
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1987
diff changeset
305 av_free(pc1->enc);
1613
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
306 }
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
307
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
308 /*************************/
0279c6c61f11 new audio/video parser API
bellard
parents:
diff changeset
309
4175
b3328ed50a5e make mpeg4video_split public as ff_mpeg4video_split
stefang
parents: 4150
diff changeset
310 int ff_mpeg4video_split(AVCodecContext *avctx,
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
311 const uint8_t *buf, int buf_size)
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
312 {
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
313 int i;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
314 uint32_t state= -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
315
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
316 for(i=0; i<buf_size; i++){
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
317 state= (state<<8) | buf[i];
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
318 if(state == 0x1B3 || state == 0x1B6)
2777
09108466b7d0 off by 1 error bugfix
michael
parents: 2769
diff changeset
319 return i-3;
2769
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
320 }
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
321 return 0;
1394b45a7bf4 support changing in bitstream global headers into extradata style and back
michael
parents: 2637
diff changeset
322 }