annotate utils.c @ 5200:cd884511ec8b libavformat

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