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