annotate utils.c @ 6069:f3000d7fad52 libavformat

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