annotate utils.c @ 4000:f0580597dc48 libavformat

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