Mercurial > libavformat.hg
annotate utils.c @ 4226:f1974ed2589a libavformat
export ff_avc_parse_nal_units_buf
author | bcoudurier |
---|---|
date | Fri, 16 Jan 2009 01:17:18 +0000 |
parents | c3102b189cb6 |
children | 44f4dca12784 |
rev | line source |
---|---|
0 | 1 /* |
2936 | 2 * various utility functions for use within FFmpeg |
0 | 3 * Copyright (c) 2000, 2001, 2002 Fabrice Bellard |
4 * | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1351
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1351
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1351
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
0 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * License as published by the Free Software Foundation; either | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1351
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
0 | 11 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1351
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
0 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1351
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
887
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 20 */ |
21 #include "avformat.h" | |
3788
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
22 #include "internal.h" |
3286 | 23 #include "libavcodec/opt.h" |
4151 | 24 #include "metadata.h" |
3286 | 25 #include "libavutil/avstring.h" |
2243
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
26 #include "riff.h" |
2266 | 27 #include <sys/time.h> |
28 #include <time.h> | |
3714 | 29 #include <strings.h> |
0 | 30 |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
31 #undef NDEBUG |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
32 #include <assert.h> |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
33 |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
34 /** |
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
35 * @file libavformat/utils.c |
2936 | 36 * various utility functions for use within FFmpeg |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
37 */ |
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
38 |
3701 | 39 unsigned avformat_version(void) |
40 { | |
41 return LIBAVFORMAT_VERSION_INT; | |
42 } | |
43 | |
3703
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
44 /* fraction handling */ |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
45 |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
46 /** |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
47 * f = val + (num / den) + 0.5. |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
48 * |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
49 * 'num' is normalized so that it is such as 0 <= num < den. |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
50 * |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
51 * @param f fractional number |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
52 * @param val integer value |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
53 * @param num must be >= 0 |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
54 * @param den must be >= 1 |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
55 */ |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
56 static void av_frac_init(AVFrac *f, int64_t val, int64_t num, int64_t den) |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
57 { |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
58 num += (den >> 1); |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
59 if (num >= den) { |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
60 val += num / den; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
61 num = num % den; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
62 } |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
63 f->val = val; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
64 f->num = num; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
65 f->den = den; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
66 } |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
67 |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
68 /** |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
69 * Fractional addition to f: f = f + (incr / f->den). |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
70 * |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
71 * @param f fractional number |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
72 * @param incr increment, can be positive or negative |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
73 */ |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
74 static void av_frac_add(AVFrac *f, int64_t incr) |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
75 { |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
76 int64_t num, den; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
77 |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
78 num = f->num + incr; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
79 den = f->den; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
80 if (num < 0) { |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
81 f->val += num / den; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
82 num = num % den; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
83 if (num < 0) { |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
84 num += den; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
85 f->val--; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
86 } |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
87 } else if (num >= den) { |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
88 f->val += num / den; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
89 num = num % den; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
90 } |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
91 f->num = num; |
ff3b10be0cc7
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
stefano
parents:
3701
diff
changeset
|
92 } |
1135
107f90e1551b
cleanup patch from Diego Petten <flameeyes@gentoo.org>
lu_zero
parents:
1127
diff
changeset
|
93 |
2936 | 94 /** head of registered input format linked list */ |
512
8dfd00fb6a6d
Minor Patch for shared libs on Mac OSX by (Bill May <wmay at cisco dot com>)
michael
parents:
511
diff
changeset
|
95 AVInputFormat *first_iformat = NULL; |
2936 | 96 /** head of registered output format linked list */ |
512
8dfd00fb6a6d
Minor Patch for shared libs on Mac OSX by (Bill May <wmay at cisco dot com>)
michael
parents:
511
diff
changeset
|
97 AVOutputFormat *first_oformat = NULL; |
0 | 98 |
2812 | 99 AVInputFormat *av_iformat_next(AVInputFormat *f) |
100 { | |
101 if(f) return f->next; | |
102 else return first_iformat; | |
103 } | |
104 | |
105 AVOutputFormat *av_oformat_next(AVOutputFormat *f) | |
106 { | |
107 if(f) return f->next; | |
108 else return first_oformat; | |
109 } | |
110 | |
0 | 111 void av_register_input_format(AVInputFormat *format) |
112 { | |
113 AVInputFormat **p; | |
114 p = &first_iformat; | |
115 while (*p != NULL) p = &(*p)->next; | |
116 *p = format; | |
117 format->next = NULL; | |
118 } | |
119 | |
120 void av_register_output_format(AVOutputFormat *format) | |
121 { | |
122 AVOutputFormat **p; | |
123 p = &first_oformat; | |
124 while (*p != NULL) p = &(*p)->next; | |
125 *p = format; | |
126 format->next = NULL; | |
127 } | |
128 | |
129 int match_ext(const char *filename, const char *extensions) | |
130 { | |
131 const char *ext, *p; | |
132 char ext1[32], *q; | |
133 | |
453 | 134 if(!filename) |
135 return 0; | |
885 | 136 |
0 | 137 ext = strrchr(filename, '.'); |
138 if (ext) { | |
139 ext++; | |
140 p = extensions; | |
141 for(;;) { | |
142 q = ext1; | |
885 | 143 while (*p != '\0' && *p != ',' && q-ext1<sizeof(ext1)-1) |
0 | 144 *q++ = *p++; |
145 *q = '\0'; | |
885 | 146 if (!strcasecmp(ext1, ext)) |
0 | 147 return 1; |
885 | 148 if (*p == '\0') |
0 | 149 break; |
150 p++; | |
151 } | |
152 } | |
153 return 0; | |
154 } | |
155 | |
885 | 156 AVOutputFormat *guess_format(const char *short_name, const char *filename, |
0 | 157 const char *mime_type) |
158 { | |
159 AVOutputFormat *fmt, *fmt_found; | |
160 int score_max, score; | |
161 | |
20 | 162 /* specific test for image sequences */ |
4206 | 163 #if CONFIG_IMAGE2_MUXER |
885 | 164 if (!short_name && filename && |
1291
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1285
diff
changeset
|
165 av_filename_number_test(filename) && |
583 | 166 av_guess_image2_codec(filename) != CODEC_ID_NONE) { |
167 return guess_format("image2", NULL, NULL); | |
168 } | |
1169 | 169 #endif |
2936 | 170 /* Find the proper file type. */ |
0 | 171 fmt_found = NULL; |
172 score_max = 0; | |
173 fmt = first_oformat; | |
174 while (fmt != NULL) { | |
175 score = 0; | |
176 if (fmt->name && short_name && !strcmp(fmt->name, short_name)) | |
177 score += 100; | |
178 if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type)) | |
179 score += 10; | |
885 | 180 if (filename && fmt->extensions && |
0 | 181 match_ext(filename, fmt->extensions)) { |
182 score += 5; | |
183 } | |
184 if (score > score_max) { | |
185 score_max = score; | |
186 fmt_found = fmt; | |
187 } | |
188 fmt = fmt->next; | |
189 } | |
190 return fmt_found; | |
885 | 191 } |
192 | |
193 AVOutputFormat *guess_stream_format(const char *short_name, const char *filename, | |
0 | 194 const char *mime_type) |
195 { | |
196 AVOutputFormat *fmt = guess_format(short_name, filename, mime_type); | |
197 | |
198 if (fmt) { | |
199 AVOutputFormat *stream_fmt; | |
200 char stream_format_name[64]; | |
201 | |
202 snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", fmt->name); | |
203 stream_fmt = guess_format(stream_format_name, NULL, NULL); | |
204 | |
205 if (stream_fmt) | |
206 fmt = stream_fmt; | |
207 } | |
208 | |
209 return fmt; | |
210 } | |
211 | |
885 | 212 enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, |
583 | 213 const char *filename, const char *mime_type, enum CodecType type){ |
214 if(type == CODEC_TYPE_VIDEO){ | |
215 enum CodecID codec_id= CODEC_ID_NONE; | |
216 | |
4206 | 217 #if CONFIG_IMAGE2_MUXER |
586 | 218 if(!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")){ |
583 | 219 codec_id= av_guess_image2_codec(filename); |
220 } | |
1169 | 221 #endif |
583 | 222 if(codec_id == CODEC_ID_NONE) |
223 codec_id= fmt->video_codec; | |
224 return codec_id; | |
225 }else if(type == CODEC_TYPE_AUDIO) | |
226 return fmt->audio_codec; | |
227 else | |
228 return CODEC_ID_NONE; | |
229 } | |
230 | |
0 | 231 AVInputFormat *av_find_input_format(const char *short_name) |
232 { | |
233 AVInputFormat *fmt; | |
234 for(fmt = first_iformat; fmt != NULL; fmt = fmt->next) { | |
235 if (!strcmp(fmt->name, short_name)) | |
236 return fmt; | |
237 } | |
238 return NULL; | |
239 } | |
240 | |
241 /* memory handling */ | |
242 | |
797
f5a231a9a2f1
support changing in bitstream global headers into extradata style and back
michael
parents:
786
diff
changeset
|
243 void av_destruct_packet(AVPacket *pkt) |
53
fb671d87824e
zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents:
32
diff
changeset
|
244 { |
fb671d87824e
zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents:
32
diff
changeset
|
245 av_free(pkt->data); |
fb671d87824e
zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents:
32
diff
changeset
|
246 pkt->data = NULL; pkt->size = 0; |
fb671d87824e
zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents:
32
diff
changeset
|
247 } |
fb671d87824e
zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents:
32
diff
changeset
|
248 |
2139 | 249 void av_init_packet(AVPacket *pkt) |
250 { | |
251 pkt->pts = AV_NOPTS_VALUE; | |
252 pkt->dts = AV_NOPTS_VALUE; | |
253 pkt->pos = -1; | |
254 pkt->duration = 0; | |
3879 | 255 pkt->convergence_duration = 0; |
2139 | 256 pkt->flags = 0; |
257 pkt->stream_index = 0; | |
258 pkt->destruct= av_destruct_packet_nofree; | |
259 } | |
260 | |
0 | 261 int av_new_packet(AVPacket *pkt, int size) |
262 { | |
1435
3d757766c236
remove gcc warning about void * used in arithmetic
bcoudurier
parents:
1423
diff
changeset
|
263 uint8_t *data; |
639 | 264 if((unsigned)size > (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE) |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2266
diff
changeset
|
265 return AVERROR(ENOMEM); |
639 | 266 data = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); |
53
fb671d87824e
zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents:
32
diff
changeset
|
267 if (!data) |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2266
diff
changeset
|
268 return AVERROR(ENOMEM); |
53
fb671d87824e
zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents:
32
diff
changeset
|
269 memset(data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); |
0 | 270 |
53
fb671d87824e
zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents:
32
diff
changeset
|
271 av_init_packet(pkt); |
885 | 272 pkt->data = data; |
53
fb671d87824e
zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents:
32
diff
changeset
|
273 pkt->size = size; |
fb671d87824e
zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents:
32
diff
changeset
|
274 pkt->destruct = av_destruct_packet; |
0 | 275 return 0; |
276 } | |
277 | |
775 | 278 int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size) |
279 { | |
280 int ret= av_new_packet(pkt, size); | |
281 | |
282 if(ret<0) | |
283 return ret; | |
284 | |
285 pkt->pos= url_ftell(s); | |
286 | |
287 ret= get_buffer(s, pkt->data, size); | |
288 if(ret<=0) | |
289 av_free_packet(pkt); | |
290 else | |
291 pkt->size= ret; | |
292 | |
293 return ret; | |
294 } | |
295 | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
296 int av_dup_packet(AVPacket *pkt) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
297 { |
4183
046a97603352
Do not assume that if pkt->destruct != av_destruct_packet then it is not
lucabe
parents:
4181
diff
changeset
|
298 if (((pkt->destruct == av_destruct_packet_nofree) || (pkt->destruct == NULL)) && pkt->data) { |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
299 uint8_t *data; |
2936 | 300 /* We duplicate the packet and don't forget to add the padding again. */ |
639 | 301 if((unsigned)pkt->size > (unsigned)pkt->size + FF_INPUT_BUFFER_PADDING_SIZE) |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2266
diff
changeset
|
302 return AVERROR(ENOMEM); |
330 | 303 data = av_malloc(pkt->size + FF_INPUT_BUFFER_PADDING_SIZE); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
304 if (!data) { |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2266
diff
changeset
|
305 return AVERROR(ENOMEM); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
306 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
307 memcpy(data, pkt->data, pkt->size); |
330 | 308 memset(data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
309 pkt->data = data; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
310 pkt->destruct = av_destruct_packet; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
311 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
312 return 0; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
313 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
314 |
1291
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1285
diff
changeset
|
315 int av_filename_number_test(const char *filename) |
0 | 316 { |
317 char buf[1024]; | |
1291
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1285
diff
changeset
|
318 return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0); |
0 | 319 } |
320 | |
1956
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
321 static AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max) |
0 | 322 { |
323 AVInputFormat *fmt1, *fmt; | |
1956
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
324 int score; |
0 | 325 |
326 fmt = NULL; | |
327 for(fmt1 = first_iformat; fmt1 != NULL; fmt1 = fmt1->next) { | |
1674
a216ebdce1ff
Demuxers with AVFMT_NOFILE will open a (possibly different) file themselves,
reimar
parents:
1627
diff
changeset
|
328 if (!is_opened == !(fmt1->flags & AVFMT_NOFILE)) |
0 | 329 continue; |
330 score = 0; | |
331 if (fmt1->read_probe) { | |
332 score = fmt1->read_probe(pd); | |
333 } else if (fmt1->extensions) { | |
334 if (match_ext(pd->filename, fmt1->extensions)) { | |
335 score = 50; | |
336 } | |
885 | 337 } |
1956
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
338 if (score > *score_max) { |
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
339 *score_max = score; |
0 | 340 fmt = fmt1; |
3227
5b8e94932999
Do not detect a format if another has the same score.
michael
parents:
3209
diff
changeset
|
341 }else if (score == *score_max) |
5b8e94932999
Do not detect a format if another has the same score.
michael
parents:
3209
diff
changeset
|
342 fmt = NULL; |
0 | 343 } |
344 return fmt; | |
345 } | |
346 | |
1956
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
347 AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened){ |
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
348 int score=0; |
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
349 return av_probe_input_format2(pd, is_opened, &score); |
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
350 } |
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
351 |
3565
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
352 static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score) |
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
353 { |
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
354 AVInputFormat *fmt; |
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
355 fmt = av_probe_input_format2(pd, 1, &score); |
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
356 |
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
357 if (fmt) { |
3777
d4b086282604
When setting codec_id during codec probe we must also set codec_type.
andoma
parents:
3769
diff
changeset
|
358 if (!strcmp(fmt->name, "mp3")) { |
3565
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
359 st->codec->codec_id = CODEC_ID_MP3; |
3777
d4b086282604
When setting codec_id during codec probe we must also set codec_type.
andoma
parents:
3769
diff
changeset
|
360 st->codec->codec_type = CODEC_TYPE_AUDIO; |
d4b086282604
When setting codec_id during codec probe we must also set codec_type.
andoma
parents:
3769
diff
changeset
|
361 } else if (!strcmp(fmt->name, "ac3")) { |
3565
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
362 st->codec->codec_id = CODEC_ID_AC3; |
3777
d4b086282604
When setting codec_id during codec probe we must also set codec_type.
andoma
parents:
3769
diff
changeset
|
363 st->codec->codec_type = CODEC_TYPE_AUDIO; |
d4b086282604
When setting codec_id during codec probe we must also set codec_type.
andoma
parents:
3769
diff
changeset
|
364 } else if (!strcmp(fmt->name, "mpegvideo")) { |
3571 | 365 st->codec->codec_id = CODEC_ID_MPEG2VIDEO; |
3777
d4b086282604
When setting codec_id during codec probe we must also set codec_type.
andoma
parents:
3769
diff
changeset
|
366 st->codec->codec_type = CODEC_TYPE_VIDEO; |
3867 | 367 } else if (!strcmp(fmt->name, "m4v")) { |
368 st->codec->codec_id = CODEC_ID_MPEG4; | |
369 st->codec->codec_type = CODEC_TYPE_VIDEO; | |
3777
d4b086282604
When setting codec_id during codec probe we must also set codec_type.
andoma
parents:
3769
diff
changeset
|
370 } else if (!strcmp(fmt->name, "h264")) { |
3571 | 371 st->codec->codec_id = CODEC_ID_H264; |
3777
d4b086282604
When setting codec_id during codec probe we must also set codec_type.
andoma
parents:
3769
diff
changeset
|
372 st->codec->codec_type = CODEC_TYPE_VIDEO; |
d4b086282604
When setting codec_id during codec probe we must also set codec_type.
andoma
parents:
3769
diff
changeset
|
373 } |
3565
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
374 } |
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
375 return !!fmt; |
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
376 } |
b3e976d080cd
Move set_codec_from_probe_data() up to where the other probe functions are.
michael
parents:
3564
diff
changeset
|
377 |
0 | 378 /************************************************************/ |
379 /* input media file */ | |
380 | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
381 /** |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
382 * Open a media file from an IO stream. 'fmt' must be specified. |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
383 */ |
885 | 384 int av_open_input_stream(AVFormatContext **ic_ptr, |
385 ByteIOContext *pb, const char *filename, | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
386 AVInputFormat *fmt, AVFormatParameters *ap) |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
387 { |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
388 int err; |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
389 AVFormatContext *ic; |
1003 | 390 AVFormatParameters default_ap; |
391 | |
392 if(!ap){ | |
393 ap=&default_ap; | |
394 memset(ap, 0, sizeof(default_ap)); | |
395 } | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
396 |
1278 | 397 if(!ap->prealloced_context) |
398 ic = av_alloc_format_context(); | |
399 else | |
400 ic = *ic_ptr; | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
401 if (!ic) { |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2266
diff
changeset
|
402 err = AVERROR(ENOMEM); |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
403 goto fail; |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
404 } |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
405 ic->iformat = fmt; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
406 ic->pb = pb; |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
407 ic->duration = AV_NOPTS_VALUE; |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
408 ic->start_time = AV_NOPTS_VALUE; |
2189 | 409 av_strlcpy(ic->filename, filename, sizeof(ic->filename)); |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
410 |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
411 /* allocate private data */ |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
412 if (fmt->priv_data_size > 0) { |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
413 ic->priv_data = av_mallocz(fmt->priv_data_size); |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
414 if (!ic->priv_data) { |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2266
diff
changeset
|
415 err = AVERROR(ENOMEM); |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
416 goto fail; |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
417 } |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
418 } else { |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
419 ic->priv_data = NULL; |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
420 } |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
421 |
3536
231f0db9672f
Allow NULL for read_header in AVInputFormat. See discussion in "[PATCH] allow
rbultje
parents:
3525
diff
changeset
|
422 if (ic->iformat->read_header) { |
3537
f02643ff8be2
Reindent after r14059, see "[PATCH] allow empty params for
rbultje
parents:
3536
diff
changeset
|
423 err = ic->iformat->read_header(ic, ap); |
f02643ff8be2
Reindent after r14059, see "[PATCH] allow empty params for
rbultje
parents:
3536
diff
changeset
|
424 if (err < 0) |
f02643ff8be2
Reindent after r14059, see "[PATCH] allow empty params for
rbultje
parents:
3536
diff
changeset
|
425 goto fail; |
3536
231f0db9672f
Allow NULL for read_header in AVInputFormat. See discussion in "[PATCH] allow
rbultje
parents:
3525
diff
changeset
|
426 } |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
427 |
1478 | 428 if (pb && !ic->data_offset) |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
429 ic->data_offset = url_ftell(ic->pb); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
430 |
4179
c32a783ff374
Add a second metadata compatibility layer, so that metadata that gets
aurel
parents:
4172
diff
changeset
|
431 #if LIBAVFORMAT_VERSION_MAJOR < 53 |
c32a783ff374
Add a second metadata compatibility layer, so that metadata that gets
aurel
parents:
4172
diff
changeset
|
432 ff_metadata_demux_compat(ic); |
c32a783ff374
Add a second metadata compatibility layer, so that metadata that gets
aurel
parents:
4172
diff
changeset
|
433 #endif |
c32a783ff374
Add a second metadata compatibility layer, so that metadata that gets
aurel
parents:
4172
diff
changeset
|
434 |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
435 *ic_ptr = ic; |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
436 return 0; |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
437 fail: |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
438 if (ic) { |
3486 | 439 int i; |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
440 av_freep(&ic->priv_data); |
3486 | 441 for(i=0;i<ic->nb_streams;i++) { |
442 AVStream *st = ic->streams[i]; | |
443 if (st) { | |
444 av_free(st->priv_data); | |
445 av_free(st->codec->extradata); | |
446 } | |
447 av_free(st); | |
448 } | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
449 } |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
450 av_free(ic); |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
451 *ic_ptr = NULL; |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
452 return err; |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
453 } |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
454 |
2936 | 455 /** size of probe buffer, for guessing file type from file contents */ |
922
7f20b3ce1100
dynamically increase probe buffer until format is detected
michael
parents:
915
diff
changeset
|
456 #define PROBE_BUF_MIN 2048 |
1111 | 457 #define PROBE_BUF_MAX (1<<20) |
0 | 458 |
885 | 459 int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, |
0 | 460 AVInputFormat *fmt, |
461 int buf_size, | |
462 AVFormatParameters *ap) | |
463 { | |
2829 | 464 int err, probe_size; |
0 | 465 AVProbeData probe_data, *pd = &probe_data; |
2829 | 466 ByteIOContext *pb = NULL; |
467 | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
468 pd->filename = ""; |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
469 if (filename) |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
470 pd->filename = filename; |
922
7f20b3ce1100
dynamically increase probe buffer until format is detected
michael
parents:
915
diff
changeset
|
471 pd->buf = NULL; |
0 | 472 pd->buf_size = 0; |
473 | |
474 if (!fmt) { | |
2936 | 475 /* guess format if no file can be opened */ |
0 | 476 fmt = av_probe_input_format(pd, 0); |
477 } | |
478 | |
2936 | 479 /* Do not open file if the format does not need it. XXX: specific |
172 | 480 hack needed to handle RTSP/TCP */ |
2829 | 481 if (!fmt || !(fmt->flags & AVFMT_NOFILE)) { |
20 | 482 /* if no file needed do not try to open one */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
483 if ((err=url_fopen(&pb, filename, URL_RDONLY)) < 0) { |
0 | 484 goto fail; |
485 } | |
486 if (buf_size > 0) { | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
487 url_setbufsize(pb, buf_size); |
0 | 488 } |
922
7f20b3ce1100
dynamically increase probe buffer until format is detected
michael
parents:
915
diff
changeset
|
489 |
7f20b3ce1100
dynamically increase probe buffer until format is detected
michael
parents:
915
diff
changeset
|
490 for(probe_size= PROBE_BUF_MIN; probe_size<=PROBE_BUF_MAX && !fmt; probe_size<<=1){ |
1956
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
491 int score= probe_size < PROBE_BUF_MAX ? AVPROBE_SCORE_MAX/4 : 0; |
0 | 492 /* read probe data */ |
2001
1a3c9056982a
allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks
michael
parents:
1984
diff
changeset
|
493 pd->buf= av_realloc(pd->buf, probe_size + AVPROBE_PADDING_SIZE); |
922
7f20b3ce1100
dynamically increase probe buffer until format is detected
michael
parents:
915
diff
changeset
|
494 pd->buf_size = get_buffer(pb, pd->buf, probe_size); |
2417
70b45051aef6
fix probe buffer issue. patch by Wolfram Gloger {wmglo at dent.med.uni-muenchen.de}.
jbr
parents:
2401
diff
changeset
|
495 memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE); |
1824 | 496 if (url_fseek(pb, 0, SEEK_SET) < 0) { |
502
813b0119a98e
ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents:
497
diff
changeset
|
497 url_fclose(pb); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
498 if (url_fopen(&pb, filename, URL_RDONLY) < 0) { |
2829 | 499 pb = NULL; |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
500 err = AVERROR(EIO); |
502
813b0119a98e
ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents:
497
diff
changeset
|
501 goto fail; |
813b0119a98e
ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents:
497
diff
changeset
|
502 } |
813b0119a98e
ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents:
497
diff
changeset
|
503 } |
922
7f20b3ce1100
dynamically increase probe buffer until format is detected
michael
parents:
915
diff
changeset
|
504 /* guess file format */ |
1956
a60ed230798e
require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
michael
parents:
1941
diff
changeset
|
505 fmt = av_probe_input_format2(pd, 1, &score); |
0 | 506 } |
922
7f20b3ce1100
dynamically increase probe buffer until format is detected
michael
parents:
915
diff
changeset
|
507 av_freep(&pd->buf); |
0 | 508 } |
509 | |
510 /* if still no format found, error */ | |
511 if (!fmt) { | |
512 err = AVERROR_NOFMT; | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
513 goto fail; |
0 | 514 } |
885 | 515 |
2936 | 516 /* check filename in case an image number is expected */ |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
517 if (fmt->flags & AVFMT_NEEDNUMBER) { |
1291
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1285
diff
changeset
|
518 if (!av_filename_number_test(filename)) { |
20 | 519 err = AVERROR_NUMEXPECTED; |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
520 goto fail; |
20 | 521 } |
522 } | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
523 err = av_open_input_stream(ic_ptr, pb, filename, fmt, ap); |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
524 if (err) |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
525 goto fail; |
0 | 526 return 0; |
527 fail: | |
922
7f20b3ce1100
dynamically increase probe buffer until format is detected
michael
parents:
915
diff
changeset
|
528 av_freep(&pd->buf); |
2829 | 529 if (pb) |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
530 url_fclose(pb); |
0 | 531 *ic_ptr = NULL; |
532 return err; | |
885 | 533 |
0 | 534 } |
535 | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
536 /*******************************************************/ |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
537 |
3698
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
538 static AVPacket *add_to_pktbuf(AVPacketList **packet_buffer, AVPacket *pkt, |
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
539 AVPacketList **plast_pktl){ |
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
540 AVPacketList *pktl = av_mallocz(sizeof(AVPacketList)); |
3566
77a07b9dbe98
Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
michael
parents:
3565
diff
changeset
|
541 if (!pktl) |
77a07b9dbe98
Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
michael
parents:
3565
diff
changeset
|
542 return NULL; |
77a07b9dbe98
Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
michael
parents:
3565
diff
changeset
|
543 |
3698
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
544 if (*packet_buffer) |
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
545 (*plast_pktl)->next = pktl; |
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
546 else |
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
547 *packet_buffer = pktl; |
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
548 |
3566
77a07b9dbe98
Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
michael
parents:
3565
diff
changeset
|
549 /* add the packet in the buffered packet list */ |
77a07b9dbe98
Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
michael
parents:
3565
diff
changeset
|
550 *plast_pktl = pktl; |
77a07b9dbe98
Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
michael
parents:
3565
diff
changeset
|
551 pktl->pkt= *pkt; |
77a07b9dbe98
Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
michael
parents:
3565
diff
changeset
|
552 return &pktl->pkt; |
77a07b9dbe98
Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
michael
parents:
3565
diff
changeset
|
553 } |
77a07b9dbe98
Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
michael
parents:
3565
diff
changeset
|
554 |
0 | 555 int av_read_packet(AVFormatContext *s, AVPacket *pkt) |
556 { | |
2832 | 557 int ret; |
558 AVStream *st; | |
3568 | 559 |
560 for(;;){ | |
561 AVPacketList *pktl = s->raw_packet_buffer; | |
562 | |
563 if (pktl) { | |
564 *pkt = pktl->pkt; | |
565 if(s->streams[pkt->stream_index]->codec->codec_id != CODEC_ID_PROBE){ | |
566 s->raw_packet_buffer = pktl->next; | |
567 av_free(pktl); | |
568 return 0; | |
569 } | |
570 } | |
571 | |
3569 | 572 av_init_packet(pkt); |
573 ret= s->iformat->read_packet(s, pkt); | |
574 if (ret < 0) | |
575 return ret; | |
576 st= s->streams[pkt->stream_index]; | |
2832 | 577 |
3569 | 578 switch(st->codec->codec_type){ |
579 case CODEC_TYPE_VIDEO: | |
580 if(s->video_codec_id) st->codec->codec_id= s->video_codec_id; | |
581 break; | |
582 case CODEC_TYPE_AUDIO: | |
583 if(s->audio_codec_id) st->codec->codec_id= s->audio_codec_id; | |
584 break; | |
585 case CODEC_TYPE_SUBTITLE: | |
586 if(s->subtitle_codec_id)st->codec->codec_id= s->subtitle_codec_id; | |
587 break; | |
588 } | |
2832 | 589 |
3582
813a493658ee
Move the codec_id overriding at a slightly better place.
michael
parents:
3581
diff
changeset
|
590 if(!pktl && st->codec->codec_id!=CODEC_ID_PROBE) |
813a493658ee
Move the codec_id overriding at a slightly better place.
michael
parents:
3581
diff
changeset
|
591 return ret; |
813a493658ee
Move the codec_id overriding at a slightly better place.
michael
parents:
3581
diff
changeset
|
592 |
3698
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
593 add_to_pktbuf(&s->raw_packet_buffer, pkt, &s->raw_packet_buffer_end); |
3582
813a493658ee
Move the codec_id overriding at a slightly better place.
michael
parents:
3581
diff
changeset
|
594 |
3568 | 595 if(st->codec->codec_id == CODEC_ID_PROBE){ |
596 AVProbeData *pd = &st->probe_data; | |
597 | |
598 pd->buf = av_realloc(pd->buf, pd->buf_size+pkt->size+AVPROBE_PADDING_SIZE); | |
599 memcpy(pd->buf+pd->buf_size, pkt->data, pkt->size); | |
600 pd->buf_size += pkt->size; | |
601 memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE); | |
602 | |
3572
3f345a61cef0
Only try to probe the codec when the available data has roughly doubled
michael
parents:
3571
diff
changeset
|
603 if(av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){ |
3573 | 604 set_codec_from_probe_data(st, pd, 1); |
605 if(st->codec->codec_id != CODEC_ID_PROBE){ | |
606 pd->buf_size=0; | |
607 av_freep(&pd->buf); | |
608 } | |
3572
3f345a61cef0
Only try to probe the codec when the available data has roughly doubled
michael
parents:
3571
diff
changeset
|
609 } |
3568 | 610 } |
611 } | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
612 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
613 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
614 /**********************************************************/ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
615 |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
616 /** |
2936 | 617 * Get the number of samples of an audio frame. Return -1 on error. |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
618 */ |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
619 static int get_audio_frame_size(AVCodecContext *enc, int size) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
620 { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
621 int frame_size; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
622 |
3501
efcdb01aa0bf
We cannot calculate the duration of vorbis packets even if we do know the
michael
parents:
3499
diff
changeset
|
623 if(enc->codec_id == CODEC_ID_VORBIS) |
efcdb01aa0bf
We cannot calculate the duration of vorbis packets even if we do know the
michael
parents:
3499
diff
changeset
|
624 return -1; |
efcdb01aa0bf
We cannot calculate the duration of vorbis packets even if we do know the
michael
parents:
3499
diff
changeset
|
625 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
626 if (enc->frame_size <= 1) { |
1158 | 627 int bits_per_sample = av_get_bits_per_sample(enc->codec_id); |
628 | |
629 if (bits_per_sample) { | |
846
fd1c2109505e
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
842
diff
changeset
|
630 if (enc->channels == 0) |
fd1c2109505e
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
842
diff
changeset
|
631 return -1; |
1160 | 632 frame_size = (size << 3) / (bits_per_sample * enc->channels); |
1158 | 633 } else { |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
634 /* used for example by ADPCM codecs */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
635 if (enc->bit_rate == 0) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
636 return -1; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
637 frame_size = (size * 8 * enc->sample_rate) / enc->bit_rate; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
638 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
639 } else { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
640 frame_size = enc->frame_size; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
641 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
642 return frame_size; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
643 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
644 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
645 |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
646 /** |
2936 | 647 * Return the frame duration in seconds. Return 0 if not available. |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
648 */ |
885 | 649 static void compute_frame_duration(int *pnum, int *pden, AVStream *st, |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
650 AVCodecParserContext *pc, AVPacket *pkt) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
651 { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
652 int frame_size; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
653 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
654 *pnum = 0; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
655 *pden = 0; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
656 switch(st->codec->codec_type) { |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
657 case CODEC_TYPE_VIDEO: |
757 | 658 if(st->time_base.num*1000LL > st->time_base.den){ |
743 | 659 *pnum = st->time_base.num; |
660 *pden = st->time_base.den; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
661 }else if(st->codec->time_base.num*1000LL > st->codec->time_base.den){ |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
662 *pnum = st->codec->time_base.num; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
663 *pden = st->codec->time_base.den; |
747
95c9cef3c3db
prefer container time_base for frame duration guess
michael
parents:
743
diff
changeset
|
664 if (pc && pc->repeat_pict) { |
95c9cef3c3db
prefer container time_base for frame duration guess
michael
parents:
743
diff
changeset
|
665 *pden *= 2; |
95c9cef3c3db
prefer container time_base for frame duration guess
michael
parents:
743
diff
changeset
|
666 *pnum = (*pnum) * (2 + pc->repeat_pict); |
95c9cef3c3db
prefer container time_base for frame duration guess
michael
parents:
743
diff
changeset
|
667 } |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
668 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
669 break; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
670 case CODEC_TYPE_AUDIO: |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
671 frame_size = get_audio_frame_size(st->codec, pkt->size); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
672 if (frame_size < 0) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
673 break; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
674 *pnum = frame_size; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
675 *pden = st->codec->sample_rate; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
676 break; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
677 default: |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
678 break; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
679 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
680 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
681 |
570
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
682 static int is_intra_only(AVCodecContext *enc){ |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
683 if(enc->codec_type == CODEC_TYPE_AUDIO){ |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
684 return 1; |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
685 }else if(enc->codec_type == CODEC_TYPE_VIDEO){ |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
686 switch(enc->codec_id){ |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
687 case CODEC_ID_MJPEG: |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
688 case CODEC_ID_MJPEGB: |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
689 case CODEC_ID_LJPEG: |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
690 case CODEC_ID_RAWVIDEO: |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
691 case CODEC_ID_DVVIDEO: |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
692 case CODEC_ID_HUFFYUV: |
599 | 693 case CODEC_ID_FFVHUFF: |
570
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
694 case CODEC_ID_ASV1: |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
695 case CODEC_ID_ASV2: |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
696 case CODEC_ID_VCR1: |
4003 | 697 case CODEC_ID_DNXHD: |
570
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
698 return 1; |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
699 default: break; |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
700 } |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
701 } |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
702 return 0; |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
703 } |
d82ccc7cff1c
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents:
563
diff
changeset
|
704 |
2421
b08793768c30
If a stream has no start time, but the first packet has a 'pts', use that
benoit
parents:
2417
diff
changeset
|
705 static void update_initial_timestamps(AVFormatContext *s, int stream_index, |
b08793768c30
If a stream has no start time, but the first packet has a 'pts', use that
benoit
parents:
2417
diff
changeset
|
706 int64_t dts, int64_t pts) |
b08793768c30
If a stream has no start time, but the first packet has a 'pts', use that
benoit
parents:
2417
diff
changeset
|
707 { |
2300
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
708 AVStream *st= s->streams[stream_index]; |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
709 AVPacketList *pktl= s->packet_buffer; |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
710 |
3554 | 711 if(st->first_dts != AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE || st->cur_dts == AV_NOPTS_VALUE) |
2300
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
712 return; |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
713 |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
714 st->first_dts= dts - st->cur_dts; |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
715 st->cur_dts= dts; |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
716 |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
717 for(; pktl; pktl= pktl->next){ |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
718 if(pktl->pkt.stream_index != stream_index) |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
719 continue; |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
720 //FIXME think more about this check |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
721 if(pktl->pkt.pts != AV_NOPTS_VALUE && pktl->pkt.pts == pktl->pkt.dts) |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
722 pktl->pkt.pts += st->first_dts; |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
723 |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
724 if(pktl->pkt.dts != AV_NOPTS_VALUE) |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
725 pktl->pkt.dts += st->first_dts; |
2301
45a6610e6a4f
set a more reasonable start_time if the first timestamps are AV_NOPTS_VALUE
michael
parents:
2300
diff
changeset
|
726 |
45a6610e6a4f
set a more reasonable start_time if the first timestamps are AV_NOPTS_VALUE
michael
parents:
2300
diff
changeset
|
727 if(st->start_time == AV_NOPTS_VALUE && pktl->pkt.pts != AV_NOPTS_VALUE) |
45a6610e6a4f
set a more reasonable start_time if the first timestamps are AV_NOPTS_VALUE
michael
parents:
2300
diff
changeset
|
728 st->start_time= pktl->pkt.pts; |
2300
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
729 } |
2421
b08793768c30
If a stream has no start time, but the first packet has a 'pts', use that
benoit
parents:
2417
diff
changeset
|
730 if (st->start_time == AV_NOPTS_VALUE) |
b08793768c30
If a stream has no start time, but the first packet has a 'pts', use that
benoit
parents:
2417
diff
changeset
|
731 st->start_time = pts; |
2300
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
732 } |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
733 |
3048
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
734 static void update_initial_durations(AVFormatContext *s, AVStream *st, AVPacket *pkt) |
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
735 { |
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
736 AVPacketList *pktl= s->packet_buffer; |
3418
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
737 int64_t cur_dts= 0; |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
738 |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
739 if(st->first_dts != AV_NOPTS_VALUE){ |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
740 cur_dts= st->first_dts; |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
741 for(; pktl; pktl= pktl->next){ |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
742 if(pktl->pkt.stream_index == pkt->stream_index){ |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
743 if(pktl->pkt.pts != pktl->pkt.dts || pktl->pkt.dts != AV_NOPTS_VALUE || pktl->pkt.duration) |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
744 break; |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
745 cur_dts -= pkt->duration; |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
746 } |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
747 } |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
748 pktl= s->packet_buffer; |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
749 st->first_dts = cur_dts; |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
750 }else if(st->cur_dts) |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
751 return; |
3048
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
752 |
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
753 for(; pktl; pktl= pktl->next){ |
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
754 if(pktl->pkt.stream_index != pkt->stream_index) |
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
755 continue; |
3056
4ce8908f4593
Get rid of a fake timestamp discontinuity at the begin of V.VOB.
michael
parents:
3055
diff
changeset
|
756 if(pktl->pkt.pts == pktl->pkt.dts && pktl->pkt.dts == AV_NOPTS_VALUE |
4ce8908f4593
Get rid of a fake timestamp discontinuity at the begin of V.VOB.
michael
parents:
3055
diff
changeset
|
757 && !pktl->pkt.duration){ |
3418
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
758 pktl->pkt.dts= cur_dts; |
3417
e38326ffbb5e
Do not set pts in update_initial_durations() if stream has b frames.
michael
parents:
3412
diff
changeset
|
759 if(!st->codec->has_b_frames) |
3418
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
760 pktl->pkt.pts= cur_dts; |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
761 cur_dts += pkt->duration; |
3048
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
762 pktl->pkt.duration= pkt->duration; |
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
763 }else |
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
764 break; |
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
765 } |
3418
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
766 if(st->first_dts == AV_NOPTS_VALUE) |
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
767 st->cur_dts= cur_dts; |
3048
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
768 } |
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
769 |
885 | 770 static void compute_pkt_fields(AVFormatContext *s, AVStream *st, |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
771 AVCodecParserContext *pc, AVPacket *pkt) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
772 { |
1927 | 773 int num, den, presentation_delayed, delay, i; |
2020 | 774 int64_t offset; |
885 | 775 |
3999
19dbf5d63f15
Move code setting delay and presentation_delayed a little up so
michael
parents:
3973
diff
changeset
|
776 /* do we have a video B-frame ? */ |
19dbf5d63f15
Move code setting delay and presentation_delayed a little up so
michael
parents:
3973
diff
changeset
|
777 delay= st->codec->has_b_frames; |
19dbf5d63f15
Move code setting delay and presentation_delayed a little up so
michael
parents:
3973
diff
changeset
|
778 presentation_delayed = 0; |
19dbf5d63f15
Move code setting delay and presentation_delayed a little up so
michael
parents:
3973
diff
changeset
|
779 /* XXX: need has_b_frame, but cannot get it if the codec is |
19dbf5d63f15
Move code setting delay and presentation_delayed a little up so
michael
parents:
3973
diff
changeset
|
780 not initialized */ |
19dbf5d63f15
Move code setting delay and presentation_delayed a little up so
michael
parents:
3973
diff
changeset
|
781 if (delay && |
19dbf5d63f15
Move code setting delay and presentation_delayed a little up so
michael
parents:
3973
diff
changeset
|
782 pc && pc->pict_type != FF_B_TYPE) |
19dbf5d63f15
Move code setting delay and presentation_delayed a little up so
michael
parents:
3973
diff
changeset
|
783 presentation_delayed = 1; |
19dbf5d63f15
Move code setting delay and presentation_delayed a little up so
michael
parents:
3973
diff
changeset
|
784 |
2295
09176aa7014c
deal with the case where one of pts,dts has wrapped but the other has not
michael
parents:
2294
diff
changeset
|
785 if(pkt->pts != AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && pkt->dts > pkt->pts && st->pts_wrap_bits<63 |
09176aa7014c
deal with the case where one of pts,dts has wrapped but the other has not
michael
parents:
2294
diff
changeset
|
786 /*&& pkt->dts-(1LL<<st->pts_wrap_bits) < pkt->pts*/){ |
09176aa7014c
deal with the case where one of pts,dts has wrapped but the other has not
michael
parents:
2294
diff
changeset
|
787 pkt->dts -= 1LL<<st->pts_wrap_bits; |
09176aa7014c
deal with the case where one of pts,dts has wrapped but the other has not
michael
parents:
2294
diff
changeset
|
788 } |
09176aa7014c
deal with the case where one of pts,dts has wrapped but the other has not
michael
parents:
2294
diff
changeset
|
789 |
4000
f0580597dc48
Check for pts==dts on I/P frames in the presence of non low delay decoding and
michael
parents:
3999
diff
changeset
|
790 // some mpeg2 in mpeg-ps lack dts (issue171 / input_file.mpg) |
f0580597dc48
Check for pts==dts on I/P frames in the presence of non low delay decoding and
michael
parents:
3999
diff
changeset
|
791 // we take the conservative approach and discard both |
f0580597dc48
Check for pts==dts on I/P frames in the presence of non low delay decoding and
michael
parents:
3999
diff
changeset
|
792 // Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly. |
f0580597dc48
Check for pts==dts on I/P frames in the presence of non low delay decoding and
michael
parents:
3999
diff
changeset
|
793 if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){ |
f0580597dc48
Check for pts==dts on I/P frames in the presence of non low delay decoding and
michael
parents:
3999
diff
changeset
|
794 av_log(s, AV_LOG_ERROR, "invalid dts/pts combination\n"); |
f0580597dc48
Check for pts==dts on I/P frames in the presence of non low delay decoding and
michael
parents:
3999
diff
changeset
|
795 pkt->dts= pkt->pts= AV_NOPTS_VALUE; |
f0580597dc48
Check for pts==dts on I/P frames in the presence of non low delay decoding and
michael
parents:
3999
diff
changeset
|
796 } |
f0580597dc48
Check for pts==dts on I/P frames in the presence of non low delay decoding and
michael
parents:
3999
diff
changeset
|
797 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
798 if (pkt->duration == 0) { |
470 | 799 compute_frame_duration(&num, &den, st, pc, pkt); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
800 if (den && num) { |
464 | 801 pkt->duration = av_rescale(1, num * (int64_t)st->time_base.den, den * (int64_t)st->time_base.num); |
3048
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
802 |
3418
1e1c7967ba6c
Make update_initial_durations() also work if a dts occured before a
michael
parents:
3417
diff
changeset
|
803 if(pkt->duration != 0 && s->packet_buffer) |
3048
a100291d922c
Fix timestamps and durations if the first packets have no durations nor timestamps,
michael
parents:
3002
diff
changeset
|
804 update_initial_durations(s, st, pkt); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
805 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
806 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
807 |
2936 | 808 /* correct timestamps with byte offset if demuxers only have timestamps |
809 on packet boundaries */ | |
2020 | 810 if(pc && st->need_parsing == AVSTREAM_PARSE_TIMESTAMPS && pkt->size){ |
811 /* this will estimate bitrate based on this frame's duration and size */ | |
812 offset = av_rescale(pc->offset, pkt->duration, pkt->size); | |
813 if(pkt->pts != AV_NOPTS_VALUE) | |
814 pkt->pts += offset; | |
815 if(pkt->dts != AV_NOPTS_VALUE) | |
816 pkt->dts += offset; | |
817 } | |
818 | |
2164 | 819 /* This may be redundant, but it should not hurt. */ |
1928 | 820 if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts > pkt->dts) |
821 presentation_delayed = 1; | |
885 | 822 |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1442
diff
changeset
|
823 // av_log(NULL, AV_LOG_DEBUG, "IN delayed:%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64" st:%d pc:%p\n", presentation_delayed, pkt->pts, pkt->dts, st->cur_dts, pkt->stream_index, pc); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
824 /* interpolate PTS and DTS if they are not present */ |
3376
7db242158d51
Do not use the pts/dts calculation code which needs a parser, when no parser
michael
parents:
3341
diff
changeset
|
825 if(delay==0 || (delay==1 && pc)){ |
1928 | 826 if (presentation_delayed) { |
2936 | 827 /* DTS = decompression timestamp */ |
828 /* PTS = presentation timestamp */ | |
1928 | 829 if (pkt->dts == AV_NOPTS_VALUE) |
3058 | 830 pkt->dts = st->last_IP_pts; |
2421
b08793768c30
If a stream has no start time, but the first packet has a 'pts', use that
benoit
parents:
2417
diff
changeset
|
831 update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts); |
1928 | 832 if (pkt->dts == AV_NOPTS_VALUE) |
833 pkt->dts = st->cur_dts; | |
1925 | 834 |
1928 | 835 /* this is tricky: the dts must be incremented by the duration |
2936 | 836 of the frame we are displaying, i.e. the last I- or P-frame */ |
3058 | 837 if (st->last_IP_duration == 0) |
838 st->last_IP_duration = pkt->duration; | |
3554 | 839 if(pkt->dts != AV_NOPTS_VALUE) |
3555 | 840 st->cur_dts = pkt->dts + st->last_IP_duration; |
3058 | 841 st->last_IP_duration = pkt->duration; |
842 st->last_IP_pts= pkt->pts; | |
1928 | 843 /* cannot compute PTS if not present (we can compute it only |
2936 | 844 by knowing the future */ |
1936 | 845 } else if(pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE || pkt->duration){ |
1928 | 846 if(pkt->pts != AV_NOPTS_VALUE && pkt->duration){ |
847 int64_t old_diff= FFABS(st->cur_dts - pkt->duration - pkt->pts); | |
848 int64_t new_diff= FFABS(st->cur_dts - pkt->pts); | |
849 if(old_diff < new_diff && old_diff < (pkt->duration>>3)){ | |
850 pkt->pts += pkt->duration; | |
851 // av_log(NULL, AV_LOG_DEBUG, "id:%d old:%"PRId64" new:%"PRId64" dur:%d cur:%"PRId64" size:%d\n", pkt->stream_index, old_diff, new_diff, pkt->duration, st->cur_dts, pkt->size); | |
852 } | |
618 | 853 } |
1928 | 854 |
855 /* presentation is not delayed : PTS and DTS are the same */ | |
856 if(pkt->pts == AV_NOPTS_VALUE) | |
857 pkt->pts = pkt->dts; | |
2421
b08793768c30
If a stream has no start time, but the first packet has a 'pts', use that
benoit
parents:
2417
diff
changeset
|
858 update_initial_timestamps(s, pkt->stream_index, pkt->pts, pkt->pts); |
1928 | 859 if(pkt->pts == AV_NOPTS_VALUE) |
860 pkt->pts = st->cur_dts; | |
861 pkt->dts = pkt->pts; | |
3554 | 862 if(pkt->pts != AV_NOPTS_VALUE) |
3555 | 863 st->cur_dts = pkt->pts + pkt->duration; |
618 | 864 } |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
865 } |
1927 | 866 |
3710
48a262da0100
Prevent dts generation code to be executed when delay is > MAX_REORDER_DELAY,
bcoudurier
parents:
3703
diff
changeset
|
867 if(pkt->pts != AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY){ |
1927 | 868 st->pts_buffer[0]= pkt->pts; |
869 for(i=0; i<delay && st->pts_buffer[i] > st->pts_buffer[i+1]; i++) | |
870 FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]); | |
871 if(pkt->dts == AV_NOPTS_VALUE) | |
872 pkt->dts= st->pts_buffer[0]; | |
2300
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
873 if(delay>1){ |
2421
b08793768c30
If a stream has no start time, but the first packet has a 'pts', use that
benoit
parents:
2417
diff
changeset
|
874 update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts); // this should happen on the first packet |
2300
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
875 } |
1927 | 876 if(pkt->dts > st->cur_dts) |
877 st->cur_dts = pkt->dts; | |
878 } | |
879 | |
880 // av_log(NULL, AV_LOG_ERROR, "OUTdelayed:%d/%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64"\n", presentation_delayed, delay, pkt->pts, pkt->dts, st->cur_dts); | |
885 | 881 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
882 /* update flags */ |
2666
1995444f6267
Move setting of key frame flag for intra-only codecs, ignoring key frame
heydowns
parents:
2658
diff
changeset
|
883 if(is_intra_only(st->codec)) |
1995444f6267
Move setting of key frame flag for intra-only codecs, ignoring key frame
heydowns
parents:
2658
diff
changeset
|
884 pkt->flags |= PKT_FLAG_KEY; |
1995444f6267
Move setting of key frame flag for intra-only codecs, ignoring key frame
heydowns
parents:
2658
diff
changeset
|
885 else if (pc) { |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
886 pkt->flags = 0; |
2936 | 887 /* keyframe computation */ |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
888 if (pc->pict_type == FF_I_TYPE) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
889 pkt->flags |= PKT_FLAG_KEY; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
890 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
891 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
892 |
535 | 893 void av_destruct_packet_nofree(AVPacket *pkt) |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
894 { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
895 pkt->data = NULL; pkt->size = 0; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
896 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
897 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
898 static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
899 { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
900 AVStream *st; |
333 | 901 int len, ret, i; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
902 |
2032 | 903 av_init_packet(pkt); |
904 | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
905 for(;;) { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
906 /* select current input stream component */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
907 st = s->cur_st; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
908 if (st) { |
797
f5a231a9a2f1
support changing in bitstream global headers into extradata style and back
michael
parents:
786
diff
changeset
|
909 if (!st->need_parsing || !st->parser) { |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
910 /* no parsing needed: we just output the packet as is */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
911 /* raw data support */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
912 *pkt = s->cur_pkt; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
913 compute_pkt_fields(s, st, NULL, pkt); |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
914 s->cur_st = NULL; |
1244 | 915 break; |
708 | 916 } else if (s->cur_len > 0 && st->discard < AVDISCARD_ALL) { |
885 | 917 len = av_parser_parse(st->parser, st->codec, &pkt->data, &pkt->size, |
334
7f089db11f9a
fixed incorrect PTS/DTS logic in MPEG video case (caused rare PTS glitches if start codes were between two PES packets)
bellard
parents:
333
diff
changeset
|
918 s->cur_ptr, s->cur_len, |
7f089db11f9a
fixed incorrect PTS/DTS logic in MPEG video case (caused rare PTS glitches if start codes were between two PES packets)
bellard
parents:
333
diff
changeset
|
919 s->cur_pkt.pts, s->cur_pkt.dts); |
7f089db11f9a
fixed incorrect PTS/DTS logic in MPEG video case (caused rare PTS glitches if start codes were between two PES packets)
bellard
parents:
333
diff
changeset
|
920 s->cur_pkt.pts = AV_NOPTS_VALUE; |
7f089db11f9a
fixed incorrect PTS/DTS logic in MPEG video case (caused rare PTS glitches if start codes were between two PES packets)
bellard
parents:
333
diff
changeset
|
921 s->cur_pkt.dts = AV_NOPTS_VALUE; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
922 /* increment read pointer */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
923 s->cur_ptr += len; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
924 s->cur_len -= len; |
885 | 925 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
926 /* return packet if any */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
927 if (pkt->size) { |
333 | 928 got_packet: |
2067 | 929 pkt->pos = s->cur_pkt.pos; // Isn't quite accurate but close. |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
930 pkt->duration = 0; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
931 pkt->stream_index = st->index; |
334
7f089db11f9a
fixed incorrect PTS/DTS logic in MPEG video case (caused rare PTS glitches if start codes were between two PES packets)
bellard
parents:
333
diff
changeset
|
932 pkt->pts = st->parser->pts; |
7f089db11f9a
fixed incorrect PTS/DTS logic in MPEG video case (caused rare PTS glitches if start codes were between two PES packets)
bellard
parents:
333
diff
changeset
|
933 pkt->dts = st->parser->dts; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
934 pkt->destruct = av_destruct_packet_nofree; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
935 compute_pkt_fields(s, st, st->parser, pkt); |
1756 | 936 |
937 if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & PKT_FLAG_KEY){ | |
2932
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
938 ff_reduce_index(s, st->index); |
1756 | 939 av_add_index_entry(st, st->parser->frame_offset, pkt->dts, |
940 0, 0, AVINDEX_KEYFRAME); | |
941 } | |
942 | |
1244 | 943 break; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
944 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
945 } else { |
319 | 946 /* free packet */ |
885 | 947 av_free_packet(&s->cur_pkt); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
948 s->cur_st = NULL; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
949 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
950 } else { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
951 /* read next packet */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
952 ret = av_read_packet(s, &s->cur_pkt); |
333 | 953 if (ret < 0) { |
1787
eb16c64144ee
This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents:
1756
diff
changeset
|
954 if (ret == AVERROR(EAGAIN)) |
333 | 955 return ret; |
956 /* return the last frames, if any */ | |
957 for(i = 0; i < s->nb_streams; i++) { | |
958 st = s->streams[i]; | |
797
f5a231a9a2f1
support changing in bitstream global headers into extradata style and back
michael
parents:
786
diff
changeset
|
959 if (st->parser && st->need_parsing) { |
885 | 960 av_parser_parse(st->parser, st->codec, |
961 &pkt->data, &pkt->size, | |
962 NULL, 0, | |
334
7f089db11f9a
fixed incorrect PTS/DTS logic in MPEG video case (caused rare PTS glitches if start codes were between two PES packets)
bellard
parents:
333
diff
changeset
|
963 AV_NOPTS_VALUE, AV_NOPTS_VALUE); |
333 | 964 if (pkt->size) |
965 goto got_packet; | |
966 } | |
967 } | |
2936 | 968 /* no more packets: really terminate parsing */ |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
969 return ret; |
333 | 970 } |
885 | 971 |
3332 | 972 if(s->cur_pkt.pts != AV_NOPTS_VALUE && |
973 s->cur_pkt.dts != AV_NOPTS_VALUE && | |
974 s->cur_pkt.pts < s->cur_pkt.dts){ | |
975 av_log(s, AV_LOG_WARNING, "Invalid timestamps stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n", | |
976 s->cur_pkt.stream_index, | |
977 s->cur_pkt.pts, | |
978 s->cur_pkt.dts, | |
979 s->cur_pkt.size); | |
980 // av_free_packet(&s->cur_pkt); | |
981 // return -1; | |
982 } | |
983 | |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
453
diff
changeset
|
984 st = s->streams[s->cur_pkt.stream_index]; |
3445 | 985 if(s->debug & FF_FDEBUG_TS) |
3509 | 986 av_log(s, AV_LOG_DEBUG, "av_read_packet stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d, flags=%d\n", |
1244 | 987 s->cur_pkt.stream_index, |
988 s->cur_pkt.pts, | |
989 s->cur_pkt.dts, | |
3509 | 990 s->cur_pkt.size, |
991 s->cur_pkt.flags); | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
992 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
993 s->cur_st = st; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
994 s->cur_ptr = s->cur_pkt.data; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
995 s->cur_len = s->cur_pkt.size; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
996 if (st->need_parsing && !st->parser) { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
997 st->parser = av_parser_init(st->codec->codec_id); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
998 if (!st->parser) { |
2936 | 999 /* no parser available: just output the raw packets */ |
2023 | 1000 st->need_parsing = AVSTREAM_PARSE_NONE; |
1001 }else if(st->need_parsing == AVSTREAM_PARSE_HEADERS){ | |
842 | 1002 st->parser->flags |= PARSER_FLAG_COMPLETE_FRAMES; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1003 } |
1756 | 1004 if(st->parser && (s->iformat->flags & AVFMT_GENERIC_INDEX)){ |
3411
d31673961099
rename last_frame_offset to next_frame_offset, due to r13615
bcoudurier
parents:
3378
diff
changeset
|
1005 st->parser->next_frame_offset= |
1756 | 1006 st->parser->cur_offset= s->cur_pkt.pos; |
1007 } | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1008 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1009 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1010 } |
3445 | 1011 if(s->debug & FF_FDEBUG_TS) |
3509 | 1012 av_log(s, AV_LOG_DEBUG, "av_read_frame_internal stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d, flags=%d\n", |
1244 | 1013 pkt->stream_index, |
1014 pkt->pts, | |
1015 pkt->dts, | |
3509 | 1016 pkt->size, |
1017 pkt->flags); | |
1244 | 1018 |
1019 return 0; | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1020 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1021 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1022 int av_read_frame(AVFormatContext *s, AVPacket *pkt) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1023 { |
0 | 1024 AVPacketList *pktl; |
841
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1025 int eof=0; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1026 const int genpts= s->flags & AVFMT_FLAG_GENPTS; |
0 | 1027 |
841
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1028 for(;;){ |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1029 pktl = s->packet_buffer; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1030 if (pktl) { |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1031 AVPacket *next_pkt= &pktl->pkt; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1032 |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1033 if(genpts && next_pkt->dts != AV_NOPTS_VALUE){ |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1034 while(pktl && next_pkt->pts == AV_NOPTS_VALUE){ |
885 | 1035 if( pktl->pkt.stream_index == next_pkt->stream_index |
841
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1036 && next_pkt->dts < pktl->pkt.dts |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1037 && pktl->pkt.pts != pktl->pkt.dts //not b frame |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1038 /*&& pktl->pkt.dts != AV_NOPTS_VALUE*/){ |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1039 next_pkt->pts= pktl->pkt.dts; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1040 } |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1041 pktl= pktl->next; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1042 } |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1043 pktl = s->packet_buffer; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1044 } |
885 | 1045 |
1046 if( next_pkt->pts != AV_NOPTS_VALUE | |
1047 || next_pkt->dts == AV_NOPTS_VALUE | |
841
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1048 || !genpts || eof){ |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1049 /* read packet from packet buffer, if there is data */ |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1050 *pkt = *next_pkt; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1051 s->packet_buffer = pktl->next; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1052 av_free(pktl); |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1053 return 0; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1054 } |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1055 } |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1056 if(genpts){ |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1057 int ret= av_read_frame_internal(s, pkt); |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1058 if(ret<0){ |
1787
eb16c64144ee
This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents:
1756
diff
changeset
|
1059 if(pktl && ret != AVERROR(EAGAIN)){ |
841
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1060 eof=1; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1061 continue; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1062 }else |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1063 return ret; |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1064 } |
885 | 1065 |
3698
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
1066 if(av_dup_packet(add_to_pktbuf(&s->packet_buffer, pkt, |
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
1067 &s->packet_buffer_end)) < 0) |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2266
diff
changeset
|
1068 return AVERROR(ENOMEM); |
841
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1069 }else{ |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1070 assert(!s->packet_buffer); |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1071 return av_read_frame_internal(s, pkt); |
ba7631ba33a7
support fixing missing pts by parsing future frames
michael
parents:
840
diff
changeset
|
1072 } |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1073 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1074 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1075 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1076 /* XXX: suppress the packet queue */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1077 static void flush_packet_queue(AVFormatContext *s) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1078 { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1079 AVPacketList *pktl; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1080 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1081 for(;;) { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1082 pktl = s->packet_buffer; |
885 | 1083 if (!pktl) |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1084 break; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1085 s->packet_buffer = pktl->next; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1086 av_free_packet(&pktl->pkt); |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1087 av_free(pktl); |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1088 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1089 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1090 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1091 /*******************************************************/ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1092 /* seek support */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1093 |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1094 int av_find_default_stream_index(AVFormatContext *s) |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1095 { |
3423
613aff547655
Ensure the first audio stream is selected as the default stream
aurel
parents:
3418
diff
changeset
|
1096 int first_audio_index = -1; |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1097 int i; |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1098 AVStream *st; |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1099 |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1100 if (s->nb_streams <= 0) |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1101 return -1; |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1102 for(i = 0; i < s->nb_streams; i++) { |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1103 st = s->streams[i]; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1104 if (st->codec->codec_type == CODEC_TYPE_VIDEO) { |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1105 return i; |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1106 } |
3423
613aff547655
Ensure the first audio stream is selected as the default stream
aurel
parents:
3418
diff
changeset
|
1107 if (first_audio_index < 0 && st->codec->codec_type == CODEC_TYPE_AUDIO) |
613aff547655
Ensure the first audio stream is selected as the default stream
aurel
parents:
3418
diff
changeset
|
1108 first_audio_index = i; |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1109 } |
3423
613aff547655
Ensure the first audio stream is selected as the default stream
aurel
parents:
3418
diff
changeset
|
1110 return first_audio_index >= 0 ? first_audio_index : 0; |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1111 } |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1112 |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1113 /** |
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1114 * Flush the frame reader. |
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1115 */ |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1116 static void av_read_frame_flush(AVFormatContext *s) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1117 { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1118 AVStream *st; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1119 int i; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1120 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1121 flush_packet_queue(s); |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1122 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1123 /* free previous packet */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1124 if (s->cur_st) { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1125 if (s->cur_st->parser) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1126 av_free_packet(&s->cur_pkt); |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1127 s->cur_st = NULL; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1128 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1129 /* fail safe */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1130 s->cur_ptr = NULL; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1131 s->cur_len = 0; |
885 | 1132 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1133 /* for each stream, reset read state */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1134 for(i = 0; i < s->nb_streams; i++) { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1135 st = s->streams[i]; |
885 | 1136 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1137 if (st->parser) { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1138 av_parser_close(st->parser); |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1139 st->parser = NULL; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1140 } |
3058 | 1141 st->last_IP_pts = AV_NOPTS_VALUE; |
1935 | 1142 st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */ |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1143 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1144 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1145 |
1185
13dc486b272b
Try to find out correct start time to make seeking faster and add some
reimar
parents:
1169
diff
changeset
|
1146 void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp){ |
560 | 1147 int i; |
1148 | |
1149 for(i = 0; i < s->nb_streams; i++) { | |
572
640706a29efb
bug in libavformat av_update_cur_dts(), patch by (Nathan Kurz <nate at verse dot com>)
michael
parents:
570
diff
changeset
|
1150 AVStream *st = s->streams[i]; |
560 | 1151 |
885 | 1152 st->cur_dts = av_rescale(timestamp, |
572
640706a29efb
bug in libavformat av_update_cur_dts(), patch by (Nathan Kurz <nate at verse dot com>)
michael
parents:
570
diff
changeset
|
1153 st->time_base.den * (int64_t)ref_st->time_base.num, |
640706a29efb
bug in libavformat av_update_cur_dts(), patch by (Nathan Kurz <nate at verse dot com>)
michael
parents:
570
diff
changeset
|
1154 st->time_base.num * (int64_t)ref_st->time_base.den); |
560 | 1155 } |
1156 } | |
1157 | |
2932
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1158 void ff_reduce_index(AVFormatContext *s, int stream_index) |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1159 { |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1160 AVStream *st= s->streams[stream_index]; |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1161 unsigned int max_entries= s->max_index_size / sizeof(AVIndexEntry); |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1162 |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1163 if((unsigned)st->nb_index_entries >= max_entries){ |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1164 int i; |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1165 for(i=0; 2*i<st->nb_index_entries; i++) |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1166 st->index_entries[i]= st->index_entries[2*i]; |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1167 st->nb_index_entries= i; |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1168 } |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1169 } |
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2869
diff
changeset
|
1170 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
346
diff
changeset
|
1171 int av_add_index_entry(AVStream *st, |
979 | 1172 int64_t pos, int64_t timestamp, int size, int distance, int flags) |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1173 { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1174 AVIndexEntry *entries, *ie; |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1175 int index; |
885 | 1176 |
639 | 1177 if((unsigned)st->nb_index_entries + 1 >= UINT_MAX / sizeof(AVIndexEntry)) |
1178 return -1; | |
885 | 1179 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1180 entries = av_fast_realloc(st->index_entries, |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1181 &st->index_entries_allocated_size, |
885 | 1182 (st->nb_index_entries + 1) * |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1183 sizeof(AVIndexEntry)); |
639 | 1184 if(!entries) |
1185 return -1; | |
1186 | |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1187 st->index_entries= entries; |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1188 |
698 | 1189 index= av_index_search_timestamp(st, timestamp, AVSEEK_FLAG_ANY); |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1190 |
555 | 1191 if(index<0){ |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
346
diff
changeset
|
1192 index= st->nb_index_entries++; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
346
diff
changeset
|
1193 ie= &entries[index]; |
555 | 1194 assert(index==0 || ie[-1].timestamp < timestamp); |
1195 }else{ | |
1196 ie= &entries[index]; | |
1197 if(ie->timestamp != timestamp){ | |
563
d141aa45ca86
fix assertion failure in case of timestamp discontinuities
michael
parents:
560
diff
changeset
|
1198 if(ie->timestamp <= timestamp) |
d141aa45ca86
fix assertion failure in case of timestamp discontinuities
michael
parents:
560
diff
changeset
|
1199 return -1; |
555 | 1200 memmove(entries + index + 1, entries + index, sizeof(AVIndexEntry)*(st->nb_index_entries - index)); |
1201 st->nb_index_entries++; | |
2164 | 1202 }else if(ie->pos == pos && distance < ie->min_distance) //do not reduce the distance |
555 | 1203 distance= ie->min_distance; |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
346
diff
changeset
|
1204 } |
555 | 1205 |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1206 ie->pos = pos; |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1207 ie->timestamp = timestamp; |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
346
diff
changeset
|
1208 ie->min_distance= distance; |
979 | 1209 ie->size= size; |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1210 ie->flags = flags; |
885 | 1211 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
346
diff
changeset
|
1212 return index; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1213 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1214 |
597
d814669d2c13
int / int64 fix by (Wolfram Gloger <wmglo @@@ dent:med:uni-muenchen:de>)
michael
parents:
588
diff
changeset
|
1215 int av_index_search_timestamp(AVStream *st, int64_t wanted_timestamp, |
698 | 1216 int flags) |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1217 { |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1218 AVIndexEntry *entries= st->index_entries; |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1219 int nb_entries= st->nb_index_entries; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1220 int a, b, m; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1221 int64_t timestamp; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1222 |
555 | 1223 a = - 1; |
1224 b = nb_entries; | |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1225 |
555 | 1226 while (b - a > 1) { |
1227 m = (a + b) >> 1; | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1228 timestamp = entries[m].timestamp; |
555 | 1229 if(timestamp >= wanted_timestamp) |
1230 b = m; | |
1231 if(timestamp <= wanted_timestamp) | |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
334
diff
changeset
|
1232 a = m; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1233 } |
698 | 1234 m= (flags & AVSEEK_FLAG_BACKWARD) ? a : b; |
885 | 1235 |
698 | 1236 if(!(flags & AVSEEK_FLAG_ANY)){ |
1237 while(m>=0 && m<nb_entries && !(entries[m].flags & AVINDEX_KEYFRAME)){ | |
1238 m += (flags & AVSEEK_FLAG_BACKWARD) ? -1 : 1; | |
1239 } | |
1240 } | |
555 | 1241 |
885 | 1242 if(m == nb_entries) |
555 | 1243 return -1; |
1244 return m; | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1245 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1246 |
2618 | 1247 #define DEBUG_SEEK |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1248 |
555 | 1249 int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts, int flags){ |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1250 AVInputFormat *avif= s->iformat; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1251 int64_t pos_min, pos_max, pos, pos_limit; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1252 int64_t ts_min, ts_max, ts; |
1496
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1253 int index; |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1254 AVStream *st; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1255 |
463
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
1256 if (stream_index < 0) |
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
1257 return -1; |
885 | 1258 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1259 #ifdef DEBUG_SEEK |
881 | 1260 av_log(s, AV_LOG_DEBUG, "read_seek: %d %"PRId64"\n", stream_index, target_ts); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1261 #endif |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1262 |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1263 ts_max= |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1264 ts_min= AV_NOPTS_VALUE; |
2165 | 1265 pos_limit= -1; //gcc falsely says it may be uninitialized |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1266 |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1267 st= s->streams[stream_index]; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1268 if(st->index_entries){ |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1269 AVIndexEntry *e; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1270 |
2936 | 1271 index= av_index_search_timestamp(st, target_ts, flags | AVSEEK_FLAG_BACKWARD); //FIXME whole func must be checked for non-keyframe entries in index case, especially read_timestamp() |
555 | 1272 index= FFMAX(index, 0); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1273 e= &st->index_entries[index]; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1274 |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1275 if(e->timestamp <= target_ts || e->pos == e->min_distance){ |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1276 pos_min= e->pos; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1277 ts_min= e->timestamp; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1278 #ifdef DEBUG_SEEK |
885 | 1279 av_log(s, AV_LOG_DEBUG, "using cached pos_min=0x%"PRIx64" dts_min=%"PRId64"\n", |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1280 pos_min,ts_min); |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1281 #endif |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1282 }else{ |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1283 assert(index==0); |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1284 } |
885 | 1285 |
1286 index= av_index_search_timestamp(st, target_ts, flags & ~AVSEEK_FLAG_BACKWARD); | |
698 | 1287 assert(index < st->nb_index_entries); |
1288 if(index >= 0){ | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1289 e= &st->index_entries[index]; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1290 assert(e->timestamp >= target_ts); |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1291 pos_max= e->pos; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1292 ts_max= e->timestamp; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1293 pos_limit= pos_max - e->min_distance; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1294 #ifdef DEBUG_SEEK |
885 | 1295 av_log(s, AV_LOG_DEBUG, "using cached pos_max=0x%"PRIx64" pos_limit=0x%"PRIx64" dts_max=%"PRId64"\n", |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1296 pos_max,pos_limit, ts_max); |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1297 #endif |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1298 } |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1299 } |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1300 |
1496
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1301 pos= av_gen_search(s, stream_index, target_ts, pos_min, pos_max, pos_limit, ts_min, ts_max, flags, &ts, avif->read_timestamp); |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1302 if(pos<0) |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1303 return -1; |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1304 |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1305 /* do the seek */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
1306 url_fseek(s->pb, pos, SEEK_SET); |
1496
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1307 |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1308 av_update_cur_dts(s, st, ts); |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1309 |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1310 return 0; |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1311 } |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1312 |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1313 int64_t av_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts, int64_t pos_min, int64_t pos_max, int64_t pos_limit, int64_t ts_min, int64_t ts_max, int flags, int64_t *ts_ret, int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t )){ |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1314 int64_t pos, ts; |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1315 int64_t start_pos, filesize; |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1316 int no_change; |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1317 |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1318 #ifdef DEBUG_SEEK |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1319 av_log(s, AV_LOG_DEBUG, "gen_seek: %d %"PRId64"\n", stream_index, target_ts); |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1320 #endif |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1321 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1322 if(ts_min == AV_NOPTS_VALUE){ |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1323 pos_min = s->data_offset; |
1496
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1324 ts_min = read_timestamp(s, stream_index, &pos_min, INT64_MAX); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1325 if (ts_min == AV_NOPTS_VALUE) |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1326 return -1; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1327 } |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1328 |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1329 if(ts_max == AV_NOPTS_VALUE){ |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1330 int step= 1024; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
1331 filesize = url_fsize(s->pb); |
810
2a84386ed2a8
avformat/av_seek_frame_binary with growing file patch by (Kenneth Aafly: kenneth, aafloy net)
michael
parents:
809
diff
changeset
|
1332 pos_max = filesize - 1; |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1333 do{ |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1334 pos_max -= step; |
1496
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1335 ts_max = read_timestamp(s, stream_index, &pos_max, pos_max + step); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1336 step += step; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1337 }while(ts_max == AV_NOPTS_VALUE && pos_max >= step); |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1338 if (ts_max == AV_NOPTS_VALUE) |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1339 return -1; |
885 | 1340 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1341 for(;;){ |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1342 int64_t tmp_pos= pos_max + 1; |
1496
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1343 int64_t tmp_ts= read_timestamp(s, stream_index, &tmp_pos, INT64_MAX); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1344 if(tmp_ts == AV_NOPTS_VALUE) |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1345 break; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1346 ts_max= tmp_ts; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1347 pos_max= tmp_pos; |
810
2a84386ed2a8
avformat/av_seek_frame_binary with growing file patch by (Kenneth Aafly: kenneth, aafloy net)
michael
parents:
809
diff
changeset
|
1348 if(tmp_pos >= filesize) |
2a84386ed2a8
avformat/av_seek_frame_binary with growing file patch by (Kenneth Aafly: kenneth, aafloy net)
michael
parents:
809
diff
changeset
|
1349 break; |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1350 } |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1351 pos_limit= pos_max; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1352 } |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1353 |
926 | 1354 if(ts_min > ts_max){ |
1355 return -1; | |
1356 }else if(ts_min == ts_max){ | |
1357 pos_limit= pos_min; | |
1358 } | |
1359 | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1360 no_change=0; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1361 while (pos_min < pos_limit) { |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1362 #ifdef DEBUG_SEEK |
885 | 1363 av_log(s, AV_LOG_DEBUG, "pos_min=0x%"PRIx64" pos_max=0x%"PRIx64" dts_min=%"PRId64" dts_max=%"PRId64"\n", |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1364 pos_min, pos_max, |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1365 ts_min, ts_max); |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1366 #endif |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1367 assert(pos_limit <= pos_max); |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1368 |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1369 if(no_change==0){ |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1370 int64_t approximate_keyframe_distance= pos_max - pos_limit; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1371 // interpolate position (better than dichotomy) |
555 | 1372 pos = av_rescale(target_ts - ts_min, pos_max - pos_min, ts_max - ts_min) |
1373 + pos_min - approximate_keyframe_distance; | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1374 }else if(no_change==1){ |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1375 // bisection, if interpolation failed to change min or max pos last time |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1376 pos = (pos_min + pos_limit)>>1; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1377 }else{ |
2936 | 1378 /* linear search if bisection failed, can only happen if there |
1379 are very few or no keyframes between min/max */ | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1380 pos=pos_min; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1381 } |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1382 if(pos <= pos_min) |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1383 pos= pos_min + 1; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1384 else if(pos > pos_limit) |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1385 pos= pos_limit; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1386 start_pos= pos; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1387 |
1496
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1388 ts = read_timestamp(s, stream_index, &pos, INT64_MAX); //may pass pos_limit instead of -1 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1389 if(pos == pos_max) |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1390 no_change++; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1391 else |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1392 no_change=0; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1393 #ifdef DEBUG_SEEK |
881 | 1394 av_log(s, AV_LOG_DEBUG, "%"PRId64" %"PRId64" %"PRId64" / %"PRId64" %"PRId64" %"PRId64" target:%"PRId64" limit:%"PRId64" start:%"PRId64" noc:%d\n", pos_min, pos, pos_max, ts_min, ts, ts_max, target_ts, pos_limit, start_pos, no_change); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1395 #endif |
2034 | 1396 if(ts == AV_NOPTS_VALUE){ |
1397 av_log(s, AV_LOG_ERROR, "read_timestamp() failed in the middle\n"); | |
1398 return -1; | |
1399 } | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1400 assert(ts != AV_NOPTS_VALUE); |
555 | 1401 if (target_ts <= ts) { |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1402 pos_limit = start_pos - 1; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1403 pos_max = pos; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1404 ts_max = ts; |
555 | 1405 } |
1406 if (target_ts >= ts) { | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1407 pos_min = pos; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1408 ts_min = ts; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1409 } |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1410 } |
885 | 1411 |
555 | 1412 pos = (flags & AVSEEK_FLAG_BACKWARD) ? pos_min : pos_max; |
1413 ts = (flags & AVSEEK_FLAG_BACKWARD) ? ts_min : ts_max; | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1414 #ifdef DEBUG_SEEK |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1415 pos_min = pos; |
1496
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1416 ts_min = read_timestamp(s, stream_index, &pos_min, INT64_MAX); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1417 pos_min++; |
1496
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1418 ts_max = read_timestamp(s, stream_index, &pos_min, INT64_MAX); |
885 | 1419 av_log(s, AV_LOG_DEBUG, "pos=0x%"PRIx64" %"PRId64"<=%"PRId64"<=%"PRId64"\n", |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1420 pos, ts_min, target_ts, ts_max); |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1421 #endif |
1496
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1422 *ts_ret= ts; |
7e288adde245
split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
michael
parents:
1478
diff
changeset
|
1423 return pos; |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1424 } |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1425 |
555 | 1426 static int av_seek_frame_byte(AVFormatContext *s, int stream_index, int64_t pos, int flags){ |
1427 int64_t pos_min, pos_max; | |
1428 #if 0 | |
1429 AVStream *st; | |
1430 | |
1431 if (stream_index < 0) | |
1432 return -1; | |
1433 | |
1434 st= s->streams[stream_index]; | |
1435 #endif | |
1436 | |
1437 pos_min = s->data_offset; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
1438 pos_max = url_fsize(s->pb) - 1; |
555 | 1439 |
1440 if (pos < pos_min) pos= pos_min; | |
1441 else if(pos > pos_max) pos= pos_max; | |
1442 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
1443 url_fseek(s->pb, pos, SEEK_SET); |
555 | 1444 |
1445 #if 0 | |
560 | 1446 av_update_cur_dts(s, st, ts); |
555 | 1447 #endif |
1448 return 0; | |
1449 } | |
1450 | |
885 | 1451 static int av_seek_frame_generic(AVFormatContext *s, |
555 | 1452 int stream_index, int64_t timestamp, int flags) |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1453 { |
3612
c6186d4ceda0
check url_fseek return value, update seek reg tests
bcoudurier
parents:
3590
diff
changeset
|
1454 int index, ret; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1455 AVStream *st; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1456 AVIndexEntry *ie; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1457 |
1756 | 1458 st = s->streams[stream_index]; |
1459 | |
1460 index = av_index_search_timestamp(st, timestamp, flags); | |
1461 | |
2033
1f882c0d0b79
fix av_seek_frame_generic() so that it doesnt fail if the
michael
parents:
2032
diff
changeset
|
1462 if(index < 0 || index==st->nb_index_entries-1){ |
1756 | 1463 int i; |
1464 AVPacket pkt; | |
1465 | |
3378 | 1466 if(st->nb_index_entries){ |
1467 assert(st->index_entries); | |
1756 | 1468 ie= &st->index_entries[st->nb_index_entries-1]; |
3612
c6186d4ceda0
check url_fseek return value, update seek reg tests
bcoudurier
parents:
3590
diff
changeset
|
1469 if ((ret = url_fseek(s->pb, ie->pos, SEEK_SET)) < 0) |
c6186d4ceda0
check url_fseek return value, update seek reg tests
bcoudurier
parents:
3590
diff
changeset
|
1470 return ret; |
1756 | 1471 av_update_cur_dts(s, st, ie->timestamp); |
3612
c6186d4ceda0
check url_fseek return value, update seek reg tests
bcoudurier
parents:
3590
diff
changeset
|
1472 }else{ |
c6186d4ceda0
check url_fseek return value, update seek reg tests
bcoudurier
parents:
3590
diff
changeset
|
1473 if ((ret = url_fseek(s->pb, 0, SEEK_SET)) < 0) |
c6186d4ceda0
check url_fseek return value, update seek reg tests
bcoudurier
parents:
3590
diff
changeset
|
1474 return ret; |
c6186d4ceda0
check url_fseek return value, update seek reg tests
bcoudurier
parents:
3590
diff
changeset
|
1475 } |
1756 | 1476 for(i=0;; i++) { |
1477 int ret = av_read_frame(s, &pkt); | |
1478 if(ret<0) | |
1479 break; | |
1480 av_free_packet(&pkt); | |
1481 if(stream_index == pkt.stream_index){ | |
1482 if((pkt.flags & PKT_FLAG_KEY) && pkt.dts > timestamp) | |
1483 break; | |
1484 } | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1485 } |
1756 | 1486 index = av_index_search_timestamp(st, timestamp, flags); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1487 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1488 if (index < 0) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1489 return -1; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1490 |
1756 | 1491 av_read_frame_flush(s); |
1492 if (s->iformat->read_seek){ | |
1493 if(s->iformat->read_seek(s, stream_index, timestamp, flags) >= 0) | |
1494 return 0; | |
1495 } | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1496 ie = &st->index_entries[index]; |
3612
c6186d4ceda0
check url_fseek return value, update seek reg tests
bcoudurier
parents:
3590
diff
changeset
|
1497 if ((ret = url_fseek(s->pb, ie->pos, SEEK_SET)) < 0) |
c6186d4ceda0
check url_fseek return value, update seek reg tests
bcoudurier
parents:
3590
diff
changeset
|
1498 return ret; |
560 | 1499 av_update_cur_dts(s, st, ie->timestamp); |
463
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
1500 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1501 return 0; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1502 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1503 |
555 | 1504 int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1505 { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1506 int ret; |
463
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
1507 AVStream *st; |
885 | 1508 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1509 av_read_frame_flush(s); |
885 | 1510 |
555 | 1511 if(flags & AVSEEK_FLAG_BYTE) |
1512 return av_seek_frame_byte(s, stream_index, timestamp, flags); | |
885 | 1513 |
463
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
1514 if(stream_index < 0){ |
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
1515 stream_index= av_find_default_stream_index(s); |
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
1516 if(stream_index < 0) |
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
1517 return -1; |
885 | 1518 |
555 | 1519 st= s->streams[stream_index]; |
557
084de726b4d0
default stream timebase docs patch by (Nathan Kurz <nate at verse dot com>)
michael
parents:
556
diff
changeset
|
1520 /* timestamp for default must be expressed in AV_TIME_BASE units */ |
555 | 1521 timestamp = av_rescale(timestamp, st->time_base.den, AV_TIME_BASE * (int64_t)st->time_base.num); |
463
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
1522 } |
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
1523 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1524 /* first, we try the format specific seek */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1525 if (s->iformat->read_seek) |
555 | 1526 ret = s->iformat->read_seek(s, stream_index, timestamp, flags); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1527 else |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1528 ret = -1; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1529 if (ret >= 0) { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1530 return 0; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1531 } |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1532 |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1533 if(s->iformat->read_timestamp) |
555 | 1534 return av_seek_frame_binary(s, stream_index, timestamp, flags); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
425
diff
changeset
|
1535 else |
555 | 1536 return av_seek_frame_generic(s, stream_index, timestamp, flags); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1537 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1538 |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
1539 /*******************************************************/ |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1540 |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1541 /** |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1542 * Returns TRUE if the stream has accurate duration in any stream. |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1543 * |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1544 * @return TRUE if the stream has accurate duration for at least one component. |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1545 */ |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1546 static int av_has_duration(AVFormatContext *ic) |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1547 { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1548 int i; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1549 AVStream *st; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1550 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1551 for(i = 0;i < ic->nb_streams; i++) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1552 st = ic->streams[i]; |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1553 if (st->duration != AV_NOPTS_VALUE) |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1554 return 1; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1555 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1556 return 0; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1557 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1558 |
802
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1559 /** |
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1560 * Estimate the stream timings from the one of each components. |
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1561 * |
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1562 * Also computes the global bitrate if possible. |
ea0e995ac4a8
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
michael
parents:
801
diff
changeset
|
1563 */ |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1564 static void av_update_stream_timings(AVFormatContext *ic) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1565 { |
743 | 1566 int64_t start_time, start_time1, end_time, end_time1; |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1567 int64_t duration, duration1; |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1568 int i; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1569 AVStream *st; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1570 |
1557 | 1571 start_time = INT64_MAX; |
1572 end_time = INT64_MIN; | |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1573 duration = INT64_MIN; |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1574 for(i = 0;i < ic->nb_streams; i++) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1575 st = ic->streams[i]; |
2962
0cf3b8359da8
ensure av_rescale_q() can be calculated (won't divide by zero)
aurel
parents:
2936
diff
changeset
|
1576 if (st->start_time != AV_NOPTS_VALUE && st->time_base.den) { |
743 | 1577 start_time1= av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q); |
1578 if (start_time1 < start_time) | |
1579 start_time = start_time1; | |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1580 if (st->duration != AV_NOPTS_VALUE) { |
743 | 1581 end_time1 = start_time1 |
1582 + av_rescale_q(st->duration, st->time_base, AV_TIME_BASE_Q); | |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1583 if (end_time1 > end_time) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1584 end_time = end_time1; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1585 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1586 } |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1587 if (st->duration != AV_NOPTS_VALUE) { |
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1588 duration1 = av_rescale_q(st->duration, st->time_base, AV_TIME_BASE_Q); |
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1589 if (duration1 > duration) |
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1590 duration = duration1; |
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1591 } |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1592 } |
1557 | 1593 if (start_time != INT64_MAX) { |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1594 ic->start_time = start_time; |
1557 | 1595 if (end_time != INT64_MIN) { |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1596 if (end_time - start_time > duration) |
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1597 duration = end_time - start_time; |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1598 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1599 } |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1600 if (duration != INT64_MIN) { |
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1601 ic->duration = duration; |
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1602 if (ic->file_size > 0) { |
2936 | 1603 /* compute the bitrate */ |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1604 ic->bit_rate = (double)ic->file_size * 8.0 * AV_TIME_BASE / |
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1605 (double)ic->duration; |
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1606 } |
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1607 } |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1608 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1609 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1610 static void fill_all_stream_timings(AVFormatContext *ic) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1611 { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1612 int i; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1613 AVStream *st; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1614 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1615 av_update_stream_timings(ic); |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1616 for(i = 0;i < ic->nb_streams; i++) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1617 st = ic->streams[i]; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1618 if (st->start_time == AV_NOPTS_VALUE) { |
743 | 1619 if(ic->start_time != AV_NOPTS_VALUE) |
1620 st->start_time = av_rescale_q(ic->start_time, AV_TIME_BASE_Q, st->time_base); | |
1621 if(ic->duration != AV_NOPTS_VALUE) | |
1622 st->duration = av_rescale_q(ic->duration, AV_TIME_BASE_Q, st->time_base); | |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1623 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1624 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1625 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1626 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1627 static void av_estimate_timings_from_bit_rate(AVFormatContext *ic) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1628 { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1629 int64_t filesize, duration; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1630 int bit_rate, i; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1631 AVStream *st; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1632 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1633 /* if bit_rate is already set, we believe it */ |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1634 if (ic->bit_rate == 0) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1635 bit_rate = 0; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1636 for(i=0;i<ic->nb_streams;i++) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1637 st = ic->streams[i]; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1638 bit_rate += st->codec->bit_rate; |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1639 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1640 ic->bit_rate = bit_rate; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1641 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1642 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1643 /* if duration is already set, we believe it */ |
885 | 1644 if (ic->duration == AV_NOPTS_VALUE && |
1645 ic->bit_rate != 0 && | |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1646 ic->file_size != 0) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1647 filesize = ic->file_size; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1648 if (filesize > 0) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1649 for(i = 0; i < ic->nb_streams; i++) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1650 st = ic->streams[i]; |
743 | 1651 duration= av_rescale(8*filesize, st->time_base.den, ic->bit_rate*(int64_t)st->time_base.num); |
2401
c356a88cedf6
Do not butcher start_time in av_estimate_timings_from_bit_rate().
michael
parents:
2400
diff
changeset
|
1652 if (st->duration == AV_NOPTS_VALUE) |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1653 st->duration = duration; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1654 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1655 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1656 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1657 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1658 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1659 #define DURATION_MAX_READ_SIZE 250000 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1660 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1661 /* only usable for MPEG-PS streams */ |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3947
diff
changeset
|
1662 static void av_estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1663 { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1664 AVPacket pkt1, *pkt = &pkt1; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1665 AVStream *st; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1666 int read_size, i, ret; |
838 | 1667 int64_t end_time; |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1668 int64_t filesize, offset, duration; |
885 | 1669 |
2043
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1670 /* free previous packet */ |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1671 if (ic->cur_st && ic->cur_st->parser) |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1672 av_free_packet(&ic->cur_pkt); |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1673 ic->cur_st = NULL; |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1674 |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1675 /* flush packet queue */ |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1676 flush_packet_queue(ic); |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1677 |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1678 for(i=0;i<ic->nb_streams;i++) { |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1679 st = ic->streams[i]; |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1680 if (st->parser) { |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1681 av_parser_close(st->parser); |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1682 st->parser= NULL; |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1683 } |
3446000701c4
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
lucabe
parents:
2037
diff
changeset
|
1684 } |
885 | 1685 |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1686 /* we read the first packets to get the first PTS (not fully |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1687 accurate, but it is enough now) */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
1688 url_fseek(ic->pb, 0, SEEK_SET); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1689 read_size = 0; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1690 for(;;) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1691 if (read_size >= DURATION_MAX_READ_SIZE) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1692 break; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1693 /* if all info is available, we can stop */ |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1694 for(i = 0;i < ic->nb_streams; i++) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1695 st = ic->streams[i]; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1696 if (st->start_time == AV_NOPTS_VALUE) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1697 break; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1698 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1699 if (i == ic->nb_streams) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1700 break; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1701 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1702 ret = av_read_packet(ic, pkt); |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1703 if (ret != 0) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1704 break; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1705 read_size += pkt->size; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1706 st = ic->streams[pkt->stream_index]; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1707 if (pkt->pts != AV_NOPTS_VALUE) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1708 if (st->start_time == AV_NOPTS_VALUE) |
743 | 1709 st->start_time = pkt->pts; |
224
8d1569be0ee1
memory leak fix by (Tom Dexter <devel at www dot digitalaudiorock dot com>)
michaelni
parents:
205
diff
changeset
|
1710 } |
8d1569be0ee1
memory leak fix by (Tom Dexter <devel at www dot digitalaudiorock dot com>)
michaelni
parents:
205
diff
changeset
|
1711 av_free_packet(pkt); |
8d1569be0ee1
memory leak fix by (Tom Dexter <devel at www dot digitalaudiorock dot com>)
michaelni
parents:
205
diff
changeset
|
1712 } |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1713 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1714 /* estimate the end time (duration) */ |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1715 /* XXX: may need to support wrapping */ |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1716 filesize = ic->file_size; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1717 offset = filesize - DURATION_MAX_READ_SIZE; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1718 if (offset < 0) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1719 offset = 0; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1720 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
1721 url_fseek(ic->pb, offset, SEEK_SET); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1722 read_size = 0; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1723 for(;;) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1724 if (read_size >= DURATION_MAX_READ_SIZE) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1725 break; |
885 | 1726 |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1727 ret = av_read_packet(ic, pkt); |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1728 if (ret != 0) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1729 break; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1730 read_size += pkt->size; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1731 st = ic->streams[pkt->stream_index]; |
2399 | 1732 if (pkt->pts != AV_NOPTS_VALUE && |
1733 st->start_time != AV_NOPTS_VALUE) { | |
743 | 1734 end_time = pkt->pts; |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1735 duration = end_time - st->start_time; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1736 if (duration > 0) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1737 if (st->duration == AV_NOPTS_VALUE || |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1738 st->duration < duration) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1739 st->duration = duration; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1740 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1741 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1742 av_free_packet(pkt); |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1743 } |
885 | 1744 |
743 | 1745 fill_all_stream_timings(ic); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1746 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
1747 url_fseek(ic->pb, old_offset, SEEK_SET); |
2398
3306dae77205
fix cur_dts at the end of av_estimate_timings_from_pts()
michael
parents:
2320
diff
changeset
|
1748 for(i=0; i<ic->nb_streams; i++){ |
3306dae77205
fix cur_dts at the end of av_estimate_timings_from_pts()
michael
parents:
2320
diff
changeset
|
1749 st= ic->streams[i]; |
3306dae77205
fix cur_dts at the end of av_estimate_timings_from_pts()
michael
parents:
2320
diff
changeset
|
1750 st->cur_dts= st->first_dts; |
3058 | 1751 st->last_IP_pts = AV_NOPTS_VALUE; |
2398
3306dae77205
fix cur_dts at the end of av_estimate_timings_from_pts()
michael
parents:
2320
diff
changeset
|
1752 } |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1753 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1754 |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3947
diff
changeset
|
1755 static void av_estimate_timings(AVFormatContext *ic, int64_t old_offset) |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1756 { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1757 int64_t file_size; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1758 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1759 /* get the file size, if possible */ |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1760 if (ic->iformat->flags & AVFMT_NOFILE) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1761 file_size = 0; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1762 } else { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
1763 file_size = url_fsize(ic->pb); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1764 if (file_size < 0) |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1765 file_size = 0; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1766 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1767 ic->file_size = file_size; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1768 |
1169 | 1769 if ((!strcmp(ic->iformat->name, "mpeg") || |
1770 !strcmp(ic->iformat->name, "mpegts")) && | |
2841 | 1771 file_size && !url_is_streamed(ic->pb)) { |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1772 /* get accurate estimate from the PTSes */ |
1755 | 1773 av_estimate_timings_from_pts(ic, old_offset); |
2523
db7d46749b55
Make sure that if a stream has a duration but the container doesn't
benoit
parents:
2522
diff
changeset
|
1774 } else if (av_has_duration(ic)) { |
2936 | 1775 /* at least one component has timings - we use them for all |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1776 the components */ |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1777 fill_all_stream_timings(ic); |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1778 } else { |
2936 | 1779 /* less precise: use bitrate info */ |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1780 av_estimate_timings_from_bit_rate(ic); |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1781 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1782 av_update_stream_timings(ic); |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1783 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1784 #if 0 |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1785 { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1786 int i; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1787 AVStream *st; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1788 for(i = 0;i < ic->nb_streams; i++) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1789 st = ic->streams[i]; |
885 | 1790 printf("%d: start_time: %0.3f duration: %0.3f\n", |
1791 i, (double)st->start_time / AV_TIME_BASE, | |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1792 (double)st->duration / AV_TIME_BASE); |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1793 } |
885 | 1794 printf("stream: start_time: %0.3f duration: %0.3f bitrate=%d kb/s\n", |
1795 (double)ic->start_time / AV_TIME_BASE, | |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1796 (double)ic->duration / AV_TIME_BASE, |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1797 ic->bit_rate / 1000); |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1798 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1799 #endif |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1800 } |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
1801 |
0 | 1802 static int has_codec_parameters(AVCodecContext *enc) |
1803 { | |
1804 int val; | |
1805 switch(enc->codec_type) { | |
1806 case CODEC_TYPE_AUDIO: | |
3800
88e7a94697d3
make has_codec_parameters not returning true when sample_fmt is not set
bcoudurier
parents:
3791
diff
changeset
|
1807 val = enc->sample_rate && enc->channels && enc->sample_fmt != SAMPLE_FMT_NONE; |
3504
2bbc4f176591
make av_find_stream_info find frame_size for aac too
bcoudurier
parents:
3503
diff
changeset
|
1808 if(!enc->frame_size && |
2bbc4f176591
make av_find_stream_info find frame_size for aac too
bcoudurier
parents:
3503
diff
changeset
|
1809 (enc->codec_id == CODEC_ID_VORBIS || |
2bbc4f176591
make av_find_stream_info find frame_size for aac too
bcoudurier
parents:
3503
diff
changeset
|
1810 enc->codec_id == CODEC_ID_AAC)) |
3503
c1c3fb1711b9
Make av_find_stream_info() find the frame_size for vorbis.
michael
parents:
3502
diff
changeset
|
1811 return 0; |
0 | 1812 break; |
1813 case CODEC_TYPE_VIDEO: | |
737 | 1814 val = enc->width && enc->pix_fmt != PIX_FMT_NONE; |
0 | 1815 break; |
1816 default: | |
1817 val = 1; | |
1818 break; | |
1819 } | |
3278 | 1820 return enc->codec_id != CODEC_ID_NONE && val != 0; |
0 | 1821 } |
1822 | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1823 static int try_decode_frame(AVStream *st, const uint8_t *data, int size) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1824 { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1825 int16_t *samples; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1826 AVCodec *codec; |
1818 | 1827 int got_picture, data_size, ret=0; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1828 AVFrame picture; |
885 | 1829 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1830 if(!st->codec->codec){ |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1831 codec = avcodec_find_decoder(st->codec->codec_id); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1832 if (!codec) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1833 return -1; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1834 ret = avcodec_open(st->codec, codec); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1835 if (ret < 0) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1836 return ret; |
801
bca2334ff177
dont open and close codec at every call of try_decode_frame() as this is not only slow but also fails if the previous frame is needed for setting some parameters correctly
michael
parents:
797
diff
changeset
|
1837 } |
737 | 1838 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1839 if(!has_codec_parameters(st->codec)){ |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1840 switch(st->codec->codec_type) { |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1841 case CODEC_TYPE_VIDEO: |
885 | 1842 ret = avcodec_decode_video(st->codec, &picture, |
3002
d6f8c7cc47f9
Remove incorrect casts that should have never been there.
michael
parents:
2973
diff
changeset
|
1843 &got_picture, data, size); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1844 break; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1845 case CODEC_TYPE_AUDIO: |
1818 | 1846 data_size = FFMAX(size, AVCODEC_MAX_AUDIO_FRAME_SIZE); |
1847 samples = av_malloc(data_size); | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1848 if (!samples) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1849 goto fail; |
1818 | 1850 ret = avcodec_decode_audio2(st->codec, samples, |
3002
d6f8c7cc47f9
Remove incorrect casts that should have never been there.
michael
parents:
2973
diff
changeset
|
1851 &data_size, data, size); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1852 av_free(samples); |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1853 break; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1854 default: |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1855 break; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1856 } |
737 | 1857 } |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1858 fail: |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1859 return ret; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1860 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1861 |
2243
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1862 unsigned int codec_get_tag(const AVCodecTag *tags, int id) |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1863 { |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1864 while (tags->id != CODEC_ID_NONE) { |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1865 if (tags->id == id) |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1866 return tags->tag; |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1867 tags++; |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1868 } |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1869 return 0; |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1870 } |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1871 |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1872 enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag) |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1873 { |
2286
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1874 int i; |
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1875 for(i=0; tags[i].id != CODEC_ID_NONE;i++) { |
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1876 if(tag == tags[i].tag) |
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1877 return tags[i].id; |
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1878 } |
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1879 for(i=0; tags[i].id != CODEC_ID_NONE; i++) { |
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1880 if( toupper((tag >> 0)&0xFF) == toupper((tags[i].tag >> 0)&0xFF) |
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1881 && toupper((tag >> 8)&0xFF) == toupper((tags[i].tag >> 8)&0xFF) |
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1882 && toupper((tag >>16)&0xFF) == toupper((tags[i].tag >>16)&0xFF) |
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1883 && toupper((tag >>24)&0xFF) == toupper((tags[i].tag >>24)&0xFF)) |
5fca908f82ea
try exact match before case insensitive match in codec_get_id
michael
parents:
2281
diff
changeset
|
1884 return tags[i].id; |
2243
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1885 } |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1886 return CODEC_ID_NONE; |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1887 } |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1888 |
4019
a2539db62994
Fix argument constness for the av_codec_get_id() and
stefano
parents:
4003
diff
changeset
|
1889 unsigned int av_codec_get_tag(const AVCodecTag * const *tags, enum CodecID id) |
2243
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1890 { |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1891 int i; |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1892 for(i=0; tags && tags[i]; i++){ |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1893 int tag= codec_get_tag(tags[i], id); |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1894 if(tag) return tag; |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1895 } |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1896 return 0; |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1897 } |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1898 |
4019
a2539db62994
Fix argument constness for the av_codec_get_id() and
stefano
parents:
4003
diff
changeset
|
1899 enum CodecID av_codec_get_id(const AVCodecTag * const *tags, unsigned int tag) |
2243
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1900 { |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1901 int i; |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1902 for(i=0; tags && tags[i]; i++){ |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1903 enum CodecID id= codec_get_id(tags[i], tag); |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1904 if(id!=CODEC_ID_NONE) return id; |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1905 } |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1906 return CODEC_ID_NONE; |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1907 } |
639597604897
Move public API functions av_codec_get_tag() and av_codec_get_id()
aurel
parents:
2223
diff
changeset
|
1908 |
3341
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1909 static void compute_chapters_end(AVFormatContext *s) |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1910 { |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1911 unsigned int i; |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1912 |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1913 for (i=0; i+1<s->nb_chapters; i++) |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1914 if (s->chapters[i]->end == AV_NOPTS_VALUE) { |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1915 assert(s->chapters[i]->start <= s->chapters[i+1]->start); |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1916 assert(!av_cmp_q(s->chapters[i]->time_base, s->chapters[i+1]->time_base)); |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1917 s->chapters[i]->end = s->chapters[i+1]->start; |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1918 } |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1919 |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1920 if (s->nb_chapters && s->chapters[i]->end == AV_NOPTS_VALUE) { |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1921 assert(s->start_time != AV_NOPTS_VALUE); |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1922 assert(s->duration > 0); |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1923 s->chapters[i]->end = av_rescale_q(s->start_time + s->duration, |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1924 AV_TIME_BASE_Q, |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1925 s->chapters[i]->time_base); |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1926 } |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1927 } |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
1928 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1929 /* absolute maximum size we read until we abort */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1930 #define MAX_READ_SIZE 5000000 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1931 |
1569 | 1932 #define MAX_STD_TIMEBASES (60*12+5) |
1566 | 1933 static int get_std_framerate(int i){ |
1934 if(i<60*12) return i*1001; | |
3769 | 1935 else return ((const int[]){24,30,60,12,15})[i-60*12]*1000*12; |
1566 | 1936 } |
1937 | |
2861 | 1938 /* |
1939 * Is the time base unreliable. | |
1940 * This is a heuristic to balance between quick acceptance of the values in | |
1941 * the headers vs. some extra checks. | |
2936 | 1942 * Old DivX and Xvid often have nonsense timebases like 1fps or 2fps. |
1943 * MPEG-2 commonly misuses field repeat flags to store different framerates. | |
2861 | 1944 * And there are "variable" fps files this needs to detect as well. |
1945 */ | |
1946 static int tb_unreliable(AVCodecContext *c){ | |
1947 if( c->time_base.den >= 101L*c->time_base.num | |
1948 || c->time_base.den < 5L*c->time_base.num | |
1949 /* || c->codec_tag == ff_get_fourcc("DIVX") | |
1950 || c->codec_tag == ff_get_fourcc("XVID")*/ | |
1951 || c->codec_id == CODEC_ID_MPEG2VIDEO) | |
1952 return 1; | |
1953 return 0; | |
1954 } | |
1955 | |
0 | 1956 int av_find_stream_info(AVFormatContext *ic) |
1957 { | |
927 | 1958 int i, count, ret, read_size, j; |
0 | 1959 AVStream *st; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
1960 AVPacket pkt1, *pkt; |
620 | 1961 int64_t last_dts[MAX_STREAMS]; |
750 | 1962 int duration_count[MAX_STREAMS]={0}; |
1837
7b64dd81b38d
replace the auto array "duration_error" with a malloced array.
gpoirier
parents:
1824
diff
changeset
|
1963 double (*duration_error)[MAX_STD_TIMEBASES]; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3947
diff
changeset
|
1964 int64_t old_offset = url_ftell(ic->pb); |
1906
330115d147d6
remove codec_info_duration/nb_frames from AVStream
bcoudurier
parents:
1840
diff
changeset
|
1965 int64_t codec_info_duration[MAX_STREAMS]={0}; |
330115d147d6
remove codec_info_duration/nb_frames from AVStream
bcoudurier
parents:
1840
diff
changeset
|
1966 int codec_info_nb_frames[MAX_STREAMS]={0}; |
0 | 1967 |
1837
7b64dd81b38d
replace the auto array "duration_error" with a malloced array.
gpoirier
parents:
1824
diff
changeset
|
1968 duration_error = av_mallocz(MAX_STREAMS * sizeof(*duration_error)); |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2266
diff
changeset
|
1969 if (!duration_error) return AVERROR(ENOMEM); |
1837
7b64dd81b38d
replace the auto array "duration_error" with a malloced array.
gpoirier
parents:
1824
diff
changeset
|
1970 |
743 | 1971 for(i=0;i<ic->nb_streams;i++) { |
1972 st = ic->streams[i]; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1973 if(st->codec->codec_type == CODEC_TYPE_VIDEO){ |
743 | 1974 /* if(!st->time_base.num) |
1975 st->time_base= */ | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1976 if(!st->codec->time_base.num) |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1977 st->codec->time_base= st->time_base; |
743 | 1978 } |
797
f5a231a9a2f1
support changing in bitstream global headers into extradata style and back
michael
parents:
786
diff
changeset
|
1979 //only for the split stuff |
f5a231a9a2f1
support changing in bitstream global headers into extradata style and back
michael
parents:
786
diff
changeset
|
1980 if (!st->parser) { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1981 st->parser = av_parser_init(st->codec->codec_id); |
2023 | 1982 if(st->need_parsing == AVSTREAM_PARSE_HEADERS && st->parser){ |
842 | 1983 st->parser->flags |= PARSER_FLAG_COMPLETE_FRAMES; |
1984 } | |
797
f5a231a9a2f1
support changing in bitstream global headers into extradata style and back
michael
parents:
786
diff
changeset
|
1985 } |
743 | 1986 } |
1987 | |
620 | 1988 for(i=0;i<MAX_STREAMS;i++){ |
1989 last_dts[i]= AV_NOPTS_VALUE; | |
1990 } | |
885 | 1991 |
0 | 1992 count = 0; |
1993 read_size = 0; | |
1994 for(;;) { | |
1995 /* check if one codec still needs to be handled */ | |
1996 for(i=0;i<ic->nb_streams;i++) { | |
1997 st = ic->streams[i]; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
1998 if (!has_codec_parameters(st->codec)) |
0 | 1999 break; |
624 | 2000 /* variable fps and no guess at the real fps */ |
2861 | 2001 if( tb_unreliable(st->codec) |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2002 && duration_count[i]<20 && st->codec->codec_type == CODEC_TYPE_VIDEO) |
624 | 2003 break; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2004 if(st->parser && st->parser->parser->split && !st->codec->extradata) |
797
f5a231a9a2f1
support changing in bitstream global headers into extradata style and back
michael
parents:
786
diff
changeset
|
2005 break; |
2300
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
2006 if(st->first_dts == AV_NOPTS_VALUE) |
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
2007 break; |
0 | 2008 } |
2009 if (i == ic->nb_streams) { | |
2010 /* NOTE: if the format has no header, then we need to read | |
2011 some packets to get most of the streams, so we cannot | |
2012 stop here */ | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2013 if (!(ic->ctx_flags & AVFMTCTX_NOHEADER)) { |
0 | 2014 /* if we found the info for all the codecs, we can stop */ |
2015 ret = count; | |
2016 break; | |
2017 } | |
1327 | 2018 } |
1328 | 2019 /* we did not get all the codec info, but we read too much data */ |
2020 if (read_size >= MAX_READ_SIZE) { | |
2021 ret = count; | |
2022 break; | |
2023 } | |
0 | 2024 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2025 /* NOTE: a new stream can be added there if no header in file |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2026 (AVFMTCTX_NOHEADER) */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2027 ret = av_read_frame_internal(ic, &pkt1); |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2028 if (ret < 0) { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2029 /* EOF or error */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2030 ret = -1; /* we could not have all the codec parameters before EOF */ |
651
6a5ba24b2c6b
fixing demuxing for short files where the framerate detection failed
michael
parents:
643
diff
changeset
|
2031 for(i=0;i<ic->nb_streams;i++) { |
6a5ba24b2c6b
fixing demuxing for short files where the framerate detection failed
michael
parents:
643
diff
changeset
|
2032 st = ic->streams[i]; |
1018
bddcb32bde33
provide more info on which streams lack codec parameters
michael
parents:
1003
diff
changeset
|
2033 if (!has_codec_parameters(st->codec)){ |
bddcb32bde33
provide more info on which streams lack codec parameters
michael
parents:
1003
diff
changeset
|
2034 char buf[256]; |
bddcb32bde33
provide more info on which streams lack codec parameters
michael
parents:
1003
diff
changeset
|
2035 avcodec_string(buf, sizeof(buf), st->codec, 0); |
bddcb32bde33
provide more info on which streams lack codec parameters
michael
parents:
1003
diff
changeset
|
2036 av_log(ic, AV_LOG_INFO, "Could not find codec parameters (%s)\n", buf); |
1139
ff241582890f
do not fail av_find_stream_info() if params for all streams could not be found
mru
parents:
1135
diff
changeset
|
2037 } else { |
ff241582890f
do not fail av_find_stream_info() if params for all streams could not be found
mru
parents:
1135
diff
changeset
|
2038 ret = 0; |
1018
bddcb32bde33
provide more info on which streams lack codec parameters
michael
parents:
1003
diff
changeset
|
2039 } |
651
6a5ba24b2c6b
fixing demuxing for short files where the framerate detection failed
michael
parents:
643
diff
changeset
|
2040 } |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2041 break; |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2042 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2043 |
3698
b7e347127897
Maintain pointer to end of AVFormatContext.packet_buffer list
mru
parents:
3612
diff
changeset
|
2044 pkt= add_to_pktbuf(&ic->packet_buffer, &pkt1, &ic->packet_buffer_end); |
3590 | 2045 if(av_dup_packet(pkt) < 0) { |
2046 av_free(duration_error); | |
2297
acdc747b9ff3
move code which adds a AVPacket into the packet buffer into its own function
michael
parents:
2295
diff
changeset
|
2047 return AVERROR(ENOMEM); |
3590 | 2048 } |
0 | 2049 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2050 read_size += pkt->size; |
0 | 2051 |
2052 st = ic->streams[pkt->stream_index]; | |
1906
330115d147d6
remove codec_info_duration/nb_frames from AVStream
bcoudurier
parents:
1840
diff
changeset
|
2053 if(codec_info_nb_frames[st->index]>1) |
330115d147d6
remove codec_info_duration/nb_frames from AVStream
bcoudurier
parents:
1840
diff
changeset
|
2054 codec_info_duration[st->index] += pkt->duration; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2055 if (pkt->duration != 0) |
1906
330115d147d6
remove codec_info_duration/nb_frames from AVStream
bcoudurier
parents:
1840
diff
changeset
|
2056 codec_info_nb_frames[st->index]++; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2057 |
772 | 2058 { |
750 | 2059 int index= pkt->stream_index; |
2060 int64_t last= last_dts[index]; | |
2061 int64_t duration= pkt->dts - last; | |
2062 | |
2063 if(pkt->dts != AV_NOPTS_VALUE && last != AV_NOPTS_VALUE && duration>0){ | |
1566 | 2064 double dur= duration * av_q2d(st->time_base); |
2065 | |
2066 // if(st->codec->codec_type == CODEC_TYPE_VIDEO) | |
2067 // av_log(NULL, AV_LOG_ERROR, "%f\n", dur); | |
1616
dfe8b8bd6833
nth try of getting the frame rate detecton working
michael
parents:
1611
diff
changeset
|
2068 if(duration_count[index] < 2) |
3118
4410d9725469
do not reset duration_error for all streams, only reset current stream, fix wrong_fps.gxf
bcoudurier
parents:
3063
diff
changeset
|
2069 memset(duration_error[index], 0, sizeof(*duration_error)); |
1617 | 2070 for(i=1; i<MAX_STD_TIMEBASES; i++){ |
2071 int framerate= get_std_framerate(i); | |
2072 int ticks= lrintf(dur*framerate/(1001*12)); | |
2073 double error= dur - ticks*1001*12/(double)framerate; | |
2074 duration_error[index][i] += error*error; | |
2075 } | |
1566 | 2076 duration_count[index]++; |
620 | 2077 } |
1569 | 2078 if(last == AV_NOPTS_VALUE || duration_count[index]<=1) |
2079 last_dts[pkt->stream_index]= pkt->dts; | |
620 | 2080 } |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2081 if(st->parser && st->parser->parser->split && !st->codec->extradata){ |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2082 int i= st->parser->parser->split(st->codec, pkt->data, pkt->size); |
797
f5a231a9a2f1
support changing in bitstream global headers into extradata style and back
michael
parents:
786
diff
changeset
|
2083 if(i){ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2084 st->codec->extradata_size= i; |
1141
ef9bf68071d3
extradata may be used as bitstream reader input so allocate with padding
mru
parents:
1139
diff
changeset
|
2085 st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2086 memcpy(st->codec->extradata, pkt->data, st->codec->extradata_size); |
1141
ef9bf68071d3
extradata may be used as bitstream reader input so allocate with padding
mru
parents:
1139
diff
changeset
|
2087 memset(st->codec->extradata + i, 0, FF_INPUT_BUFFER_PADDING_SIZE); |
797
f5a231a9a2f1
support changing in bitstream global headers into extradata style and back
michael
parents:
786
diff
changeset
|
2088 } |
f5a231a9a2f1
support changing in bitstream global headers into extradata style and back
michael
parents:
786
diff
changeset
|
2089 } |
885 | 2090 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2091 /* if still no information, we try to open the codec and to |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2092 decompress the frame. We try to avoid that in most cases as |
2936 | 2093 it takes longer and uses more memory. For MPEG-4, we need to |
2094 decompress for QuickTime. */ | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2095 if (!has_codec_parameters(st->codec) /*&& |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2096 (st->codec->codec_id == CODEC_ID_FLV1 || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2097 st->codec->codec_id == CODEC_ID_H264 || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2098 st->codec->codec_id == CODEC_ID_H263 || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2099 st->codec->codec_id == CODEC_ID_H261 || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2100 st->codec->codec_id == CODEC_ID_VORBIS || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2101 st->codec->codec_id == CODEC_ID_MJPEG || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2102 st->codec->codec_id == CODEC_ID_PNG || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2103 st->codec->codec_id == CODEC_ID_PAM || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2104 st->codec->codec_id == CODEC_ID_PGM || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2105 st->codec->codec_id == CODEC_ID_PGMYUV || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2106 st->codec->codec_id == CODEC_ID_PBM || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2107 st->codec->codec_id == CODEC_ID_PPM || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2108 st->codec->codec_id == CODEC_ID_SHORTEN || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2109 (st->codec->codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/) |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2110 try_decode_frame(st, pkt->data, pkt->size); |
885 | 2111 |
2253
3677c1667194
avoid division by zero in av_find_stream_info() when no time base is set
mru
parents:
2243
diff
changeset
|
2112 if (st->time_base.den > 0 && av_rescale_q(codec_info_duration[st->index], st->time_base, AV_TIME_BASE_Q) >= ic->max_analyze_duration) { |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2113 break; |
0 | 2114 } |
2115 count++; | |
2116 } | |
2117 | |
3142 | 2118 // close codecs which were opened in try_decode_frame() |
801
bca2334ff177
dont open and close codec at every call of try_decode_frame() as this is not only slow but also fails if the previous frame is needed for setting some parameters correctly
michael
parents:
797
diff
changeset
|
2119 for(i=0;i<ic->nb_streams;i++) { |
bca2334ff177
dont open and close codec at every call of try_decode_frame() as this is not only slow but also fails if the previous frame is needed for setting some parameters correctly
michael
parents:
797
diff
changeset
|
2120 st = ic->streams[i]; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2121 if(st->codec->codec) |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2122 avcodec_close(st->codec); |
801
bca2334ff177
dont open and close codec at every call of try_decode_frame() as this is not only slow but also fails if the previous frame is needed for setting some parameters correctly
michael
parents:
797
diff
changeset
|
2123 } |
0 | 2124 for(i=0;i<ic->nb_streams;i++) { |
2125 st = ic->streams[i]; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2126 if (st->codec->codec_type == CODEC_TYPE_VIDEO) { |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3879
diff
changeset
|
2127 if(st->codec->codec_id == CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_coded_sample) |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2128 st->codec->codec_tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt); |
620 | 2129 |
1616
dfe8b8bd6833
nth try of getting the frame rate detecton working
michael
parents:
1611
diff
changeset
|
2130 if(duration_count[i] |
2861 | 2131 && tb_unreliable(st->codec) /*&& |
2936 | 2132 //FIXME we should not special-case MPEG-2, but this needs testing with non-MPEG-2 ... |
1566 | 2133 st->time_base.num*duration_sum[i]/duration_count[i]*101LL > st->time_base.den*/){ |
2134 double best_error= 2*av_q2d(st->time_base); | |
2135 best_error= best_error*best_error*duration_count[i]*1000*12*30; | |
2136 | |
2137 for(j=1; j<MAX_STD_TIMEBASES; j++){ | |
2138 double error= duration_error[i][j] * get_std_framerate(j); | |
2139 // if(st->codec->codec_type == CODEC_TYPE_VIDEO) | |
2140 // av_log(NULL, AV_LOG_ERROR, "%f %f\n", get_std_framerate(j) / 12.0/1001, error); | |
927 | 2141 if(error < best_error){ |
2142 best_error= error; | |
1566 | 2143 av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, get_std_framerate(j), 12*1001, INT_MAX); |
927 | 2144 } |
750 | 2145 } |
620 | 2146 } |
2147 | |
743 | 2148 if (!st->r_frame_rate.num){ |
1351
244017c6b2ae
fix r_frame_rate detection in mpeg4 streams with non integer fps
michael
parents:
1330
diff
changeset
|
2149 if( st->codec->time_base.den * (int64_t)st->time_base.num |
244017c6b2ae
fix r_frame_rate detection in mpeg4 streams with non integer fps
michael
parents:
1330
diff
changeset
|
2150 <= st->codec->time_base.num * (int64_t)st->time_base.den){ |
244017c6b2ae
fix r_frame_rate detection in mpeg4 streams with non integer fps
michael
parents:
1330
diff
changeset
|
2151 st->r_frame_rate.num = st->codec->time_base.den; |
244017c6b2ae
fix r_frame_rate detection in mpeg4 streams with non integer fps
michael
parents:
1330
diff
changeset
|
2152 st->r_frame_rate.den = st->codec->time_base.num; |
244017c6b2ae
fix r_frame_rate detection in mpeg4 streams with non integer fps
michael
parents:
1330
diff
changeset
|
2153 }else{ |
244017c6b2ae
fix r_frame_rate detection in mpeg4 streams with non integer fps
michael
parents:
1330
diff
changeset
|
2154 st->r_frame_rate.num = st->time_base.den; |
244017c6b2ae
fix r_frame_rate detection in mpeg4 streams with non integer fps
michael
parents:
1330
diff
changeset
|
2155 st->r_frame_rate.den = st->time_base.num; |
244017c6b2ae
fix r_frame_rate detection in mpeg4 streams with non integer fps
michael
parents:
1330
diff
changeset
|
2156 } |
85
25062c9b1f86
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
75
diff
changeset
|
2157 } |
1804 | 2158 }else if(st->codec->codec_type == CODEC_TYPE_AUDIO) { |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3879
diff
changeset
|
2159 if(!st->codec->bits_per_coded_sample) |
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3879
diff
changeset
|
2160 st->codec->bits_per_coded_sample= av_get_bits_per_sample(st->codec->codec_id); |
0 | 2161 } |
2162 } | |
2163 | |
1755 | 2164 av_estimate_timings(ic, old_offset); |
2018 | 2165 |
3341
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
2166 compute_chapters_end(ic); |
13333599b04b
compute the end of all chapters when end is not specified in the container
aurel
parents:
3340
diff
changeset
|
2167 |
468 | 2168 #if 0 |
2936 | 2169 /* correct DTS for B-frame streams with no timestamps */ |
468 | 2170 for(i=0;i<ic->nb_streams;i++) { |
2171 st = ic->streams[i]; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2172 if (st->codec->codec_type == CODEC_TYPE_VIDEO) { |
468 | 2173 if(b-frames){ |
2174 ppktl = &ic->packet_buffer; | |
2175 while(ppkt1){ | |
2176 if(ppkt1->stream_index != i) | |
2177 continue; | |
2178 if(ppkt1->pkt->dts < 0) | |
2179 break; | |
2180 if(ppkt1->pkt->pts != AV_NOPTS_VALUE) | |
2181 break; | |
2182 ppkt1->pkt->dts -= delta; | |
2183 ppkt1= ppkt1->next; | |
2184 } | |
2185 if(ppkt1) | |
2186 continue; | |
2187 st->cur_dts -= delta; | |
2188 } | |
2189 } | |
2190 } | |
2191 #endif | |
1837
7b64dd81b38d
replace the auto array "duration_error" with a malloced array.
gpoirier
parents:
1824
diff
changeset
|
2192 |
7b64dd81b38d
replace the auto array "duration_error" with a malloced array.
gpoirier
parents:
1824
diff
changeset
|
2193 av_free(duration_error); |
7b64dd81b38d
replace the auto array "duration_error" with a malloced array.
gpoirier
parents:
1824
diff
changeset
|
2194 |
0 | 2195 return ret; |
2196 } | |
2197 | |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2198 /*******************************************************/ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2199 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2200 int av_read_play(AVFormatContext *s) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2201 { |
2827
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2812
diff
changeset
|
2202 if (s->iformat->read_play) |
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2812
diff
changeset
|
2203 return s->iformat->read_play(s); |
2842 | 2204 if (s->pb) |
2839
b51319dd86e5
Merge recently added and still unused play and pause functions.
michael
parents:
2835
diff
changeset
|
2205 return av_url_read_fpause(s->pb, 0); |
2827
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2812
diff
changeset
|
2206 return AVERROR(ENOSYS); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2207 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2208 |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2209 int av_read_pause(AVFormatContext *s) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2210 { |
2827
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2812
diff
changeset
|
2211 if (s->iformat->read_pause) |
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2812
diff
changeset
|
2212 return s->iformat->read_pause(s); |
2842 | 2213 if (s->pb) |
2839
b51319dd86e5
Merge recently added and still unused play and pause functions.
michael
parents:
2835
diff
changeset
|
2214 return av_url_read_fpause(s->pb, 1); |
2827
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2812
diff
changeset
|
2215 return AVERROR(ENOSYS); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2216 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2217 |
2835 | 2218 void av_close_input_stream(AVFormatContext *s) |
0 | 2219 { |
2830
d7b2ac8d796d
Simplify av_close_input_file similarly to av_open_input_file previously
reimar
parents:
2829
diff
changeset
|
2220 int i; |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
2221 AVStream *st; |
0 | 2222 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2223 /* free previous packet */ |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2224 if (s->cur_st && s->cur_st->parser) |
885 | 2225 av_free_packet(&s->cur_pkt); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2226 |
0 | 2227 if (s->iformat->read_close) |
2228 s->iformat->read_close(s); | |
2229 for(i=0;i<s->nb_streams;i++) { | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
2230 /* free all data in a stream component */ |
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
2231 st = s->streams[i]; |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2232 if (st->parser) { |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2233 av_parser_close(st->parser); |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2234 } |
4161 | 2235 av_metadata_free(&st->metadata); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2236 av_free(st->index_entries); |
1120 | 2237 av_free(st->codec->extradata); |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2238 av_free(st->codec); |
2973 | 2239 av_free(st->filename); |
3487
2f191d610db9
uniformize AVStream->priv_data freeing in av_close_input_stream
bcoudurier
parents:
3486
diff
changeset
|
2240 av_free(st->priv_data); |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
290
diff
changeset
|
2241 av_free(st); |
0 | 2242 } |
2573
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2243 for(i=s->nb_programs-1; i>=0; i--) { |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2244 av_freep(&s->programs[i]->provider_name); |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2245 av_freep(&s->programs[i]->name); |
4161 | 2246 av_metadata_free(&s->programs[i]->metadata); |
2650
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2247 av_freep(&s->programs[i]->stream_index); |
2573
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2248 av_freep(&s->programs[i]); |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2249 } |
3248 | 2250 av_freep(&s->programs); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
2251 flush_packet_queue(s); |
0 | 2252 av_freep(&s->priv_data); |
3328
b228cfb5a4f5
s/num_chapters/nb_chapters/ all other similar variables are called nb_*.
michael
parents:
3327
diff
changeset
|
2253 while(s->nb_chapters--) { |
b228cfb5a4f5
s/num_chapters/nb_chapters/ all other similar variables are called nb_*.
michael
parents:
3327
diff
changeset
|
2254 av_free(s->chapters[s->nb_chapters]->title); |
4161 | 2255 av_metadata_free(&s->chapters[s->nb_chapters]->metadata); |
3328
b228cfb5a4f5
s/num_chapters/nb_chapters/ all other similar variables are called nb_*.
michael
parents:
3327
diff
changeset
|
2256 av_free(s->chapters[s->nb_chapters]); |
3314 | 2257 } |
2258 av_freep(&s->chapters); | |
4161 | 2259 av_metadata_free(&s->metadata); |
0 | 2260 av_free(s); |
2261 } | |
2262 | |
2835 | 2263 void av_close_input_file(AVFormatContext *s) |
2264 { | |
2265 ByteIOContext *pb = s->iformat->flags & AVFMT_NOFILE ? NULL : s->pb; | |
2266 av_close_input_stream(s); | |
2267 if (pb) | |
2268 url_fclose(pb); | |
2269 } | |
2270 | |
0 | 2271 AVStream *av_new_stream(AVFormatContext *s, int id) |
2272 { | |
2273 AVStream *st; | |
1285
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2274 int i; |
0 | 2275 |
2276 if (s->nb_streams >= MAX_STREAMS) | |
2277 return NULL; | |
2278 | |
2279 st = av_mallocz(sizeof(AVStream)); | |
2280 if (!st) | |
2281 return NULL; | |
885 | 2282 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2283 st->codec= avcodec_alloc_context(); |
193 | 2284 if (s->iformat) { |
2285 /* no default bitrate if decoding */ | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2286 st->codec->bit_rate = 0; |
193 | 2287 } |
0 | 2288 st->index = s->nb_streams; |
2289 st->id = id; | |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2290 st->start_time = AV_NOPTS_VALUE; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2291 st->duration = AV_NOPTS_VALUE; |
3552
8bce09af18e6
Set cur_dts to 0 only during creating new streams and not every time cur_dts happens
michael
parents:
3537
diff
changeset
|
2292 /* we set the current DTS to 0 so that formats without any timestamps |
8bce09af18e6
Set cur_dts to 0 only during creating new streams and not every time cur_dts happens
michael
parents:
3537
diff
changeset
|
2293 but durations get some timestamps, formats with some unknown |
8bce09af18e6
Set cur_dts to 0 only during creating new streams and not every time cur_dts happens
michael
parents:
3537
diff
changeset
|
2294 timestamps have their first few packets buffered and the |
8bce09af18e6
Set cur_dts to 0 only during creating new streams and not every time cur_dts happens
michael
parents:
3537
diff
changeset
|
2295 timestamps corrected before they are returned to the user */ |
8bce09af18e6
Set cur_dts to 0 only during creating new streams and not every time cur_dts happens
michael
parents:
3537
diff
changeset
|
2296 st->cur_dts = 0; |
2300
9c8cfadff191
correct initial timestamps which have AV_NOPTS_VALUE
michael
parents:
2297
diff
changeset
|
2297 st->first_dts = AV_NOPTS_VALUE; |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
453
diff
changeset
|
2298 |
2936 | 2299 /* default pts setting is MPEG-like */ |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
453
diff
changeset
|
2300 av_set_pts_info(st, 33, 1, 90000); |
3058 | 2301 st->last_IP_pts = AV_NOPTS_VALUE; |
1285
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2302 for(i=0; i<MAX_REORDER_DELAY+1; i++) |
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2303 st->pts_buffer[i]= AV_NOPTS_VALUE; |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
453
diff
changeset
|
2304 |
3758
e966560661e5
export sample_aspect_ratio read by the demuxer in a separate field
aurel
parents:
3718
diff
changeset
|
2305 st->sample_aspect_ratio = (AVRational){0,1}; |
e966560661e5
export sample_aspect_ratio read by the demuxer in a separate field
aurel
parents:
3718
diff
changeset
|
2306 |
0 | 2307 s->streams[s->nb_streams++] = st; |
2308 return st; | |
2309 } | |
2310 | |
2573
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2311 AVProgram *av_new_program(AVFormatContext *ac, int id) |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2312 { |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2313 AVProgram *program=NULL; |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2314 int i; |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2315 |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2316 #ifdef DEBUG_SI |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2317 av_log(ac, AV_LOG_DEBUG, "new_program: id=0x%04x\n", id); |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2318 #endif |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2319 |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2320 for(i=0; i<ac->nb_programs; i++) |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2321 if(ac->programs[i]->id == id) |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2322 program = ac->programs[i]; |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2323 |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2324 if(!program){ |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2325 program = av_mallocz(sizeof(AVProgram)); |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2326 if (!program) |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2327 return NULL; |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2328 dynarray_add(&ac->programs, &ac->nb_programs, program); |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2329 program->discard = AVDISCARD_NONE; |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2330 } |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2331 program->id = id; |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2332 |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2333 return program; |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2334 } |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2335 |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2336 void av_set_program_name(AVProgram *program, char *provider_name, char *name) |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2337 { |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2338 assert(!provider_name == !name); |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2339 if(name){ |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2340 av_free(program->provider_name); |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2341 av_free(program-> name); |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2342 program->provider_name = av_strdup(provider_name); |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2343 program-> name = av_strdup( name); |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2344 } |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2345 } |
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2346 |
3334
7a823a401282
Pass time_base as argument to new_chapter() as well.
michael
parents:
3332
diff
changeset
|
2347 AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base, int64_t start, int64_t end, const char *title) |
3314 | 2348 { |
3323
4bf98e198eec
Add id to AVChapter, untested (where do i find matroska files with chapters?).
michael
parents:
3318
diff
changeset
|
2349 AVChapter *chapter = NULL; |
4bf98e198eec
Add id to AVChapter, untested (where do i find matroska files with chapters?).
michael
parents:
3318
diff
changeset
|
2350 int i; |
4bf98e198eec
Add id to AVChapter, untested (where do i find matroska files with chapters?).
michael
parents:
3318
diff
changeset
|
2351 |
3328
b228cfb5a4f5
s/num_chapters/nb_chapters/ all other similar variables are called nb_*.
michael
parents:
3327
diff
changeset
|
2352 for(i=0; i<s->nb_chapters; i++) |
3323
4bf98e198eec
Add id to AVChapter, untested (where do i find matroska files with chapters?).
michael
parents:
3318
diff
changeset
|
2353 if(s->chapters[i]->id == id) |
4bf98e198eec
Add id to AVChapter, untested (where do i find matroska files with chapters?).
michael
parents:
3318
diff
changeset
|
2354 chapter = s->chapters[i]; |
4bf98e198eec
Add id to AVChapter, untested (where do i find matroska files with chapters?).
michael
parents:
3318
diff
changeset
|
2355 |
4bf98e198eec
Add id to AVChapter, untested (where do i find matroska files with chapters?).
michael
parents:
3318
diff
changeset
|
2356 if(!chapter){ |
4bf98e198eec
Add id to AVChapter, untested (where do i find matroska files with chapters?).
michael
parents:
3318
diff
changeset
|
2357 chapter= av_mallocz(sizeof(AVChapter)); |
3324 | 2358 if(!chapter) |
3330
374e74567a4e
Make ff_new_chapter() return AVChapter instead of int so its consistant with
michael
parents:
3328
diff
changeset
|
2359 return NULL; |
3328
b228cfb5a4f5
s/num_chapters/nb_chapters/ all other similar variables are called nb_*.
michael
parents:
3327
diff
changeset
|
2360 dynarray_add(&s->chapters, &s->nb_chapters, chapter); |
3323
4bf98e198eec
Add id to AVChapter, untested (where do i find matroska files with chapters?).
michael
parents:
3318
diff
changeset
|
2361 } |
3340 | 2362 av_free(chapter->title); |
3326 | 2363 chapter->title = av_strdup(title); |
3323
4bf98e198eec
Add id to AVChapter, untested (where do i find matroska files with chapters?).
michael
parents:
3318
diff
changeset
|
2364 chapter->id = id; |
3334
7a823a401282
Pass time_base as argument to new_chapter() as well.
michael
parents:
3332
diff
changeset
|
2365 chapter->time_base= time_base; |
3314 | 2366 chapter->start = start; |
3327 | 2367 chapter->end = end; |
3314 | 2368 |
3330
374e74567a4e
Make ff_new_chapter() return AVChapter instead of int so its consistant with
michael
parents:
3328
diff
changeset
|
2369 return chapter; |
3314 | 2370 } |
2573
2842354cb9a4
Added definition and utility functions to handle AVProgram(s) in AVFormatContext
nicodvb
parents:
2559
diff
changeset
|
2371 |
0 | 2372 /************************************************************/ |
2373 /* output media file */ | |
2374 | |
20 | 2375 int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap) |
2376 { | |
2377 int ret; | |
885 | 2378 |
32 | 2379 if (s->oformat->priv_data_size > 0) { |
2380 s->priv_data = av_mallocz(s->oformat->priv_data_size); | |
2381 if (!s->priv_data) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2266
diff
changeset
|
2382 return AVERROR(ENOMEM); |
32 | 2383 } else |
2384 s->priv_data = NULL; | |
885 | 2385 |
20 | 2386 if (s->oformat->set_parameters) { |
2387 ret = s->oformat->set_parameters(s, ap); | |
2388 if (ret < 0) | |
2389 return ret; | |
2390 } | |
2391 return 0; | |
2392 } | |
2393 | |
0 | 2394 int av_write_header(AVFormatContext *s) |
2395 { | |
2396 int ret, i; | |
2397 AVStream *st; | |
2398 | |
839 | 2399 // some sanity checks |
2400 for(i=0;i<s->nb_streams;i++) { | |
2401 st = s->streams[i]; | |
2402 | |
2403 switch (st->codec->codec_type) { | |
2404 case CODEC_TYPE_AUDIO: | |
2405 if(st->codec->sample_rate<=0){ | |
2406 av_log(s, AV_LOG_ERROR, "sample rate not set\n"); | |
2407 return -1; | |
2408 } | |
3910
45dfe99dced8
set block align in av_write_header if not set, fix issue #489
bcoudurier
parents:
3908
diff
changeset
|
2409 if(!st->codec->block_align) |
45dfe99dced8
set block align in av_write_header if not set, fix issue #489
bcoudurier
parents:
3908
diff
changeset
|
2410 st->codec->block_align = st->codec->channels * |
45dfe99dced8
set block align in av_write_header if not set, fix issue #489
bcoudurier
parents:
3908
diff
changeset
|
2411 av_get_bits_per_sample(st->codec->codec_id) >> 3; |
839 | 2412 break; |
2413 case CODEC_TYPE_VIDEO: | |
2414 if(st->codec->time_base.num<=0 || st->codec->time_base.den<=0){ //FIXME audio too? | |
2415 av_log(s, AV_LOG_ERROR, "time base not set\n"); | |
2416 return -1; | |
2417 } | |
2418 if(st->codec->width<=0 || st->codec->height<=0){ | |
2419 av_log(s, AV_LOG_ERROR, "dimensions not set\n"); | |
2420 return -1; | |
2421 } | |
3929
e0eb33b98f43
Ensure that muxer and encoder aspect ratios match. So no
michael
parents:
3910
diff
changeset
|
2422 if(av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio)){ |
e0eb33b98f43
Ensure that muxer and encoder aspect ratios match. So no
michael
parents:
3910
diff
changeset
|
2423 av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between encoder and muxer layer\n"); |
e0eb33b98f43
Ensure that muxer and encoder aspect ratios match. So no
michael
parents:
3910
diff
changeset
|
2424 return -1; |
e0eb33b98f43
Ensure that muxer and encoder aspect ratios match. So no
michael
parents:
3910
diff
changeset
|
2425 } |
839 | 2426 break; |
2427 } | |
1681
23c911d09382
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
michael
parents:
1675
diff
changeset
|
2428 |
23c911d09382
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
michael
parents:
1675
diff
changeset
|
2429 if(s->oformat->codec_tag){ |
23c911d09382
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
michael
parents:
1675
diff
changeset
|
2430 if(st->codec->codec_tag){ |
23c911d09382
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
michael
parents:
1675
diff
changeset
|
2431 //FIXME |
23c911d09382
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
michael
parents:
1675
diff
changeset
|
2432 //check that tag + id is in the table |
2936 | 2433 //if neither is in the table -> OK |
1681
23c911d09382
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
michael
parents:
1675
diff
changeset
|
2434 //if tag is in the table with another id -> FAIL |
23c911d09382
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
michael
parents:
1675
diff
changeset
|
2435 //if id is in the table with another tag -> FAIL unless strict < ? |
23c911d09382
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
michael
parents:
1675
diff
changeset
|
2436 }else |
23c911d09382
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
michael
parents:
1675
diff
changeset
|
2437 st->codec->codec_tag= av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id); |
23c911d09382
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
michael
parents:
1675
diff
changeset
|
2438 } |
839 | 2439 } |
2440 | |
1625
f1ccbe0ad364
10l, only allocate priv_data if not already done
bcoudurier
parents:
1624
diff
changeset
|
2441 if (!s->priv_data && s->oformat->priv_data_size > 0) { |
1624 | 2442 s->priv_data = av_mallocz(s->oformat->priv_data_size); |
2443 if (!s->priv_data) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2266
diff
changeset
|
2444 return AVERROR(ENOMEM); |
1625
f1ccbe0ad364
10l, only allocate priv_data if not already done
bcoudurier
parents:
1624
diff
changeset
|
2445 } |
1624 | 2446 |
4158
ea1e24175669
Add a metadata compatibility layer, so that when a user application set
aurel
parents:
4154
diff
changeset
|
2447 #if LIBAVFORMAT_VERSION_MAJOR < 53 |
4181
17a8a3696ee1
rename ff_metadata_sync_compat to ff_metadata_mux_compat
aurel
parents:
4179
diff
changeset
|
2448 ff_metadata_mux_compat(s); |
4158
ea1e24175669
Add a metadata compatibility layer, so that when a user application set
aurel
parents:
4154
diff
changeset
|
2449 #endif |
ea1e24175669
Add a metadata compatibility layer, so that when a user application set
aurel
parents:
4154
diff
changeset
|
2450 |
869 | 2451 if(s->oformat->write_header){ |
2452 ret = s->oformat->write_header(s); | |
2453 if (ret < 0) | |
2454 return ret; | |
2455 } | |
0 | 2456 |
2457 /* init PTS generation */ | |
2458 for(i=0;i<s->nb_streams;i++) { | |
840
8834d33b7ca1
minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents:
839
diff
changeset
|
2459 int64_t den = AV_NOPTS_VALUE; |
0 | 2460 st = s->streams[i]; |
2461 | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2462 switch (st->codec->codec_type) { |
0 | 2463 case CODEC_TYPE_AUDIO: |
840
8834d33b7ca1
minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents:
839
diff
changeset
|
2464 den = (int64_t)st->time_base.num * st->codec->sample_rate; |
0 | 2465 break; |
2466 case CODEC_TYPE_VIDEO: | |
840
8834d33b7ca1
minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents:
839
diff
changeset
|
2467 den = (int64_t)st->time_base.num * st->codec->time_base.den; |
0 | 2468 break; |
2469 default: | |
2470 break; | |
2471 } | |
840
8834d33b7ca1
minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents:
839
diff
changeset
|
2472 if (den != AV_NOPTS_VALUE) { |
8834d33b7ca1
minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents:
839
diff
changeset
|
2473 if (den <= 0) |
8834d33b7ca1
minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents:
839
diff
changeset
|
2474 return AVERROR_INVALIDDATA; |
8834d33b7ca1
minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents:
839
diff
changeset
|
2475 av_frac_init(&st->pts, 0, 0, den); |
8834d33b7ca1
minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents:
839
diff
changeset
|
2476 } |
0 | 2477 } |
2478 return 0; | |
2479 } | |
2480 | |
470 | 2481 //FIXME merge with compute_pkt_fields |
617
1ca4877e42f3
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
michael
parents:
616
diff
changeset
|
2482 static int compute_pkt_fields2(AVStream *st, AVPacket *pkt){ |
1285
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2483 int delay = FFMAX(st->codec->has_b_frames, !!st->codec->max_b_frames); |
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2484 int num, den, frame_size, i; |
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2485 |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1442
diff
changeset
|
2486 // av_log(st->codec, AV_LOG_DEBUG, "av_write_frame: pts:%"PRId64" dts:%"PRId64" cur_dts:%"PRId64" b:%d size:%d st:%d\n", pkt->pts, pkt->dts, st->cur_dts, delay, pkt->size, pkt->stream_index); |
885 | 2487 |
468 | 2488 /* if(pkt->pts == AV_NOPTS_VALUE && pkt->dts == AV_NOPTS_VALUE) |
2489 return -1;*/ | |
885 | 2490 |
468 | 2491 /* duration field */ |
470 | 2492 if (pkt->duration == 0) { |
2493 compute_frame_duration(&num, &den, st, NULL, pkt); | |
2494 if (den && num) { | |
2495 pkt->duration = av_rescale(1, num * (int64_t)st->time_base.den, den * (int64_t)st->time_base.num); | |
2496 } | |
2497 } | |
409 | 2498 |
3502
322e2fb56ce8
Fill missing pts in during muxing when we know that they are equal to dts.
michael
parents:
3501
diff
changeset
|
2499 if(pkt->pts == AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && delay==0) |
322e2fb56ce8
Fill missing pts in during muxing when we know that they are equal to dts.
michael
parents:
3501
diff
changeset
|
2500 pkt->pts= pkt->dts; |
322e2fb56ce8
Fill missing pts in during muxing when we know that they are equal to dts.
michael
parents:
3501
diff
changeset
|
2501 |
468 | 2502 //XXX/FIXME this is a temporary hack until all encoders output pts |
1285
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2503 if((pkt->pts == 0 || pkt->pts == AV_NOPTS_VALUE) && pkt->dts == AV_NOPTS_VALUE && !delay){ |
468 | 2504 pkt->dts= |
2505 // pkt->pts= st->cur_dts; | |
2506 pkt->pts= st->pts.val; | |
2507 } | |
2508 | |
885 | 2509 //calculate dts from pts |
3710
48a262da0100
Prevent dts generation code to be executed when delay is > MAX_REORDER_DELAY,
bcoudurier
parents:
3703
diff
changeset
|
2510 if(pkt->pts != AV_NOPTS_VALUE && pkt->dts == AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY){ |
1285
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2511 st->pts_buffer[0]= pkt->pts; |
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2512 for(i=1; i<delay+1 && st->pts_buffer[i] == AV_NOPTS_VALUE; i++) |
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2513 st->pts_buffer[i]= (i-delay-1) * pkt->duration; |
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2514 for(i=0; i<delay && st->pts_buffer[i] > st->pts_buffer[i+1]; i++) |
1442 | 2515 FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]); |
1285
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2516 |
b5226e679a31
fix b pyramid in mp4 muxing if no dts are provided to the muxer
michael
parents:
1279
diff
changeset
|
2517 pkt->dts= st->pts_buffer[0]; |
468 | 2518 } |
885 | 2519 |
617
1ca4877e42f3
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
michael
parents:
616
diff
changeset
|
2520 if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && st->cur_dts >= pkt->dts){ |
3525 | 2521 av_log(st->codec, AV_LOG_ERROR, "error, non monotone timestamps %"PRId64" >= %"PRId64"\n", st->cur_dts, pkt->dts); |
617
1ca4877e42f3
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
michael
parents:
616
diff
changeset
|
2522 return -1; |
1ca4877e42f3
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
michael
parents:
616
diff
changeset
|
2523 } |
1ca4877e42f3
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
michael
parents:
616
diff
changeset
|
2524 if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts < pkt->dts){ |
3525 | 2525 av_log(st->codec, AV_LOG_ERROR, "error, pts < dts\n"); |
617
1ca4877e42f3
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
michael
parents:
616
diff
changeset
|
2526 return -1; |
1ca4877e42f3
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
michael
parents:
616
diff
changeset
|
2527 } |
1ca4877e42f3
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
michael
parents:
616
diff
changeset
|
2528 |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1442
diff
changeset
|
2529 // av_log(NULL, AV_LOG_DEBUG, "av_write_frame: pts2:%"PRId64" dts2:%"PRId64"\n", pkt->pts, pkt->dts); |
468 | 2530 st->cur_dts= pkt->dts; |
2531 st->pts.val= pkt->dts; | |
2532 | |
0 | 2533 /* update pts */ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2534 switch (st->codec->codec_type) { |
0 | 2535 case CODEC_TYPE_AUDIO: |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2536 frame_size = get_audio_frame_size(st->codec, pkt->size); |
406
ea22a438ca79
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
404
diff
changeset
|
2537 |
2936 | 2538 /* HACK/FIXME, we skip the initial 0 size packets as they are most |
2539 likely equal to the encoder delay, but it would be better if we | |
2540 had the real timestamps from the encoder */ | |
468 | 2541 if (frame_size >= 0 && (pkt->size || st->pts.num!=st->pts.den>>1 || st->pts.val)) { |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
453
diff
changeset
|
2542 av_frac_add(&st->pts, (int64_t)st->time_base.den * frame_size); |
0 | 2543 } |
2544 break; | |
2545 case CODEC_TYPE_VIDEO: | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2546 av_frac_add(&st->pts, (int64_t)st->time_base.den * st->codec->time_base.num); |
0 | 2547 break; |
2548 default: | |
2549 break; | |
2550 } | |
617
1ca4877e42f3
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
michael
parents:
616
diff
changeset
|
2551 return 0; |
470 | 2552 } |
2553 | |
2554 int av_write_frame(AVFormatContext *s, AVPacket *pkt) | |
2555 { | |
3429 | 2556 int ret = compute_pkt_fields2(s->streams[pkt->stream_index], pkt); |
2557 | |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1244
diff
changeset
|
2558 if(ret<0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) |
617
1ca4877e42f3
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
michael
parents:
616
diff
changeset
|
2559 return ret; |
885 | 2560 |
554 | 2561 ret= s->oformat->write_packet(s, pkt); |
2562 if(!ret) | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
2563 ret= url_ferror(s->pb); |
554 | 2564 return ret; |
470 | 2565 } |
2566 | |
1251 | 2567 int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush){ |
470 | 2568 AVPacketList *pktl, **next_point, *this_pktl; |
2569 int stream_count=0; | |
2570 int streams[MAX_STREAMS]; | |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2571 |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2572 if(pkt){ |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2573 AVStream *st= s->streams[ pkt->stream_index]; |
470 | 2574 |
804 | 2575 // assert(pkt->destruct != av_destruct_packet); //FIXME |
470 | 2576 |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2577 this_pktl = av_mallocz(sizeof(AVPacketList)); |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2578 this_pktl->pkt= *pkt; |
804 | 2579 if(pkt->destruct == av_destruct_packet) |
2936 | 2580 pkt->destruct= NULL; // not shared -> must keep original from being freed |
804 | 2581 else |
2582 av_dup_packet(&this_pktl->pkt); //shared -> must dup | |
470 | 2583 |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2584 next_point = &s->packet_buffer; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2585 while(*next_point){ |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2586 AVStream *st2= s->streams[ (*next_point)->pkt.stream_index]; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2587 int64_t left= st2->time_base.num * (int64_t)st ->time_base.den; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2588 int64_t right= st ->time_base.num * (int64_t)st2->time_base.den; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2589 if((*next_point)->pkt.dts * left > pkt->dts * right) //FIXME this can overflow |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2590 break; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2591 next_point= &(*next_point)->next; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2592 } |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2593 this_pktl->next= *next_point; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2594 *next_point= this_pktl; |
470 | 2595 } |
885 | 2596 |
470 | 2597 memset(streams, 0, sizeof(streams)); |
2598 pktl= s->packet_buffer; | |
2599 while(pktl){ | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1442
diff
changeset
|
2600 //av_log(s, AV_LOG_DEBUG, "show st:%d dts:%"PRId64"\n", pktl->pkt.stream_index, pktl->pkt.dts); |
470 | 2601 if(streams[ pktl->pkt.stream_index ] == 0) |
2602 stream_count++; | |
2603 streams[ pktl->pkt.stream_index ]++; | |
2604 pktl= pktl->next; | |
2605 } | |
885 | 2606 |
3485
99565673f94c
Check if there is at least a stream before writing trailer.
benoit
parents:
3445
diff
changeset
|
2607 if(stream_count && (s->nb_streams == stream_count || flush)){ |
470 | 2608 pktl= s->packet_buffer; |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2609 *out= pktl->pkt; |
885 | 2610 |
2611 s->packet_buffer= pktl->next; | |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2612 av_freep(&pktl); |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2613 return 1; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2614 }else{ |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2615 av_init_packet(out); |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2616 return 0; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2617 } |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2618 } |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2619 |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2620 /** |
2936 | 2621 * Interleaves an AVPacket correctly so it can be muxed. |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2622 * @param out the interleaved packet will be output here |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2623 * @param in the input packet |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2624 * @param flush 1 if no further packets are available as input and all |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2625 * remaining packets should be output |
885 | 2626 * @return 1 if a packet was output, 0 if no packet could be output, |
3175 | 2627 * < 0 if an error occurred |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2628 */ |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2629 static int av_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *in, int flush){ |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2630 if(s->oformat->interleave_packet) |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2631 return s->oformat->interleave_packet(s, out, in, flush); |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2632 else |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2633 return av_interleave_packet_per_dts(s, out, in, flush); |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2634 } |
470 | 2635 |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2636 int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt){ |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2637 AVStream *st= s->streams[ pkt->stream_index]; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2638 |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2639 //FIXME/XXX/HACK drop zero sized packets |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
819
diff
changeset
|
2640 if(st->codec->codec_type == CODEC_TYPE_AUDIO && pkt->size==0) |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2641 return 0; |
717
a79f89d39c3c
discard dummy packets before doing inapropriate checks on them and failing as a result
michael
parents:
708
diff
changeset
|
2642 |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1442
diff
changeset
|
2643 //av_log(NULL, AV_LOG_DEBUG, "av_interleaved_write_frame %d %"PRId64" %"PRId64"\n", pkt->size, pkt->dts, pkt->pts); |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1244
diff
changeset
|
2644 if(compute_pkt_fields2(st, pkt) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) |
717
a79f89d39c3c
discard dummy packets before doing inapropriate checks on them and failing as a result
michael
parents:
708
diff
changeset
|
2645 return -1; |
885 | 2646 |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2647 if(pkt->dts == AV_NOPTS_VALUE) |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2648 return -1; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2649 |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2650 for(;;){ |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2651 AVPacket opkt; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2652 int ret= av_interleave_packet(s, &opkt, pkt, 0); |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2653 if(ret<=0) //FIXME cleanup needed for ret<0 ? |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2654 return ret; |
885 | 2655 |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2656 ret= s->oformat->write_packet(s, &opkt); |
885 | 2657 |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2658 av_free_packet(&opkt); |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2659 pkt= NULL; |
885 | 2660 |
470 | 2661 if(ret<0) |
2662 return ret; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
2663 if(url_ferror(s->pb)) |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
2664 return url_ferror(s->pb); |
470 | 2665 } |
0 | 2666 } |
2667 | |
2668 int av_write_trailer(AVFormatContext *s) | |
2669 { | |
540
26a477a5ebda
move free() of AVStream priv data to av_write_trailer()
michael
parents:
536
diff
changeset
|
2670 int ret, i; |
885 | 2671 |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2672 for(;;){ |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2673 AVPacket pkt; |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2674 ret= av_interleave_packet(s, &pkt, NULL, 1); |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2675 if(ret<0) //FIXME cleanup needed for ret<0 ? |
540
26a477a5ebda
move free() of AVStream priv data to av_write_trailer()
michael
parents:
536
diff
changeset
|
2676 goto fail; |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2677 if(!ret) |
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2678 break; |
885 | 2679 |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2680 ret= s->oformat->write_packet(s, &pkt); |
885 | 2681 |
536
76c47c58064f
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents:
535
diff
changeset
|
2682 av_free_packet(&pkt); |
885 | 2683 |
470 | 2684 if(ret<0) |
540
26a477a5ebda
move free() of AVStream priv data to av_write_trailer()
michael
parents:
536
diff
changeset
|
2685 goto fail; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
2686 if(url_ferror(s->pb)) |
554 | 2687 goto fail; |
470 | 2688 } |
2689 | |
869 | 2690 if(s->oformat->write_trailer) |
2691 ret = s->oformat->write_trailer(s); | |
540
26a477a5ebda
move free() of AVStream priv data to av_write_trailer()
michael
parents:
536
diff
changeset
|
2692 fail: |
554 | 2693 if(ret == 0) |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2734
diff
changeset
|
2694 ret=url_ferror(s->pb); |
540
26a477a5ebda
move free() of AVStream priv data to av_write_trailer()
michael
parents:
536
diff
changeset
|
2695 for(i=0;i<s->nb_streams;i++) |
26a477a5ebda
move free() of AVStream priv data to av_write_trailer()
michael
parents:
536
diff
changeset
|
2696 av_freep(&s->streams[i]->priv_data); |
0 | 2697 av_freep(&s->priv_data); |
2698 return ret; | |
2699 } | |
2700 | |
2650
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2701 void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx) |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2702 { |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2703 int i, j; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2704 AVProgram *program=NULL; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2705 void *tmp; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2706 |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2707 for(i=0; i<ac->nb_programs; i++){ |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2708 if(ac->programs[i]->id != progid) |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2709 continue; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2710 program = ac->programs[i]; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2711 for(j=0; j<program->nb_stream_indexes; j++) |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2712 if(program->stream_index[j] == idx) |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2713 return; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2714 |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2715 tmp = av_realloc(program->stream_index, sizeof(unsigned int)*(program->nb_stream_indexes+1)); |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2716 if(!tmp) |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2717 return; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2718 program->stream_index = tmp; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2719 program->stream_index[program->nb_stream_indexes++] = idx; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2720 return; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2721 } |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2722 } |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2723 |
0 | 2724 /* "user interface" functions */ |
2658
8b0fbab56ea2
100l, fix dump_format, declare buf in dump_stream_format, sizeof(buf) is 4 because buf is char* since r10818
bcoudurier
parents:
2650
diff
changeset
|
2725 static void dump_stream_format(AVFormatContext *ic, int i, int index, int is_output) |
2649
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2726 { |
2658
8b0fbab56ea2
100l, fix dump_format, declare buf in dump_stream_format, sizeof(buf) is 4 because buf is char* since r10818
bcoudurier
parents:
2650
diff
changeset
|
2727 char buf[256]; |
2649
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2728 int flags = (is_output ? ic->oformat->flags : ic->iformat->flags); |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2729 AVStream *st = ic->streams[i]; |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2730 int g = ff_gcd(st->time_base.num, st->time_base.den); |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2731 avcodec_string(buf, sizeof(buf), st->codec, is_output); |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2732 av_log(NULL, AV_LOG_INFO, " Stream #%d.%d", index, i); |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2733 /* the pid is an important information, so we display it */ |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2734 /* XXX: add a generic system */ |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2735 if (flags & AVFMT_SHOW_IDS) |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2736 av_log(NULL, AV_LOG_INFO, "[0x%x]", st->id); |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2737 if (strlen(st->language) > 0) |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2738 av_log(NULL, AV_LOG_INFO, "(%s)", st->language); |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2739 av_log(NULL, AV_LOG_DEBUG, ", %d/%d", st->time_base.num/g, st->time_base.den/g); |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2740 av_log(NULL, AV_LOG_INFO, ": %s", buf); |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2741 if(st->codec->codec_type == CODEC_TYPE_VIDEO){ |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2742 if(st->r_frame_rate.den && st->r_frame_rate.num) |
2734
1b2658f20244
rename fps(frame per second) to tb(time base) to prevent
michael
parents:
2678
diff
changeset
|
2743 av_log(NULL, AV_LOG_INFO, ", %5.2f tb(r)", av_q2d(st->r_frame_rate)); |
2649
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2744 /* else if(st->time_base.den && st->time_base.num) |
2734
1b2658f20244
rename fps(frame per second) to tb(time base) to prevent
michael
parents:
2678
diff
changeset
|
2745 av_log(NULL, AV_LOG_INFO, ", %5.2f tb(m)", 1/av_q2d(st->time_base));*/ |
2649
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2746 else |
2734
1b2658f20244
rename fps(frame per second) to tb(time base) to prevent
michael
parents:
2678
diff
changeset
|
2747 av_log(NULL, AV_LOG_INFO, ", %5.2f tb(c)", 1/av_q2d(st->codec->time_base)); |
2649
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2748 } |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2749 av_log(NULL, AV_LOG_INFO, "\n"); |
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2750 } |
0 | 2751 |
2752 void dump_format(AVFormatContext *ic, | |
885 | 2753 int index, |
0 | 2754 const char *url, |
2755 int is_output) | |
2756 { | |
2672 | 2757 int i; |
0 | 2758 |
885 | 2759 av_log(NULL, AV_LOG_INFO, "%s #%d, %s, %s '%s':\n", |
0 | 2760 is_output ? "Output" : "Input", |
885 | 2761 index, |
2762 is_output ? ic->oformat->name : ic->iformat->name, | |
0 | 2763 is_output ? "to" : "from", url); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2764 if (!is_output) { |
776 | 2765 av_log(NULL, AV_LOG_INFO, " Duration: "); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2766 if (ic->duration != AV_NOPTS_VALUE) { |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2767 int hours, mins, secs, us; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2768 secs = ic->duration / AV_TIME_BASE; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2769 us = ic->duration % AV_TIME_BASE; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2770 mins = secs / 60; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2771 secs %= 60; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2772 hours = mins / 60; |
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2773 mins %= 60; |
3230 | 2774 av_log(NULL, AV_LOG_INFO, "%02d:%02d:%02d.%02d", hours, mins, secs, |
2775 (100 * us) / AV_TIME_BASE); | |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2776 } else { |
776 | 2777 av_log(NULL, AV_LOG_INFO, "N/A"); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2778 } |
556
cb5f220888c0
print start_time patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents:
555
diff
changeset
|
2779 if (ic->start_time != AV_NOPTS_VALUE) { |
cb5f220888c0
print start_time patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents:
555
diff
changeset
|
2780 int secs, us; |
776 | 2781 av_log(NULL, AV_LOG_INFO, ", start: "); |
556
cb5f220888c0
print start_time patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents:
555
diff
changeset
|
2782 secs = ic->start_time / AV_TIME_BASE; |
cb5f220888c0
print start_time patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents:
555
diff
changeset
|
2783 us = ic->start_time % AV_TIME_BASE; |
776 | 2784 av_log(NULL, AV_LOG_INFO, "%d.%06d", |
556
cb5f220888c0
print start_time patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents:
555
diff
changeset
|
2785 secs, (int)av_rescale(us, 1000000, AV_TIME_BASE)); |
cb5f220888c0
print start_time patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents:
555
diff
changeset
|
2786 } |
776 | 2787 av_log(NULL, AV_LOG_INFO, ", bitrate: "); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2788 if (ic->bit_rate) { |
776 | 2789 av_log(NULL, AV_LOG_INFO,"%d kb/s", ic->bit_rate / 1000); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2790 } else { |
776 | 2791 av_log(NULL, AV_LOG_INFO, "N/A"); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2792 } |
776 | 2793 av_log(NULL, AV_LOG_INFO, "\n"); |
192
0316a506aeb0
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents:
175
diff
changeset
|
2794 } |
2650
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2795 if(ic->nb_programs) { |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2796 int j, k; |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2797 for(j=0; j<ic->nb_programs; j++) { |
2678
e69fd694b767
print newline after program id even when the name is missing
nicodvb
parents:
2672
diff
changeset
|
2798 av_log(NULL, AV_LOG_INFO, " Program %d %s\n", ic->programs[j]->id, |
e69fd694b767
print newline after program id even when the name is missing
nicodvb
parents:
2672
diff
changeset
|
2799 ic->programs[j]->name ? ic->programs[j]->name : ""); |
2650
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2800 for(k=0; k<ic->programs[j]->nb_stream_indexes; k++) |
2658
8b0fbab56ea2
100l, fix dump_format, declare buf in dump_stream_format, sizeof(buf) is 4 because buf is char* since r10818
bcoudurier
parents:
2650
diff
changeset
|
2801 dump_stream_format(ic, ic->programs[j]->stream_index[k], index, is_output); |
2650
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2802 } |
4e3d38c8896c
API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
nicodvb
parents:
2649
diff
changeset
|
2803 } else |
2649
1864b0a09d52
cosmetics: moved to a separate function the code to print the characteristics of an AVStream
nicodvb
parents:
2621
diff
changeset
|
2804 for(i=0;i<ic->nb_streams;i++) |
2658
8b0fbab56ea2
100l, fix dump_format, declare buf in dump_stream_format, sizeof(buf) is 4 because buf is char* since r10818
bcoudurier
parents:
2650
diff
changeset
|
2805 dump_stream_format(ic, i, index, is_output); |
0 | 2806 } |
2807 | |
4147
b3d75fa26b5c
Drop the deprecated parse_image_size() and parse_frame_rate() functions
stefano
parents:
4019
diff
changeset
|
2808 #if LIBAVFORMAT_VERSION_MAJOR < 53 |
0 | 2809 int parse_image_size(int *width_ptr, int *height_ptr, const char *str) |
2810 { | |
2163
6c0176688fae
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
2160
diff
changeset
|
2811 return av_parse_video_frame_size(width_ptr, height_ptr, str); |
0 | 2812 } |
2813 | |
2163
6c0176688fae
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
2160
diff
changeset
|
2814 int parse_frame_rate(int *frame_rate_num, int *frame_rate_den, const char *arg) |
168 | 2815 { |
2163
6c0176688fae
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
2160
diff
changeset
|
2816 AVRational frame_rate; |
6c0176688fae
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
2160
diff
changeset
|
2817 int ret = av_parse_video_frame_rate(&frame_rate, arg); |
6c0176688fae
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
2160
diff
changeset
|
2818 *frame_rate_num= frame_rate.num; |
6c0176688fae
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
2160
diff
changeset
|
2819 *frame_rate_den= frame_rate.den; |
6c0176688fae
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
2160
diff
changeset
|
2820 return ret; |
168 | 2821 } |
4147
b3d75fa26b5c
Drop the deprecated parse_image_size() and parse_frame_rate() functions
stefano
parents:
4019
diff
changeset
|
2822 #endif |
168 | 2823 |
2266 | 2824 int64_t av_gettime(void) |
2825 { | |
2826 struct timeval tv; | |
2827 gettimeofday(&tv,NULL); | |
2828 return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec; | |
2829 } | |
2830 | |
65 | 2831 int64_t parse_date(const char *datestr, int duration) |
0 | 2832 { |
2833 const char *p; | |
65 | 2834 int64_t t; |
0 | 2835 struct tm dt; |
2836 int i; | |
3769 | 2837 static const char * const date_fmt[] = { |
0 | 2838 "%Y-%m-%d", |
2839 "%Y%m%d", | |
2840 }; | |
3769 | 2841 static const char * const time_fmt[] = { |
0 | 2842 "%H:%M:%S", |
2843 "%H%M%S", | |
2844 }; | |
2845 const char *q; | |
2846 int is_utc, len; | |
2847 char lastch; | |
477 | 2848 int negative = 0; |
406
ea22a438ca79
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
404
diff
changeset
|
2849 |
ea22a438ca79
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
404
diff
changeset
|
2850 #undef time |
0 | 2851 time_t now = time(0); |
2852 | |
2853 len = strlen(datestr); | |
2854 if (len > 0) | |
2855 lastch = datestr[len - 1]; | |
2856 else | |
2857 lastch = '\0'; | |
2858 is_utc = (lastch == 'z' || lastch == 'Z'); | |
2859 | |
2860 memset(&dt, 0, sizeof(dt)); | |
2861 | |
2862 p = datestr; | |
2863 q = NULL; | |
2864 if (!duration) { | |
2557
0c4febec2258
Add explanatory comments to the parse_date function.
diego
parents:
2555
diff
changeset
|
2865 /* parse the year-month-day part */ |
4001 | 2866 for (i = 0; i < FF_ARRAY_ELEMS(date_fmt); i++) { |
230
9f4f4ca9f7b5
simpler strptime - added os_support.[ch] - moved localtime_r to os_support.c
bellard
parents:
229
diff
changeset
|
2867 q = small_strptime(p, date_fmt[i], &dt); |
0 | 2868 if (q) { |
2869 break; | |
2870 } | |
2871 } | |
2872 | |
2557
0c4febec2258
Add explanatory comments to the parse_date function.
diego
parents:
2555
diff
changeset
|
2873 /* if the year-month-day part is missing, then take the |
0c4febec2258
Add explanatory comments to the parse_date function.
diego
parents:
2555
diff
changeset
|
2874 * current year-month-day time */ |
0 | 2875 if (!q) { |
2876 if (is_utc) { | |
2877 dt = *gmtime(&now); | |
2878 } else { | |
2879 dt = *localtime(&now); | |
2880 } | |
2881 dt.tm_hour = dt.tm_min = dt.tm_sec = 0; | |
2882 } else { | |
2883 p = q; | |
2884 } | |
2885 | |
2886 if (*p == 'T' || *p == 't' || *p == ' ') | |
2887 p++; | |
2888 | |
2557
0c4febec2258
Add explanatory comments to the parse_date function.
diego
parents:
2555
diff
changeset
|
2889 /* parse the hour-minute-second part */ |
4001 | 2890 for (i = 0; i < FF_ARRAY_ELEMS(time_fmt); i++) { |
230
9f4f4ca9f7b5
simpler strptime - added os_support.[ch] - moved localtime_r to os_support.c
bellard
parents:
229
diff
changeset
|
2891 q = small_strptime(p, time_fmt[i], &dt); |
0 | 2892 if (q) { |
2893 break; | |
2894 } | |
2895 } | |
2896 } else { | |
2557
0c4febec2258
Add explanatory comments to the parse_date function.
diego
parents:
2555
diff
changeset
|
2897 /* parse datestr as a duration */ |
887 | 2898 if (p[0] == '-') { |
2899 negative = 1; | |
2900 ++p; | |
2901 } | |
2557
0c4febec2258
Add explanatory comments to the parse_date function.
diego
parents:
2555
diff
changeset
|
2902 /* parse datestr as HH:MM:SS */ |
230
9f4f4ca9f7b5
simpler strptime - added os_support.[ch] - moved localtime_r to os_support.c
bellard
parents:
229
diff
changeset
|
2903 q = small_strptime(p, time_fmt[0], &dt); |
0 | 2904 if (!q) { |
2557
0c4febec2258
Add explanatory comments to the parse_date function.
diego
parents:
2555
diff
changeset
|
2905 /* parse datestr as S+ */ |
0 | 2906 dt.tm_sec = strtol(p, (char **)&q, 10); |
2559
c57d3d6c8f44
Make parse_date return INT64_MIN in case of unparsable input.
benoit
parents:
2557
diff
changeset
|
2907 if (q == p) |
c57d3d6c8f44
Make parse_date return INT64_MIN in case of unparsable input.
benoit
parents:
2557
diff
changeset
|
2908 /* the parsing didn't succeed */ |
c57d3d6c8f44
Make parse_date return INT64_MIN in case of unparsable input.
benoit
parents:
2557
diff
changeset
|
2909 return INT64_MIN; |
0 | 2910 dt.tm_min = 0; |
2911 dt.tm_hour = 0; | |
2912 } | |
2913 } | |
2914 | |
2915 /* Now we have all the fields that we can get */ | |
2916 if (!q) { | |
2559
c57d3d6c8f44
Make parse_date return INT64_MIN in case of unparsable input.
benoit
parents:
2557
diff
changeset
|
2917 return INT64_MIN; |
0 | 2918 } |
2919 | |
2920 if (duration) { | |
2921 t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec; | |
2922 } else { | |
2923 dt.tm_isdst = -1; /* unknown */ | |
2924 if (is_utc) { | |
2925 t = mktimegm(&dt); | |
2926 } else { | |
2927 t = mktime(&dt); | |
2928 } | |
2929 } | |
2930 | |
2931 t *= 1000000; | |
2932 | |
2557
0c4febec2258
Add explanatory comments to the parse_date function.
diego
parents:
2555
diff
changeset
|
2933 /* parse the .m... part */ |
0 | 2934 if (*q == '.') { |
2935 int val, n; | |
2936 q++; | |
2937 for (val = 0, n = 100000; n >= 1; n /= 10, q++) { | |
885 | 2938 if (!isdigit(*q)) |
0 | 2939 break; |
2940 val += n * (*q - '0'); | |
2941 } | |
2942 t += val; | |
2943 } | |
477 | 2944 return negative ? -t : t; |
0 | 2945 } |
2946 | |
2947 int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info) | |
2948 { | |
2949 const char *p; | |
2950 char tag[128], *q; | |
2951 | |
2952 p = info; | |
2953 if (*p == '?') | |
2954 p++; | |
2955 for(;;) { | |
2956 q = tag; | |
2957 while (*p != '\0' && *p != '=' && *p != '&') { | |
2958 if ((q - tag) < sizeof(tag) - 1) | |
2959 *q++ = *p; | |
2960 p++; | |
2961 } | |
2962 *q = '\0'; | |
2963 q = arg; | |
2964 if (*p == '=') { | |
2965 p++; | |
2966 while (*p != '&' && *p != '\0') { | |
2967 if ((q - arg) < arg_size - 1) { | |
2968 if (*p == '+') | |
2969 *q++ = ' '; | |
2970 else | |
2971 *q++ = *p; | |
2972 } | |
2973 p++; | |
2974 } | |
2975 *q = '\0'; | |
2976 } | |
885 | 2977 if (!strcmp(tag, tag1)) |
0 | 2978 return 1; |
2979 if (*p != '&') | |
2980 break; | |
2981 p++; | |
2982 } | |
2983 return 0; | |
2984 } | |
2985 | |
1291
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1285
diff
changeset
|
2986 int av_get_frame_filename(char *buf, int buf_size, |
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1285
diff
changeset
|
2987 const char *path, int number) |
0 | 2988 { |
2989 const char *p; | |
290
7a3ed84008ec
GCC 3.3.2 warnings patch by (Panagiotis Issaris <takis at lumumba dot luc dot ac dot be>)
michael
parents:
230
diff
changeset
|
2990 char *q, buf1[20], c; |
7a3ed84008ec
GCC 3.3.2 warnings patch by (Panagiotis Issaris <takis at lumumba dot luc dot ac dot be>)
michael
parents:
230
diff
changeset
|
2991 int nd, len, percentd_found; |
0 | 2992 |
2993 q = buf; | |
2994 p = path; | |
2995 percentd_found = 0; | |
2996 for(;;) { | |
2997 c = *p++; | |
2998 if (c == '\0') | |
2999 break; | |
3000 if (c == '%') { | |
9
97e61383cb81
* Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents:
7
diff
changeset
|
3001 do { |
97e61383cb81
* Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents:
7
diff
changeset
|
3002 nd = 0; |
97e61383cb81
* Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents:
7
diff
changeset
|
3003 while (isdigit(*p)) { |
97e61383cb81
* Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents:
7
diff
changeset
|
3004 nd = nd * 10 + *p++ - '0'; |
97e61383cb81
* Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents:
7
diff
changeset
|
3005 } |
97e61383cb81
* Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents:
7
diff
changeset
|
3006 c = *p++; |
97e61383cb81
* Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents:
7
diff
changeset
|
3007 } while (isdigit(c)); |
97e61383cb81
* Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents:
7
diff
changeset
|
3008 |
0 | 3009 switch(c) { |
3010 case '%': | |
3011 goto addchar; | |
3012 case 'd': | |
3013 if (percentd_found) | |
3014 goto fail; | |
3015 percentd_found = 1; | |
3016 snprintf(buf1, sizeof(buf1), "%0*d", nd, number); | |
3017 len = strlen(buf1); | |
3018 if ((q - buf + len) > buf_size - 1) | |
3019 goto fail; | |
3020 memcpy(q, buf1, len); | |
3021 q += len; | |
3022 break; | |
3023 default: | |
3024 goto fail; | |
3025 } | |
3026 } else { | |
3027 addchar: | |
3028 if ((q - buf) < buf_size - 1) | |
3029 *q++ = c; | |
3030 } | |
3031 } | |
3032 if (!percentd_found) | |
3033 goto fail; | |
3034 *q = '\0'; | |
3035 return 0; | |
3036 fail: | |
3037 *q = '\0'; | |
3038 return -1; | |
3039 } | |
3040 | |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3041 static void hex_dump_internal(void *avcl, FILE *f, int level, uint8_t *buf, int size) |
0 | 3042 { |
3043 int len, i, j, c; | |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3044 #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0) |
0 | 3045 |
3046 for(i=0;i<size;i+=16) { | |
3047 len = size - i; | |
3048 if (len > 16) | |
3049 len = 16; | |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3050 PRINT("%08x ", i); |
0 | 3051 for(j=0;j<16;j++) { |
3052 if (j < len) | |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3053 PRINT(" %02x", buf[i+j]); |
0 | 3054 else |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3055 PRINT(" "); |
0 | 3056 } |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3057 PRINT(" "); |
0 | 3058 for(j=0;j<len;j++) { |
3059 c = buf[i+j]; | |
3060 if (c < ' ' || c > '~') | |
3061 c = '.'; | |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3062 PRINT("%c", c); |
0 | 3063 } |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3064 PRINT("\n"); |
0 | 3065 } |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3066 #undef PRINT |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3067 } |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3068 |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3069 void av_hex_dump(FILE *f, uint8_t *buf, int size) |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3070 { |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3071 hex_dump_internal(NULL, f, 0, buf, size); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3072 } |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3073 |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3074 void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size) |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3075 { |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3076 hex_dump_internal(avcl, NULL, level, buf, size); |
0 | 3077 } |
3078 | |
743 | 3079 //FIXME needs to know the time_base |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3080 static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int dump_payload) |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3081 { |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3082 #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0) |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3083 PRINT("stream #%d:\n", pkt->stream_index); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3084 PRINT(" keyframe=%d\n", ((pkt->flags & PKT_FLAG_KEY) != 0)); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3085 PRINT(" duration=%0.3f\n", (double)pkt->duration / AV_TIME_BASE); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3086 /* DTS is _always_ valid after av_read_frame() */ |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3087 PRINT(" dts="); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3088 if (pkt->dts == AV_NOPTS_VALUE) |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3089 PRINT("N/A"); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3090 else |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3091 PRINT("%0.3f", (double)pkt->dts / AV_TIME_BASE); |
2936 | 3092 /* PTS may not be known if B-frames are present. */ |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3093 PRINT(" pts="); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3094 if (pkt->pts == AV_NOPTS_VALUE) |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3095 PRINT("N/A"); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3096 else |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3097 PRINT("%0.3f", (double)pkt->pts / AV_TIME_BASE); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3098 PRINT("\n"); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3099 PRINT(" size=%d\n", pkt->size); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3100 #undef PRINT |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3101 if (dump_payload) |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3102 av_hex_dump(f, pkt->data, pkt->size); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3103 } |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3104 |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
3105 void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload) |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
3106 { |
1908
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3107 pkt_dump_internal(NULL, f, 0, pkt, dump_payload); |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3108 } |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3109 |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3110 void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload) |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3111 { |
174083eafc6c
Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
takis
parents:
1906
diff
changeset
|
3112 pkt_dump_internal(avcl, NULL, level, pkt, dump_payload); |
303
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
3113 } |
2833c2311b66
initial av_read_frame() and av_seek_frame() support
bellard
parents:
293
diff
changeset
|
3114 |
0 | 3115 void url_split(char *proto, int proto_size, |
511
056991ab9f10
HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents:
502
diff
changeset
|
3116 char *authorization, int authorization_size, |
0 | 3117 char *hostname, int hostname_size, |
3118 int *port_ptr, | |
3119 char *path, int path_size, | |
3120 const char *url) | |
3121 { | |
2868
22467d1cf49c
Try to fix url_split() so that the ?foobar part is in the path and only the path.
michael
parents:
2861
diff
changeset
|
3122 const char *p, *ls, *at, *col, *brk; |
2581 | 3123 |
3124 if (port_ptr) *port_ptr = -1; | |
3125 if (proto_size > 0) proto[0] = 0; | |
3126 if (authorization_size > 0) authorization[0] = 0; | |
3127 if (hostname_size > 0) hostname[0] = 0; | |
3128 if (path_size > 0) path[0] = 0; | |
3129 | |
3130 /* parse protocol */ | |
3131 if ((p = strchr(url, ':'))) { | |
3132 av_strlcpy(proto, url, FFMIN(proto_size, p + 1 - url)); | |
3133 p++; /* skip ':' */ | |
3134 if (*p == '/') p++; | |
3135 if (*p == '/') p++; | |
0 | 3136 } else { |
2581 | 3137 /* no protocol means plain filename */ |
3138 av_strlcpy(path, url, path_size); | |
3139 return; | |
3140 } | |
3141 | |
3142 /* separate path from hostname */ | |
2868
22467d1cf49c
Try to fix url_split() so that the ?foobar part is in the path and only the path.
michael
parents:
2861
diff
changeset
|
3143 ls = strchr(p, '/'); |
22467d1cf49c
Try to fix url_split() so that the ?foobar part is in the path and only the path.
michael
parents:
2861
diff
changeset
|
3144 if(!ls) |
22467d1cf49c
Try to fix url_split() so that the ?foobar part is in the path and only the path.
michael
parents:
2861
diff
changeset
|
3145 ls = strchr(p, '?'); |
22467d1cf49c
Try to fix url_split() so that the ?foobar part is in the path and only the path.
michael
parents:
2861
diff
changeset
|
3146 if(ls) |
2869 | 3147 av_strlcpy(path, ls, path_size); |
2868
22467d1cf49c
Try to fix url_split() so that the ?foobar part is in the path and only the path.
michael
parents:
2861
diff
changeset
|
3148 else |
2581 | 3149 ls = &p[strlen(p)]; // XXX |
3150 | |
3151 /* the rest is hostname, use that to parse auth/port */ | |
3152 if (ls != p) { | |
3153 /* authorization (user[:pass]@hostname) */ | |
3154 if ((at = strchr(p, '@')) && at < ls) { | |
3155 av_strlcpy(authorization, p, | |
3156 FFMIN(authorization_size, at + 1 - p)); | |
3157 p = at + 1; /* skip '@' */ | |
0 | 3158 } |
2581 | 3159 |
2583 | 3160 if (*p == '[' && (brk = strchr(p, ']')) && brk < ls) { |
3161 /* [host]:port */ | |
3162 av_strlcpy(hostname, p + 1, | |
3163 FFMIN(hostname_size, brk - p)); | |
3164 if (brk[1] == ':' && port_ptr) | |
3165 *port_ptr = atoi(brk + 2); | |
3166 } else if ((col = strchr(p, ':')) && col < ls) { | |
3167 av_strlcpy(hostname, p, | |
3168 FFMIN(col + 1 - p, hostname_size)); | |
3169 if (port_ptr) *port_ptr = atoi(col + 1); | |
3170 } else | |
3171 av_strlcpy(hostname, p, | |
3172 FFMIN(ls + 1 - p, hostname_size)); | |
0 | 3173 } |
3174 } | |
3175 | |
3788
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
3176 char *ff_data_to_hex(char *buff, const uint8_t *src, int s) |
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
3177 { |
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
3178 int i; |
3789
aa89bbf3fa48
Change implementation for ff_data_to_hex(), this is faster. See discussion on
rbultje
parents:
3788
diff
changeset
|
3179 static const char hex_table[16] = { '0', '1', '2', '3', |
aa89bbf3fa48
Change implementation for ff_data_to_hex(), this is faster. See discussion on
rbultje
parents:
3788
diff
changeset
|
3180 '4', '5', '6', '7', |
aa89bbf3fa48
Change implementation for ff_data_to_hex(), this is faster. See discussion on
rbultje
parents:
3788
diff
changeset
|
3181 '8', '9', 'A', 'B', |
aa89bbf3fa48
Change implementation for ff_data_to_hex(), this is faster. See discussion on
rbultje
parents:
3788
diff
changeset
|
3182 'C', 'D', 'E', 'F' }; |
3788
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
3183 |
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
3184 for(i = 0; i < s; i++) { |
3789
aa89bbf3fa48
Change implementation for ff_data_to_hex(), this is faster. See discussion on
rbultje
parents:
3788
diff
changeset
|
3185 buff[i * 2] = hex_table[src[i] >> 4]; |
aa89bbf3fa48
Change implementation for ff_data_to_hex(), this is faster. See discussion on
rbultje
parents:
3788
diff
changeset
|
3186 buff[i * 2 + 1] = hex_table[src[i] & 0xF]; |
3788
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
3187 } |
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
3188 |
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
3189 return buff; |
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
3190 } |
ca6df1ecb412
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
rbultje
parents:
3783
diff
changeset
|
3191 |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
453
diff
changeset
|
3192 void av_set_pts_info(AVStream *s, int pts_wrap_bits, |
0 | 3193 int pts_num, int pts_den) |
3194 { | |
3581
3c57739a071d
Remove common factors from timebase in av_set_pts_info().
michael
parents:
3575
diff
changeset
|
3195 unsigned int gcd= ff_gcd(pts_num, pts_den); |
0 | 3196 s->pts_wrap_bits = pts_wrap_bits; |
3581
3c57739a071d
Remove common factors from timebase in av_set_pts_info().
michael
parents:
3575
diff
changeset
|
3197 s->time_base.num = pts_num/gcd; |
3c57739a071d
Remove common factors from timebase in av_set_pts_info().
michael
parents:
3575
diff
changeset
|
3198 s->time_base.den = pts_den/gcd; |
3c57739a071d
Remove common factors from timebase in av_set_pts_info().
michael
parents:
3575
diff
changeset
|
3199 |
3c57739a071d
Remove common factors from timebase in av_set_pts_info().
michael
parents:
3575
diff
changeset
|
3200 if(gcd>1) |
3c57739a071d
Remove common factors from timebase in av_set_pts_info().
michael
parents:
3575
diff
changeset
|
3201 av_log(NULL, AV_LOG_DEBUG, "st:%d removing common factor %d from timebase\n", s->index, gcd); |
0 | 3202 } |