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