annotate utils.c @ 2868:22467d1cf49c libavformat

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