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