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