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