annotate utils.c @ 2243:639597604897 libavformat

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