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