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