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