annotate utils.c @ 786:694320ffdda0 libavformat

typo fix by (lists: kenneth aafloy net)
author michael
date Sun, 05 Jun 2005 11:09:50 +0000
parents 47c7fa7c2e7c
children f5a231a9a2f1
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 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
18 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
19 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
21 #undef NDEBUG
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
22 #include <assert.h>
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
23
512
8dfd00fb6a6d Minor Patch for shared libs on Mac OSX by (Bill May <wmay at cisco dot com>)
michael
parents: 511
diff changeset
24 AVInputFormat *first_iformat = NULL;
8dfd00fb6a6d Minor Patch for shared libs on Mac OSX by (Bill May <wmay at cisco dot com>)
michael
parents: 511
diff changeset
25 AVOutputFormat *first_oformat = NULL;
8dfd00fb6a6d Minor Patch for shared libs on Mac OSX by (Bill May <wmay at cisco dot com>)
michael
parents: 511
diff changeset
26 AVImageFormat *first_image_format = NULL;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28 void av_register_input_format(AVInputFormat *format)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30 AVInputFormat **p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31 p = &first_iformat;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32 while (*p != NULL) p = &(*p)->next;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 *p = format;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34 format->next = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
35 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
36
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 void av_register_output_format(AVOutputFormat *format)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
38 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 AVOutputFormat **p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 p = &first_oformat;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
41 while (*p != NULL) p = &(*p)->next;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42 *p = format;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 format->next = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
46 int match_ext(const char *filename, const char *extensions)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
47 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 const char *ext, *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49 char ext1[32], *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50
453
a699cf5c703d NULL pointers ...
michael
parents: 437
diff changeset
51 if(!filename)
a699cf5c703d NULL pointers ...
michael
parents: 437
diff changeset
52 return 0;
a699cf5c703d NULL pointers ...
michael
parents: 437
diff changeset
53
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 ext = strrchr(filename, '.');
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 if (ext) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 ext++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 p = extensions;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59 q = ext1;
643
253b5292946a various security fixes and precautionary checks
michael
parents: 639
diff changeset
60 while (*p != '\0' && *p != ',' && q-ext1<sizeof(ext1)-1)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
61 *q++ = *p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63 if (!strcasecmp(ext1, ext))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64 return 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65 if (*p == '\0')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 AVOutputFormat *guess_format(const char *short_name, const char *filename,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 const char *mime_type)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76 AVOutputFormat *fmt, *fmt_found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 int score_max, score;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78
20
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
79 /* specific test for image sequences */
21
3d2d2f8725f9 jpeg detection fix - fixed imagepipe output
bellard
parents: 20
diff changeset
80 if (!short_name && filename &&
3d2d2f8725f9 jpeg detection fix - fixed imagepipe output
bellard
parents: 20
diff changeset
81 filename_number_test(filename) >= 0 &&
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
82 av_guess_image2_codec(filename) != CODEC_ID_NONE) {
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
83 return guess_format("image2", NULL, NULL);
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
84 }
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
85 if (!short_name && filename &&
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
86 filename_number_test(filename) >= 0 &&
21
3d2d2f8725f9 jpeg detection fix - fixed imagepipe output
bellard
parents: 20
diff changeset
87 guess_image_format(filename)) {
20
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
88 return guess_format("image", NULL, NULL);
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
89 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
90
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91 /* find the proper file type */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 fmt_found = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93 score_max = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
94 fmt = first_oformat;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95 while (fmt != NULL) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 score = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 if (fmt->name && short_name && !strcmp(fmt->name, short_name))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 score += 100;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 score += 10;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 if (filename && fmt->extensions &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
102 match_ext(filename, fmt->extensions)) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103 score += 5;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 if (score > score_max) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 score_max = score;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 fmt_found = fmt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 fmt = fmt->next;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 return fmt_found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 AVOutputFormat *guess_stream_format(const char *short_name, const char *filename,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 const char *mime_type)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 AVOutputFormat *fmt = guess_format(short_name, filename, mime_type);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 if (fmt) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 AVOutputFormat *stream_fmt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 char stream_format_name[64];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", fmt->name);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 stream_fmt = guess_format(stream_format_name, NULL, NULL);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
126 if (stream_fmt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
127 fmt = stream_fmt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
130 return fmt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
133 /**
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
134 * guesses the codec id based upon muxer and filename.
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
135 */
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
136 enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
137 const char *filename, const char *mime_type, enum CodecType type){
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
138 if(type == CODEC_TYPE_VIDEO){
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
139 enum CodecID codec_id= CODEC_ID_NONE;
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
140
586
d31051b85c3d try to guess the codec for imag2pipe too
michael
parents: 583
diff changeset
141 if(!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")){
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
142 codec_id= av_guess_image2_codec(filename);
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
143 }
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
144 if(codec_id == CODEC_ID_NONE)
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
145 codec_id= fmt->video_codec;
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
146 return codec_id;
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
147 }else if(type == CODEC_TYPE_AUDIO)
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
148 return fmt->audio_codec;
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
149 else
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
150 return CODEC_ID_NONE;
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
151 }
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
152
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
153 AVInputFormat *av_find_input_format(const char *short_name)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
154 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
155 AVInputFormat *fmt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
156 for(fmt = first_iformat; fmt != NULL; fmt = fmt->next) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
157 if (!strcmp(fmt->name, short_name))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
158 return fmt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
159 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
160 return NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
163 /* memory handling */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
164
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 /**
53
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
166 * Default packet destructor
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
167 */
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
168 static void av_destruct_packet(AVPacket *pkt)
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
169 {
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
170 av_free(pkt->data);
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
171 pkt->data = NULL; pkt->size = 0;
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
172 }
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
173
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
174 /**
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175 * Allocate the payload of a packet and intialized its fields to default values.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
176 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177 * @param pkt packet
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
178 * @param size wanted payload size
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
179 * @return 0 if OK. AVERROR_xxx otherwise.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
180 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
181 int av_new_packet(AVPacket *pkt, int size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
182 {
639
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
183 void *data;
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
184 if((unsigned)size > (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE)
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
185 return AVERROR_NOMEM;
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
186 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
187 if (!data)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
188 return AVERROR_NOMEM;
53
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
189 memset(data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190
53
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
191 av_init_packet(pkt);
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
192 pkt->data = data;
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
193 pkt->size = size;
fb671d87824e zero copy packet handling for DV1394 by Max Krasnyansky
bellard
parents: 32
diff changeset
194 pkt->destruct = av_destruct_packet;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
196 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
197
775
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
198 /**
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
199 * Allocate and read the payload of a packet and intialized its fields to default values.
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
200 *
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
201 * @param pkt packet
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
202 * @param size wanted payload size
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
203 * @return >0 (read size) if OK. AVERROR_xxx otherwise.
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
204 */
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
205 int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size)
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
206 {
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
207 int ret= av_new_packet(pkt, size);
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
208
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
209 if(ret<0)
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
210 return ret;
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
211
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
212 pkt->pos= url_ftell(s);
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
213
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
214 ret= get_buffer(s, pkt->data, size);
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
215 if(ret<=0)
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
216 av_free_packet(pkt);
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
217 else
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
218 pkt->size= ret;
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
219
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
220 return ret;
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
221 }
c5077fdab490 AVPacket.pos
michael
parents: 772
diff changeset
222
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
223 /* This is a hack - the packet memory allocation stuff is broken. The
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
224 packet is allocated if it was not really allocated */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
225 int av_dup_packet(AVPacket *pkt)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
226 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
227 if (pkt->destruct != av_destruct_packet) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
228 uint8_t *data;
330
c393ab803bcd copy packet without omitting the padding
bellard
parents: 319
diff changeset
229 /* we duplicate the packet and don't forget to put the padding
c393ab803bcd copy packet without omitting the padding
bellard
parents: 319
diff changeset
230 again */
639
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
231 if((unsigned)pkt->size > (unsigned)pkt->size + FF_INPUT_BUFFER_PADDING_SIZE)
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
232 return AVERROR_NOMEM;
330
c393ab803bcd copy packet without omitting the padding
bellard
parents: 319
diff changeset
233 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
234 if (!data) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
235 return AVERROR_NOMEM;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
236 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
237 memcpy(data, pkt->data, pkt->size);
330
c393ab803bcd copy packet without omitting the padding
bellard
parents: 319
diff changeset
238 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
239 pkt->data = data;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
240 pkt->destruct = av_destruct_packet;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
241 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
242 return 0;
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
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 /* fifo handling */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 int fifo_init(FifoBuffer *f, int size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 f->buffer = av_malloc(size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 if (!f->buffer)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 f->end = f->buffer + size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 f->wptr = f->rptr = f->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 void fifo_free(FifoBuffer *f)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259 av_free(f->buffer);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
262 int fifo_size(FifoBuffer *f, uint8_t *rptr)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 int size;
602
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
265
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
266 if(!rptr)
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
267 rptr= f->rptr;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 if (f->wptr >= rptr) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 size = f->wptr - rptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 size = (f->end - rptr) + (f->wptr - f->buffer);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 return size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 /* get data from the fifo (return -1 if not enough data) */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
278 int fifo_read(FifoBuffer *f, uint8_t *buf, int buf_size, uint8_t **rptr_ptr)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 {
602
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
280 uint8_t *rptr;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281 int size, len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
282
602
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
283 if(!rptr_ptr)
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
284 rptr_ptr= &f->rptr;
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
285 rptr = *rptr_ptr;
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
286
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
287 if (f->wptr >= rptr) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 size = f->wptr - rptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
289 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
290 size = (f->end - rptr) + (f->wptr - f->buffer);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
293 if (size < buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295 while (buf_size > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296 len = f->end - rptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 if (len > buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 len = buf_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 memcpy(buf, rptr, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
300 buf += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 rptr += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 if (rptr >= f->end)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303 rptr = f->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304 buf_size -= len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 *rptr_ptr = rptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
308 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
309
639
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
310 void fifo_realloc(FifoBuffer *f, unsigned int new_size){
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
311 unsigned int old_size= f->end - f->buffer;
602
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
312
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
313 if(old_size < new_size){
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
314 uint8_t *old= f->buffer;
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
315
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
316 f->buffer= av_realloc(f->buffer, new_size);
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
317
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
318 f->rptr += f->buffer - old;
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
319 f->wptr += f->buffer - old;
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
320
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
321 if(f->wptr < f->rptr){
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
322 memmove(f->rptr + new_size - old_size, f->rptr, f->buffer + old_size - f->rptr);
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
323 f->rptr += new_size - old_size;
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
324 }
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
325 f->end= f->buffer + new_size;
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
326 }
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
327 }
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
328
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
329 void fifo_write(FifoBuffer *f, uint8_t *buf, int size, uint8_t **wptr_ptr)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
330 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 int len;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
332 uint8_t *wptr;
602
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
333
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
334 if(!wptr_ptr)
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
335 wptr_ptr= &f->wptr;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
336 wptr = *wptr_ptr;
602
15cf78d9aceb fifo_realloc()
michael
parents: 600
diff changeset
337
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
338 while (size > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
339 len = f->end - wptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
340 if (len > size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341 len = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342 memcpy(wptr, buf, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 wptr += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 if (wptr >= f->end)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345 wptr = f->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
346 buf += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
347 size -= len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349 *wptr_ptr = wptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
352 /* get data from the fifo (return -1 if not enough data) */
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
353 int put_fifo(ByteIOContext *pb, FifoBuffer *f, int buf_size, uint8_t **rptr_ptr)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
354 {
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
355 uint8_t *rptr = *rptr_ptr;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
356 int size, len;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
357
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
358 if (f->wptr >= rptr) {
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
359 size = f->wptr - rptr;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
360 } else {
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
361 size = (f->end - rptr) + (f->wptr - f->buffer);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
362 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
363
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
364 if (size < buf_size)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
365 return -1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
366 while (buf_size > 0) {
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
367 len = f->end - rptr;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
368 if (len > buf_size)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
369 len = buf_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
370 put_buffer(pb, rptr, len);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
371 rptr += len;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
372 if (rptr >= f->end)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
373 rptr = f->buffer;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
374 buf_size -= len;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
375 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
376 *rptr_ptr = rptr;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
377 return 0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
378 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 540
diff changeset
379
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
380 int filename_number_test(const char *filename)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
381 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
382 char buf[1024];
453
a699cf5c703d NULL pointers ...
michael
parents: 437
diff changeset
383 if(!filename)
a699cf5c703d NULL pointers ...
michael
parents: 437
diff changeset
384 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
385 return get_frame_filename(buf, sizeof(buf), filename, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
386 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
387
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
388 /* guess file format */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
389 AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
390 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
391 AVInputFormat *fmt1, *fmt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
392 int score, score_max;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
393
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
394 fmt = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 score_max = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 for(fmt1 = first_iformat; fmt1 != NULL; fmt1 = fmt1->next) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
397 if (!is_opened && !(fmt1->flags & AVFMT_NOFILE))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
398 continue;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
399 score = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
400 if (fmt1->read_probe) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 score = fmt1->read_probe(pd);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402 } else if (fmt1->extensions) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
403 if (match_ext(pd->filename, fmt1->extensions)) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
404 score = 50;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
405 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
406 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
407 if (score > score_max) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
408 score_max = score;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 fmt = fmt1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
410 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
411 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412 return fmt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 /************************************************************/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
416 /* input media file */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
418 /**
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
419 * open a media file from an IO stream. 'fmt' must be specified.
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
420 */
370
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
421
371
b0e50e10472c av_log() cleanup
michael
parents: 370
diff changeset
422 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
423 {
371
b0e50e10472c av_log() cleanup
michael
parents: 370
diff changeset
424 AVFormatContext* fc = (AVFormatContext*) ptr;
370
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
425 if(fc->iformat) return fc->iformat->name;
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
426 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
427 else return "NULL";
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
428 }
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
429
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
430 static const AVClass av_format_context_class = { "AVFormatContext", format_to_name };
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
431
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
432 AVFormatContext *av_alloc_format_context(void)
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
433 {
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
434 AVFormatContext *ic;
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
435 ic = av_mallocz(sizeof(AVFormatContext));
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
436 if (!ic) return ic;
371
b0e50e10472c av_log() cleanup
michael
parents: 370
diff changeset
437 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
438 return ic;
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
439 }
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
440
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
441 int av_open_input_stream(AVFormatContext **ic_ptr,
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
442 ByteIOContext *pb, const char *filename,
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
443 AVInputFormat *fmt, AVFormatParameters *ap)
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
444 {
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
445 int err;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
446 AVFormatContext *ic;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
447
370
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 367
diff changeset
448 ic = av_alloc_format_context();
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
449 if (!ic) {
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
450 err = AVERROR_NOMEM;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
451 goto fail;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
452 }
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
453 ic->iformat = fmt;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
454 if (pb)
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
455 ic->pb = *pb;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
456 ic->duration = AV_NOPTS_VALUE;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
457 ic->start_time = AV_NOPTS_VALUE;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
458 pstrcpy(ic->filename, sizeof(ic->filename), filename);
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
459
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
460 /* allocate private data */
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
461 if (fmt->priv_data_size > 0) {
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
462 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
463 if (!ic->priv_data) {
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
464 err = AVERROR_NOMEM;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
465 goto fail;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
466 }
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
467 } else {
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
468 ic->priv_data = NULL;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
469 }
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
470
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
471 err = ic->iformat->read_header(ic, ap);
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
472 if (err < 0)
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
473 goto fail;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
474
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
475 if (pb)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
476 ic->data_offset = url_ftell(&ic->pb);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
477
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
478 *ic_ptr = ic;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
479 return 0;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
480 fail:
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
481 if (ic) {
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
482 av_freep(&ic->priv_data);
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
483 }
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
484 av_free(ic);
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
485 *ic_ptr = NULL;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
486 return err;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
487 }
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
488
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
489 #define PROBE_BUF_SIZE 2048
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
490
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
491 /**
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
492 * Open a media file as input. The codec are not opened. Only the file
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
493 * header (if present) is read.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
494 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
495 * @param ic_ptr the opened media file handle is put here
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
496 * @param filename filename to open.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
497 * @param fmt if non NULL, force the file format to use
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
498 * @param buf_size optional buffer size (zero if default is OK)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
499 * @param ap additionnal parameters needed when opening the file (NULL if default)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
500 * @return 0 if OK. AVERROR_xxx otherwise.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
501 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
502 int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
503 AVInputFormat *fmt,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
504 int buf_size,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
505 AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506 {
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
507 int err, must_open_file, file_opened;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
508 uint8_t buf[PROBE_BUF_SIZE];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509 AVProbeData probe_data, *pd = &probe_data;
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
510 ByteIOContext pb1, *pb = &pb1;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
511
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
512 file_opened = 0;
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
513 pd->filename = "";
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
514 if (filename)
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
515 pd->filename = filename;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516 pd->buf = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
517 pd->buf_size = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
518
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
519 if (!fmt) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
520 /* guess format if no file can be opened */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
521 fmt = av_probe_input_format(pd, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
522 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
523
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
524 /* do not open file if the format does not need it. XXX: specific
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
525 hack needed to handle RTSP/TCP */
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
526 must_open_file = 1;
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
527 if (fmt && (fmt->flags & AVFMT_NOFILE)) {
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
528 must_open_file = 0;
535
8430e4610971 uninitalized variables
michael
parents: 512
diff changeset
529 pb= NULL; //FIXME this or memset(pb, 0, sizeof(ByteIOContext)); otherwise its uninitalized
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
530 }
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
531
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
532 if (!fmt || must_open_file) {
20
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
533 /* if no file needed do not try to open one */
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
534 if (url_fopen(pb, filename, URL_RDONLY) < 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
535 err = AVERROR_IO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
536 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
537 }
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
538 file_opened = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
539 if (buf_size > 0) {
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
540 url_setbufsize(pb, buf_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
541 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542 if (!fmt) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
543 /* read probe data */
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
544 pd->buf_size = get_buffer(pb, buf, PROBE_BUF_SIZE);
502
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 497
diff changeset
545 if (url_fseek(pb, 0, SEEK_SET) == (offset_t)-EPIPE) {
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 497
diff changeset
546 url_fclose(pb);
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 497
diff changeset
547 if (url_fopen(pb, filename, URL_RDONLY) < 0) {
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 497
diff changeset
548 err = AVERROR_IO;
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 497
diff changeset
549 goto fail;
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 497
diff changeset
550 }
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 497
diff changeset
551 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
552 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
553 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
554
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
555 /* guess file format */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
556 if (!fmt) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
557 fmt = av_probe_input_format(pd, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
558 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
559
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
560 /* if still no format found, error */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
561 if (!fmt) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
562 err = AVERROR_NOFMT;
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
563 goto fail;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
564 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
565
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
566 /* XXX: suppress this hack for redirectors */
22
65433f1b2549 os2 support patch by ("Slavik Gnatenko" <miracle9 at newmail dot ru>)
michaelni
parents: 21
diff changeset
567 #ifdef CONFIG_NETWORK
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
568 if (fmt == &redir_demux) {
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
569 err = redir_open(ic_ptr, pb);
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
570 url_fclose(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
571 return err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
572 }
11
932b59c66c60 mingw patch by (Bill Eldridge <bill at rfa dot org>)
michaelni
parents: 9
diff changeset
573 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
574
20
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
575 /* 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
576 if (fmt->flags & AVFMT_NEEDNUMBER) {
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
577 if (filename_number_test(filename) < 0) {
20
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
578 err = AVERROR_NUMEXPECTED;
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
579 goto fail;
20
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
580 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
581 }
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
582 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
583 if (err)
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
584 goto fail;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
585 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
586 fail:
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
587 if (file_opened)
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
588 url_fclose(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
589 *ic_ptr = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
590 return err;
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
591
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
592 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
593
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
594 /*******************************************************/
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
595
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
596 /**
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
597 * Read a transport packet from a media file. This function is
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
598 * absolete and should never be used. Use av_read_frame() instead.
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
599 *
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
600 * @param s media file handle
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
601 * @param pkt is filled
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
602 * @return 0 if OK. AVERROR_xxx if error.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
603 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
604 int av_read_packet(AVFormatContext *s, AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
605 {
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
606 return s->iformat->read_packet(s, pkt);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
607 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
608
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
609 /**********************************************************/
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
610
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
611 /* get the number of samples of an audio frame. Return (-1) if error */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
612 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
613 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
614 int frame_size;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
615
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
616 if (enc->frame_size <= 1) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
617 /* specific hack for pcm codecs because no frame size is
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
618 provided */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
619 switch(enc->codec_id) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
620 case CODEC_ID_PCM_S16LE:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
621 case CODEC_ID_PCM_S16BE:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
622 case CODEC_ID_PCM_U16LE:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
623 case CODEC_ID_PCM_U16BE:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
624 if (enc->channels == 0)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
625 return -1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
626 frame_size = size / (2 * enc->channels);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
627 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
628 case CODEC_ID_PCM_S8:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
629 case CODEC_ID_PCM_U8:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
630 case CODEC_ID_PCM_MULAW:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
631 case CODEC_ID_PCM_ALAW:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
632 if (enc->channels == 0)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
633 return -1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
634 frame_size = size / (enc->channels);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
635 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
636 default:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
637 /* used for example by ADPCM codecs */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
638 if (enc->bit_rate == 0)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
639 return -1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
640 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
641 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
642 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
643 } else {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
644 frame_size = enc->frame_size;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
645 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
646 return frame_size;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
647 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
648
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
649
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
650 /* return the frame duration in seconds, return 0 if not available */
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
651 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
652 AVCodecParserContext *pc, AVPacket *pkt)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
653 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
654 int frame_size;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
655
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
656 *pnum = 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
657 *pden = 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
658 switch(st->codec.codec_type) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
659 case CODEC_TYPE_VIDEO:
757
7177bd7f1f47 10l (overflows)
michael
parents: 750
diff changeset
660 if(st->time_base.num*1000LL > st->time_base.den){
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
661 *pnum = st->time_base.num;
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
662 *pden = st->time_base.den;
757
7177bd7f1f47 10l (overflows)
michael
parents: 750
diff changeset
663 }else if(st->codec.time_base.num*1000LL > st->codec.time_base.den){
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
664 *pnum = st->codec.time_base.num;
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
665 *pden = st->codec.time_base.den;
747
95c9cef3c3db prefer container time_base for frame duration guess
michael
parents: 743
diff changeset
666 if (pc && pc->repeat_pict) {
95c9cef3c3db prefer container time_base for frame duration guess
michael
parents: 743
diff changeset
667 *pden *= 2;
95c9cef3c3db prefer container time_base for frame duration guess
michael
parents: 743
diff changeset
668 *pnum = (*pnum) * (2 + pc->repeat_pict);
95c9cef3c3db prefer container time_base for frame duration guess
michael
parents: 743
diff changeset
669 }
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
670 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
671 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
672 case CODEC_TYPE_AUDIO:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
673 frame_size = get_audio_frame_size(&st->codec, pkt->size);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
674 if (frame_size < 0)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
675 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
676 *pnum = frame_size;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
677 *pden = st->codec.sample_rate;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
678 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
679 default:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
680 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
681 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
682 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
683
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
684 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
685 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
686 return 1;
d82ccc7cff1c set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
michael
parents: 563
diff changeset
687 }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
688 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
689 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
690 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
691 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
692 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
693 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
694 case CODEC_ID_HUFFYUV:
599
0209f7365ccc split ffhuffyuv into 2 codecs:
lorenm
parents: 597
diff changeset
695 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
696 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
697 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
698 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
699 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
700 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
701 }
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
702 }
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
703 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
704 }
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
705
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
706 static int64_t lsb2full(int64_t lsb, int64_t last_ts, int lsb_bits){
466
0dd5b381fc9a 100l (avi seeking)
michael
parents: 464
diff changeset
707 int64_t mask = lsb_bits < 64 ? (1LL<<lsb_bits)-1 : -1LL;
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
708 int64_t delta= last_ts - mask/2;
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
709 return ((lsb - delta)&mask) + delta;
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
710 }
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
711
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
712 static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
713 AVCodecParserContext *pc, 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 int num, den, presentation_delayed;
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
716 /* handle wrapping */
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
717 if(st->cur_dts != AV_NOPTS_VALUE){
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
718 if(pkt->pts != AV_NOPTS_VALUE)
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
719 pkt->pts= lsb2full(pkt->pts, st->cur_dts, st->pts_wrap_bits);
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
720 if(pkt->dts != AV_NOPTS_VALUE)
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
721 pkt->dts= lsb2full(pkt->dts, st->cur_dts, st->pts_wrap_bits);
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
722 }
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
723
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
724 if (pkt->duration == 0) {
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
725 compute_frame_duration(&num, &den, st, pc, pkt);
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
726 if (den && num) {
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
727 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
728 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
729 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
730
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
731 if(is_intra_only(&st->codec))
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
732 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
733
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
734 /* do we have a video B frame ? */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
735 presentation_delayed = 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
736 if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
737 /* XXX: need has_b_frame, but cannot get it if the codec is
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
738 not initialized */
616
7096b97371b0 fix timestamp prediction for low_delay mpeg streams
michael
parents: 606
diff changeset
739 if (( st->codec.codec_id == CODEC_ID_H264
7096b97371b0 fix timestamp prediction for low_delay mpeg streams
michael
parents: 606
diff changeset
740 || st->codec.has_b_frames) &&
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
741 pc && pc->pict_type != FF_B_TYPE)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
742 presentation_delayed = 1;
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
743 /* this may be redundant, but it shouldnt hurt */
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
744 if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts > pkt->dts)
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
745 presentation_delayed = 1;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
746 }
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
747
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
748 if(st->cur_dts == AV_NOPTS_VALUE){
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
749 if(presentation_delayed) st->cur_dts = -pkt->duration;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
750 else st->cur_dts = 0;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
751 }
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
752
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
753 // av_log(NULL, AV_LOG_DEBUG, "IN delayed:%d pts:%lld, dts:%lld cur_dts:%lld 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
754 /* interpolate PTS and DTS if they are not present */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
755 if (presentation_delayed) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
756 /* DTS = decompression time stamp */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
757 /* PTS = presentation time stamp */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
758 if (pkt->dts == AV_NOPTS_VALUE) {
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
759 /* if we know the last pts, use it */
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
760 if(st->last_IP_pts != AV_NOPTS_VALUE)
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
761 st->cur_dts = pkt->dts = st->last_IP_pts;
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
762 else
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
763 pkt->dts = st->cur_dts;
303
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 st->cur_dts = pkt->dts;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
766 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
767 /* this is tricky: the dts must be incremented by the duration
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
768 of the frame we are displaying, i.e. the last I or P frame */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
769 if (st->last_IP_duration == 0)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
770 st->cur_dts += pkt->duration;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
771 else
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
772 st->cur_dts += st->last_IP_duration;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
773 st->last_IP_duration = pkt->duration;
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
774 st->last_IP_pts= pkt->pts;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
775 /* cannot compute PTS if not present (we can compute it only
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
776 by knowing the futur */
666
ffad4fdbd3d1 dont predict missing timestamps if we lack the required information to do so
michael
parents: 662
diff changeset
777 } else if(pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE || pkt->duration){
618
65787cd808e4 workaround some broken mpeg-ps timestamps
michael
parents: 617
diff changeset
778 if(pkt->pts != AV_NOPTS_VALUE && pkt->duration){
65787cd808e4 workaround some broken mpeg-ps timestamps
michael
parents: 617
diff changeset
779 int64_t old_diff= ABS(st->cur_dts - pkt->duration - pkt->pts);
65787cd808e4 workaround some broken mpeg-ps timestamps
michael
parents: 617
diff changeset
780 int64_t new_diff= ABS(st->cur_dts - pkt->pts);
65787cd808e4 workaround some broken mpeg-ps timestamps
michael
parents: 617
diff changeset
781 if(old_diff < new_diff && old_diff < (pkt->duration>>3)){
65787cd808e4 workaround some broken mpeg-ps timestamps
michael
parents: 617
diff changeset
782 pkt->pts += pkt->duration;
624
e7b64333f116 guess fps for the variable fps case
michael
parents: 620
diff changeset
783 // av_log(NULL, AV_LOG_DEBUG, "id:%d old:%Ld new:%Ld dur:%d cur:%Ld size:%d\n", pkt->stream_index, old_diff, new_diff, pkt->duration, st->cur_dts, pkt->size);
618
65787cd808e4 workaround some broken mpeg-ps timestamps
michael
parents: 617
diff changeset
784 }
65787cd808e4 workaround some broken mpeg-ps timestamps
michael
parents: 617
diff changeset
785 }
65787cd808e4 workaround some broken mpeg-ps timestamps
michael
parents: 617
diff changeset
786
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
787 /* presentation is not delayed : PTS and DTS are the same */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
788 if (pkt->pts == AV_NOPTS_VALUE) {
367
3fca8e9142a4 avsync patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 354
diff changeset
789 if (pkt->dts == AV_NOPTS_VALUE) {
3fca8e9142a4 avsync patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 354
diff changeset
790 pkt->pts = st->cur_dts;
3fca8e9142a4 avsync patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 354
diff changeset
791 pkt->dts = st->cur_dts;
3fca8e9142a4 avsync patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 354
diff changeset
792 }
3fca8e9142a4 avsync patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 354
diff changeset
793 else {
3fca8e9142a4 avsync patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 354
diff changeset
794 st->cur_dts = pkt->dts;
3fca8e9142a4 avsync patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 354
diff changeset
795 pkt->pts = pkt->dts;
3fca8e9142a4 avsync patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 354
diff changeset
796 }
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
797 } else {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
798 st->cur_dts = pkt->pts;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
799 pkt->dts = pkt->pts;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
800 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
801 st->cur_dts += pkt->duration;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
802 }
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
803 // av_log(NULL, AV_LOG_DEBUG, "OUTdelayed:%d pts:%lld, dts:%lld cur_dts:%lld\n", presentation_delayed, pkt->pts, pkt->dts, st->cur_dts);
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
804
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
805 /* update flags */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
806 if (pc) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
807 pkt->flags = 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
808 /* key frame computation */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
809 switch(st->codec.codec_type) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
810 case CODEC_TYPE_VIDEO:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
811 if (pc->pict_type == FF_I_TYPE)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
812 pkt->flags |= PKT_FLAG_KEY;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
813 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
814 case CODEC_TYPE_AUDIO:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
815 pkt->flags |= PKT_FLAG_KEY;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
816 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
817 default:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
818 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
819 }
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
535
8430e4610971 uninitalized variables
michael
parents: 512
diff changeset
823 void av_destruct_packet_nofree(AVPacket *pkt)
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
824 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
825 pkt->data = NULL; pkt->size = 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
826 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
827
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
828 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
829 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
830 AVStream *st;
333
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
831 int len, ret, i;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
832
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
833 for(;;) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
834 /* select current input stream component */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
835 st = s->cur_st;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
836 if (st) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
837 if (!st->parser) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
838 /* 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
839 /* raw data support */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
840 *pkt = s->cur_pkt;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
841 compute_pkt_fields(s, st, NULL, pkt);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
842 s->cur_st = NULL;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
843 return 0;
708
d79164865a7c more fine grained discarding of packets
michael
parents: 698
diff changeset
844 } else if (s->cur_len > 0 && st->discard < AVDISCARD_ALL) {
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
845 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
846 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
847 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
848 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
849 s->cur_pkt.dts = AV_NOPTS_VALUE;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
850 /* increment read pointer */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
851 s->cur_ptr += len;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
852 s->cur_len -= len;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
853
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
854 /* return packet if any */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
855 if (pkt->size) {
333
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
856 got_packet:
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
857 pkt->duration = 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
858 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
859 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
860 pkt->dts = st->parser->dts;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
861 pkt->destruct = av_destruct_packet_nofree;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
862 compute_pkt_fields(s, st, st->parser, pkt);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
863 return 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
864 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
865 } else {
319
6285d395baf4 fixed memory leak
bellard
parents: 303
diff changeset
866 /* free packet */
6285d395baf4 fixed memory leak
bellard
parents: 303
diff changeset
867 av_free_packet(&s->cur_pkt);
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
868 s->cur_st = NULL;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
869 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
870 } else {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
871 /* read next packet */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
872 ret = av_read_packet(s, &s->cur_pkt);
333
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
873 if (ret < 0) {
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
874 if (ret == -EAGAIN)
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
875 return ret;
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
876 /* return the last frames, if any */
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
877 for(i = 0; i < s->nb_streams; i++) {
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
878 st = s->streams[i];
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
879 if (st->parser) {
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
880 av_parser_parse(st->parser, &st->codec,
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
881 &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
882 NULL, 0,
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
883 AV_NOPTS_VALUE, AV_NOPTS_VALUE);
333
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
884 if (pkt->size)
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
885 goto got_packet;
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
886 }
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
887 }
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
888 /* no more packets: really terminates parsing */
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
889 return ret;
333
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
890 }
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 453
diff changeset
891
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 453
diff changeset
892 st = s->streams[s->cur_pkt.stream_index];
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
893
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
894 s->cur_st = st;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
895 s->cur_ptr = s->cur_pkt.data;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
896 s->cur_len = s->cur_pkt.size;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
897 if (st->need_parsing && !st->parser) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
898 st->parser = av_parser_init(st->codec.codec_id);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
899 if (!st->parser) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
900 /* no parser available : just output the raw packets */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
901 st->need_parsing = 0;
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 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
904 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
905 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
906 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
907
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
908 /**
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
909 * Return the next frame of a stream. The returned packet is valid
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
910 * until the next av_read_frame() or until av_close_input_file() and
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
911 * must be freed with av_free_packet. For video, the packet contains
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
912 * exactly one frame. For audio, it contains an integer number of
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
913 * frames if each frame has a known fixed size (e.g. PCM or ADPCM
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
914 * data). If the audio frames have a variable size (e.g. MPEG audio),
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
915 * then it contains one frame.
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
916 *
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
917 * pkt->pts, pkt->dts and pkt->duration are always set to correct
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
918 * values in AV_TIME_BASE unit (and guessed if the format cannot
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
919 * provided them). pkt->pts can be AV_NOPTS_VALUE if the video format
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
920 * has B frames, so it is better to rely on pkt->dts if you do not
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
921 * decompress the payload.
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
922 *
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
923 * Return 0 if OK, < 0 if error or end of file.
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
924 */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
925 int av_read_frame(AVFormatContext *s, AVPacket *pkt)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
926 {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
927 AVPacketList *pktl;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
928
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
929 pktl = s->packet_buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
930 if (pktl) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
931 /* read packet from packet buffer, if there is data */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
932 *pkt = pktl->pkt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
933 s->packet_buffer = pktl->next;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
934 av_free(pktl);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
935 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
936 } else {
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
937 return av_read_frame_internal(s, pkt);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
938 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
939 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
940
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
941 /* XXX: suppress the packet queue */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
942 static void flush_packet_queue(AVFormatContext *s)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
943 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
944 AVPacketList *pktl;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
945
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
946 for(;;) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
947 pktl = s->packet_buffer;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
948 if (!pktl)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
949 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
950 s->packet_buffer = pktl->next;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
951 av_free_packet(&pktl->pkt);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
952 av_free(pktl);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
953 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
954 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
955
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
956 /*******************************************************/
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
957 /* seek support */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
958
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
959 int av_find_default_stream_index(AVFormatContext *s)
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
960 {
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
961 int i;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
962 AVStream *st;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
963
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
964 if (s->nb_streams <= 0)
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
965 return -1;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
966 for(i = 0; i < s->nb_streams; i++) {
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
967 st = s->streams[i];
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
968 if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
969 return i;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
970 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
971 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
972 return 0;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
973 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
974
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
975 /* flush the frame reader */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
976 static void av_read_frame_flush(AVFormatContext *s)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
977 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
978 AVStream *st;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
979 int i;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
980
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
981 flush_packet_queue(s);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
982
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
983 /* free previous packet */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
984 if (s->cur_st) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
985 if (s->cur_st->parser)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
986 av_free_packet(&s->cur_pkt);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
987 s->cur_st = NULL;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
988 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
989 /* fail safe */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
990 s->cur_ptr = NULL;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
991 s->cur_len = 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
992
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
993 /* for each stream, reset read state */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
994 for(i = 0; i < s->nb_streams; i++) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
995 st = s->streams[i];
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
996
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
997 if (st->parser) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
998 av_parser_close(st->parser);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
999 st->parser = NULL;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1000 }
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
1001 st->last_IP_pts = AV_NOPTS_VALUE;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1002 st->cur_dts = 0; /* we set the current DTS to an unspecified origin */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1003 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1004 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1005
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1006 /**
572
640706a29efb bug in libavformat av_update_cur_dts(), patch by (Nathan Kurz <nate at verse dot com>)
michael
parents: 570
diff changeset
1007 * updates cur_dts of all streams based on given timestamp and AVStream.
640706a29efb bug in libavformat av_update_cur_dts(), patch by (Nathan Kurz <nate at verse dot com>)
michael
parents: 570
diff changeset
1008 * stream ref_st unchanged, others set cur_dts in their native timebase
640706a29efb bug in libavformat av_update_cur_dts(), patch by (Nathan Kurz <nate at verse dot com>)
michael
parents: 570
diff changeset
1009 * only needed for timestamp wrapping or if (dts not set and pts!=dts)
640706a29efb bug in libavformat av_update_cur_dts(), patch by (Nathan Kurz <nate at verse dot com>)
michael
parents: 570
diff changeset
1010 * @param timestamp new dts expressed in time_base of param ref_st
640706a29efb bug in libavformat av_update_cur_dts(), patch by (Nathan Kurz <nate at verse dot com>)
michael
parents: 570
diff changeset
1011 * @param ref_st reference stream giving time_base of param timestamp
560
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1012 */
572
640706a29efb bug in libavformat av_update_cur_dts(), patch by (Nathan Kurz <nate at verse dot com>)
michael
parents: 570
diff changeset
1013 static void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp){
560
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1014 int i;
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1015
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1016 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
1017 AVStream *st = s->streams[i];
560
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1018
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1019 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
1020 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
1021 st->time_base.num * (int64_t)ref_st->time_base.den);
560
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1022 }
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1023 }
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1024
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1025 /**
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1026 * add a index entry into a sorted list updateing if it is already there.
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1027 * @param timestamp timestamp in the timebase of the given stream
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1028 */
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 346
diff changeset
1029 int av_add_index_entry(AVStream *st,
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 346
diff changeset
1030 int64_t pos, int64_t timestamp, int distance, int flags)
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1031 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1032 AVIndexEntry *entries, *ie;
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
1033 int index;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1034
639
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
1035 if((unsigned)st->nb_index_entries + 1 >= UINT_MAX / sizeof(AVIndexEntry))
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
1036 return -1;
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
1037
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1038 entries = av_fast_realloc(st->index_entries,
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1039 &st->index_entries_allocated_size,
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1040 (st->nb_index_entries + 1) *
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1041 sizeof(AVIndexEntry));
639
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
1042 if(!entries)
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
1043 return -1;
0b52743104ac integer overflows, heap corruption
michael
parents: 633
diff changeset
1044
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
1045 st->index_entries= entries;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
1046
698
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1047 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
1048
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1049 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
1050 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
1051 ie= &entries[index];
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1052 assert(index==0 || ie[-1].timestamp < timestamp);
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1053 }else{
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1054 ie= &entries[index];
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1055 if(ie->timestamp != timestamp){
563
d141aa45ca86 fix assertion failure in case of timestamp discontinuities
michael
parents: 560
diff changeset
1056 if(ie->timestamp <= timestamp)
d141aa45ca86 fix assertion failure in case of timestamp discontinuities
michael
parents: 560
diff changeset
1057 return -1;
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1058 memmove(entries + index + 1, entries + index, sizeof(AVIndexEntry)*(st->nb_index_entries - index));
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1059 st->nb_index_entries++;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1060 }else if(ie->pos == pos && distance < ie->min_distance) //dont reduce the distance
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1061 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
1062 }
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1063
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
1064 ie->pos = pos;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
1065 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
1066 ie->min_distance= distance;
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
1067 ie->flags = flags;
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 346
diff changeset
1068
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 346
diff changeset
1069 return index;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1070 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1071
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1072 /* build an index for raw streams using a parser */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1073 static void av_build_index_raw(AVFormatContext *s)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1074 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1075 AVPacket pkt1, *pkt = &pkt1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1076 int ret;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1077 AVStream *st;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1078
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1079 st = s->streams[0];
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1080 av_read_frame_flush(s);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1081 url_fseek(&s->pb, s->data_offset, SEEK_SET);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1082
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1083 for(;;) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1084 ret = av_read_frame(s, pkt);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1085 if (ret < 0)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1086 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1087 if (pkt->stream_index == 0 && st->parser &&
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1088 (pkt->flags & PKT_FLAG_KEY)) {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1089 av_add_index_entry(st, st->parser->frame_offset, pkt->dts,
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 346
diff changeset
1090 0, AVINDEX_KEYFRAME);
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1091 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1092 av_free_packet(pkt);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1093 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1094 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1095
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1096 /* return TRUE if we deal with a raw stream (raw codec data and
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1097 parsing needed) */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1098 static int is_raw_stream(AVFormatContext *s)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1099 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1100 AVStream *st;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1101
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1102 if (s->nb_streams != 1)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1103 return 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1104 st = s->streams[0];
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1105 if (!st->need_parsing)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1106 return 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1107 return 1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1108 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1109
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1110 /**
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1111 * gets the index for a specific timestamp.
698
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1112 * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond to
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1113 * the timestamp which is <= the requested one, if backward is 0
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1114 * then it will be >=
698
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1115 * if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1116 * @return < 0 if no such timestamp could be found
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1117 */
597
d814669d2c13 int / int64 fix by (Wolfram Gloger <wmglo @@@ dent:med:uni-muenchen:de>)
michael
parents: 588
diff changeset
1118 int av_index_search_timestamp(AVStream *st, int64_t wanted_timestamp,
698
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1119 int flags)
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1120 {
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
1121 AVIndexEntry *entries= st->index_entries;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
1122 int nb_entries= st->nb_index_entries;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1123 int a, b, m;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1124 int64_t timestamp;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1125
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1126 a = - 1;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1127 b = nb_entries;
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
1128
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1129 while (b - a > 1) {
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1130 m = (a + b) >> 1;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1131 timestamp = entries[m].timestamp;
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1132 if(timestamp >= wanted_timestamp)
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1133 b = m;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1134 if(timestamp <= wanted_timestamp)
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 334
diff changeset
1135 a = m;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1136 }
698
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1137 m= (flags & AVSEEK_FLAG_BACKWARD) ? a : b;
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1138
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1139 if(!(flags & AVSEEK_FLAG_ANY)){
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1140 while(m>=0 && m<nb_entries && !(entries[m].flags & AVINDEX_KEYFRAME)){
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1141 m += (flags & AVSEEK_FLAG_BACKWARD) ? -1 : 1;
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1142 }
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1143 }
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1144
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1145 if(m == nb_entries)
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1146 return -1;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1147 return m;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1148 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1149
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1150 #define DEBUG_SEEK
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1151
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1152 /**
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1153 * Does a binary search using av_index_search_timestamp() and AVCodec.read_timestamp().
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1154 * this isnt supposed to be called directly by a user application, but by demuxers
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1155 * @param target_ts target timestamp in the time base of the given stream
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1156 * @param stream_index stream number
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1157 */
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1158 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
1159 AVInputFormat *avif= s->iformat;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1160 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
1161 int64_t ts_min, ts_max, ts;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1162 int64_t start_pos;
560
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1163 int index, no_change;
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1164 AVStream *st;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1165
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1166 if (stream_index < 0)
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1167 return -1;
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1168
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1169 #ifdef DEBUG_SEEK
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1170 av_log(s, AV_LOG_DEBUG, "read_seek: %d %lld\n", stream_index, target_ts);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1171 #endif
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1172
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1173 ts_max=
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1174 ts_min= AV_NOPTS_VALUE;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1175 pos_limit= -1; //gcc falsely says it may be uninitalized
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1176
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1177 st= s->streams[stream_index];
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1178 if(st->index_entries){
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1179 AVIndexEntry *e;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1180
698
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1181 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
1182 index= FFMAX(index, 0);
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1183 e= &st->index_entries[index];
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1184
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1185 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
1186 pos_min= e->pos;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1187 ts_min= e->timestamp;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1188 #ifdef DEBUG_SEEK
477
3fc285cdb791 user specified start time offset
michael
parents: 470
diff changeset
1189 av_log(s, AV_LOG_DEBUG, "using cached pos_min=0x%llx dts_min=%lld\n",
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1190 pos_min,ts_min);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1191 #endif
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1192 }else{
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1193 assert(index==0);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1194 }
698
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1195
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1196 index= av_index_search_timestamp(st, target_ts, flags & ~AVSEEK_FLAG_BACKWARD);
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1197 assert(index < st->nb_index_entries);
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1198 if(index >= 0){
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1199 e= &st->index_entries[index];
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1200 assert(e->timestamp >= target_ts);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1201 pos_max= e->pos;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1202 ts_max= e->timestamp;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1203 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
1204 #ifdef DEBUG_SEEK
477
3fc285cdb791 user specified start time offset
michael
parents: 470
diff changeset
1205 av_log(s, AV_LOG_DEBUG, "using cached pos_max=0x%llx pos_limit=0x%llx dts_max=%lld\n",
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1206 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
1207 #endif
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1208 }
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1209 }
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1210
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1211 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
1212 pos_min = s->data_offset;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1213 ts_min = avif->read_timestamp(s, stream_index, &pos_min, INT64_MAX);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1214 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
1215 return -1;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1216 }
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1217
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1218 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
1219 int step= 1024;
764
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 757
diff changeset
1220 pos_max = url_fsize(&s->pb) - 1;
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1221 do{
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1222 pos_max -= step;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1223 ts_max = avif->read_timestamp(s, stream_index, &pos_max, pos_max + step);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1224 step += step;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1225 }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
1226 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
1227 return -1;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1228
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1229 for(;;){
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1230 int64_t tmp_pos= pos_max + 1;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1231 int64_t tmp_ts= avif->read_timestamp(s, stream_index, &tmp_pos, INT64_MAX);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1232 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
1233 break;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1234 ts_max= tmp_ts;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1235 pos_max= tmp_pos;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1236 }
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1237 pos_limit= pos_max;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1238 }
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1239
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1240 no_change=0;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1241 while (pos_min < pos_limit) {
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1242 #ifdef DEBUG_SEEK
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1243 av_log(s, AV_LOG_DEBUG, "pos_min=0x%llx pos_max=0x%llx dts_min=%lld dts_max=%lld\n",
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1244 pos_min, pos_max,
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1245 ts_min, ts_max);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1246 #endif
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1247 assert(pos_limit <= pos_max);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1248
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1249 if(no_change==0){
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1250 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
1251 // interpolate position (better than dichotomy)
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1252 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
1253 + 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
1254 }else if(no_change==1){
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1255 // 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
1256 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
1257 }else{
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1258 // 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
1259 pos=pos_min;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1260 }
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1261 if(pos <= pos_min)
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1262 pos= pos_min + 1;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1263 else if(pos > pos_limit)
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1264 pos= pos_limit;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1265 start_pos= pos;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1266
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1267 ts = avif->read_timestamp(s, stream_index, &pos, INT64_MAX); //may pass pos_limit instead of -1
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1268 if(pos == pos_max)
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1269 no_change++;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1270 else
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1271 no_change=0;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1272 #ifdef DEBUG_SEEK
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1273 av_log(s, AV_LOG_DEBUG, "%Ld %Ld %Ld / %Ld %Ld %Ld target:%Ld limit:%Ld start:%Ld noc:%d\n", pos_min, pos, pos_max, ts_min, ts, ts_max, target_ts, pos_limit, start_pos, no_change);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1274 #endif
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1275 assert(ts != AV_NOPTS_VALUE);
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1276 if (target_ts <= ts) {
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1277 pos_limit = start_pos - 1;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1278 pos_max = pos;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1279 ts_max = ts;
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1280 }
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1281 if (target_ts >= ts) {
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1282 pos_min = pos;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1283 ts_min = ts;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1284 }
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1285 }
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1286
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1287 pos = (flags & AVSEEK_FLAG_BACKWARD) ? pos_min : pos_max;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1288 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
1289 #ifdef DEBUG_SEEK
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1290 pos_min = pos;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1291 ts_min = avif->read_timestamp(s, stream_index, &pos_min, INT64_MAX);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1292 pos_min++;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1293 ts_max = avif->read_timestamp(s, stream_index, &pos_min, INT64_MAX);
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1294 av_log(s, AV_LOG_DEBUG, "pos=0x%llx %lld<=%lld<=%lld\n",
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1295 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
1296 #endif
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1297 /* do the seek */
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1298 url_fseek(&s->pb, pos, SEEK_SET);
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1299
560
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1300 av_update_cur_dts(s, st, ts);
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1301
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1302 return 0;
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1303 }
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1304
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1305 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
1306 int64_t pos_min, pos_max;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1307 #if 0
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1308 AVStream *st;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1309
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1310 if (stream_index < 0)
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1311 return -1;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1312
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1313 st= s->streams[stream_index];
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1314 #endif
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1315
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1316 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
1317 pos_max = url_fsize(&s->pb) - 1;
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1318
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1319 if (pos < pos_min) pos= pos_min;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1320 else if(pos > pos_max) pos= pos_max;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1321
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1322 url_fseek(&s->pb, pos, SEEK_SET);
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1323
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1324 #if 0
560
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1325 av_update_cur_dts(s, st, ts);
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1326 #endif
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1327 return 0;
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1328 }
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1329
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1330 static int av_seek_frame_generic(AVFormatContext *s,
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1331 int stream_index, int64_t timestamp, int flags)
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1332 {
560
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1333 int index;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1334 AVStream *st;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1335 AVIndexEntry *ie;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1336
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1337 if (!s->index_built) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1338 if (is_raw_stream(s)) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1339 av_build_index_raw(s);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1340 } else {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1341 return -1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1342 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1343 s->index_built = 1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1344 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1345
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1346 st = s->streams[stream_index];
698
829c5c8e5cf2 keyframe & non keyframe index fixes
michael
parents: 686
diff changeset
1347 index = av_index_search_timestamp(st, timestamp, flags);
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1348 if (index < 0)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1349 return -1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1350
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1351 /* now we have found the index, we can seek */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1352 ie = &st->index_entries[index];
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1353 av_read_frame_flush(s);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1354 url_fseek(&s->pb, ie->pos, SEEK_SET);
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1355
560
63226381e03c generic cur_dts update
michael
parents: 557
diff changeset
1356 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
1357
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1358 return 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1359 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1360
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1361 /**
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1362 * Seek to the key frame at timestamp.
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1363 * 'timestamp' in 'stream_index'.
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1364 * @param stream_index If stream_index is (-1), a default
557
084de726b4d0 default stream timebase docs patch by (Nathan Kurz <nate at verse dot com>)
michael
parents: 556
diff changeset
1365 * stream is selected, and timestamp is automatically converted
084de726b4d0 default stream timebase docs patch by (Nathan Kurz <nate at verse dot com>)
michael
parents: 556
diff changeset
1366 * from AV_TIME_BASE units to the stream specific time_base.
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1367 * @param timestamp timestamp in AVStream.time_base units
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1368 * @param flags flags which select direction and seeking mode
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1369 * @return >= 0 on success
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1370 */
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1371 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
1372 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1373 int ret;
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1374 AVStream *st;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1375
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1376 av_read_frame_flush(s);
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1377
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1378 if(flags & AVSEEK_FLAG_BYTE)
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1379 return av_seek_frame_byte(s, stream_index, timestamp, flags);
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1380
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1381 if(stream_index < 0){
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1382 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
1383 if(stream_index < 0)
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1384 return -1;
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1385
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1386 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
1387 /* timestamp for default must be expressed in AV_TIME_BASE units */
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1388 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
1389 }
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1390 st= s->streams[stream_index];
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 462
diff changeset
1391
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1392 /* first, we try the format specific seek */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1393 if (s->iformat->read_seek)
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1394 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
1395 else
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1396 ret = -1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1397 if (ret >= 0) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1398 return 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1399 }
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1400
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 425
diff changeset
1401 if(s->iformat->read_timestamp)
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1402 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
1403 else
555
0a997108f384 use native timebase for seeking
michael
parents: 554
diff changeset
1404 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
1405 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1406
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
1407 /*******************************************************/
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
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 /* return TRUE if the stream has accurate timings for at least one component */
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 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
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 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
1413 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
1414
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 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
1416 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
1417 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
1418 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
1419 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
1420 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1421 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
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
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 /* estimate the stream timings from the one of each components. Also
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 compute the global bitrate 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
1426 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
1427 {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1428 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
1429 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
1430 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
1431
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 start_time = MAXINT64;
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 end_time = MININT64;
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1434 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
1435 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
1436 if (st->start_time != AV_NOPTS_VALUE) {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1437 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
1438 if (start_time1 < start_time)
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1439 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
1440 if (st->duration != AV_NOPTS_VALUE) {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1441 end_time1 = start_time1
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1442 + 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
1443 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
1444 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
1445 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1446 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1447 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1448 if (start_time != MAXINT64) {
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 ic->start_time = start_time;
786
694320ffdda0 typo fix by (lists: kenneth aafloy net)
michael
parents: 776
diff changeset
1450 if (end_time != MININT64) {
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
1451 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
1452 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
1453 /* compute the 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
1454 ic->bit_rate = (double)ic->file_size * 8.0 * 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
1455 (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
1456 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1457 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1458 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1459
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1460 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1461
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1462 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
1463 {
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1464 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
1465 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
1466
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1467 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
1468 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
1469 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
1470 if (st->start_time == AV_NOPTS_VALUE) {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1471 if(ic->start_time != AV_NOPTS_VALUE)
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1472 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
1473 if(ic->duration != AV_NOPTS_VALUE)
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1474 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
1475 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1476 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1477 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1478
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1479 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
1480 {
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 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
1482 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
1483 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
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 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
1486 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
1487 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
1488 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
1489 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
1490 bit_rate += st->codec.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
1491 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1492 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
1493 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1494
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1495 /* if duration 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
1496 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
1497 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
1498 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
1499 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
1500 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
1501 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
1502 st = ic->streams[i];
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1503 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
1504 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
1505 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
1506 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
1507 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
1508 }
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 }
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 }
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 }
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 }
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
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 #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
1515
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 /* only usable for MPEG-PS 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
1517 static void av_estimate_timings_from_pts(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
1518 {
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 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
1520 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
1521 int read_size, i, ret;
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 int64_t start_time, 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
1523 int64_t filesize, offset, 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
1524
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1525 /* free previous packet */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1526 if (ic->cur_st && ic->cur_st->parser)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1527 av_free_packet(&ic->cur_pkt);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1528 ic->cur_st = NULL;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1529
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1530 /* flush packet queue */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1531 flush_packet_queue(ic);
488
e25b5ad6603e fix first timestamp when decoding mpeg-ps
michael
parents: 485
diff changeset
1532
e25b5ad6603e fix first timestamp when decoding mpeg-ps
michael
parents: 485
diff changeset
1533 for(i=0;i<ic->nb_streams;i++) {
e25b5ad6603e fix first timestamp when decoding mpeg-ps
michael
parents: 485
diff changeset
1534 st = ic->streams[i];
e25b5ad6603e fix first timestamp when decoding mpeg-ps
michael
parents: 485
diff changeset
1535 if (st->parser) {
e25b5ad6603e fix first timestamp when decoding mpeg-ps
michael
parents: 485
diff changeset
1536 av_parser_close(st->parser);
e25b5ad6603e fix first timestamp when decoding mpeg-ps
michael
parents: 485
diff changeset
1537 st->parser= NULL;
e25b5ad6603e fix first timestamp when decoding mpeg-ps
michael
parents: 485
diff changeset
1538 }
e25b5ad6603e fix first timestamp when decoding mpeg-ps
michael
parents: 485
diff changeset
1539 }
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1540
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 /* 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
1542 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
1543 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
1544 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
1545 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
1546 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
1547 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
1548 /* 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
1549 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
1550 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
1551 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
1552 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
1553 }
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 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
1555 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
1556
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1557 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
1558 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
1559 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
1560 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
1561 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
1562 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
1563 if (st->start_time == AV_NOPTS_VALUE)
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1564 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
1565 }
8d1569be0ee1 memory leak fix by (Tom Dexter <devel at www dot digitalaudiorock dot com>)
michaelni
parents: 205
diff changeset
1566 av_free_packet(pkt);
8d1569be0ee1 memory leak fix by (Tom Dexter <devel at www dot digitalaudiorock dot com>)
michaelni
parents: 205
diff changeset
1567 }
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
1568
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 /* 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
1570 /* 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
1571 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
1572 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
1573 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
1574 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
1575
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 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
1577 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
1578 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
1579 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
1580 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
1581 /* 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
1582 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
1583 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
1584 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
1585 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
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 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
1588 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
1589
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1590 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
1591 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
1592 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
1593 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
1594 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
1595 if (pkt->pts != AV_NOPTS_VALUE) {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1596 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
1597 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
1598 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
1599 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
1600 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
1601 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
1602 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1603 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1604 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
1605 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1606
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1607 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
1608
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1609 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
1610 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1611
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1612 static void av_estimate_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
1613 {
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1614 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
1615
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1616 /* 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
1617 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
1618 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
1619 } else {
764
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 757
diff changeset
1620 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
1621 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
1622 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
1623 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1624 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
1625
606
ef6d04c1dd9a use pts based duration/bitrate guessing code for mpeg-ts
michael
parents: 605
diff changeset
1626 if ((ic->iformat == &mpegps_demux || ic->iformat == &mpegts_demux) && 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
1627 /* get accurate estimate from the PTSes */
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1628 av_estimate_timings_from_pts(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
1629 } 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
1630 /* 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
1631 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
1632 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
1633 } 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
1634 /* 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
1635 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
1636 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1637 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
1638
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1639 #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
1640 {
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1641 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
1642 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
1643 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
1644 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
1645 printf("%d: start_time: %0.3f duration: %0.3f\n",
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1646 i, (double)st->start_time / 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
1647 (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
1648 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1649 printf("stream: start_time: %0.3f duration: %0.3f bitrate=%d kb/s\n",
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1650 (double)ic->start_time / 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
1651 (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
1652 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
1653 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1654 #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
1655 }
0316a506aeb0 initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
bellard
parents: 175
diff changeset
1656
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1657 static int has_codec_parameters(AVCodecContext *enc)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1658 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1659 int val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1660 switch(enc->codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1661 case CODEC_TYPE_AUDIO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1662 val = enc->sample_rate;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1663 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1664 case CODEC_TYPE_VIDEO:
737
119ac74d1c49 PIX_FMT_NONE and related fixes
michael
parents: 717
diff changeset
1665 val = enc->width && enc->pix_fmt != PIX_FMT_NONE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1666 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1667 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1668 val = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1669 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1670 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1671 return (val != 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1672 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1673
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1674 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
1675 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1676 int16_t *samples;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1677 AVCodec *codec;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1678 int got_picture, ret;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1679 AVFrame picture;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1680
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1681 codec = avcodec_find_decoder(st->codec.codec_id);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1682 if (!codec)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1683 return -1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1684 ret = avcodec_open(&st->codec, codec);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1685 if (ret < 0)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1686 return ret;
737
119ac74d1c49 PIX_FMT_NONE and related fixes
michael
parents: 717
diff changeset
1687
119ac74d1c49 PIX_FMT_NONE and related fixes
michael
parents: 717
diff changeset
1688 if(!has_codec_parameters(&st->codec)){
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1689 switch(st->codec.codec_type) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1690 case CODEC_TYPE_VIDEO:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1691 ret = avcodec_decode_video(&st->codec, &picture,
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1692 &got_picture, (uint8_t *)data, size);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1693 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1694 case CODEC_TYPE_AUDIO:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1695 samples = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1696 if (!samples)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1697 goto fail;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1698 ret = avcodec_decode_audio(&st->codec, samples,
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1699 &got_picture, (uint8_t *)data, size);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1700 av_free(samples);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1701 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1702 default:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1703 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1704 }
737
119ac74d1c49 PIX_FMT_NONE and related fixes
michael
parents: 717
diff changeset
1705 }
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1706 fail:
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1707 avcodec_close(&st->codec);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1708 return ret;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1709 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1710
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1711 /* absolute maximum size we read until we abort */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1712 #define MAX_READ_SIZE 5000000
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1713
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1714 /* maximum duration until we stop analysing the stream */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1715 #define MAX_STREAM_DURATION ((int)(AV_TIME_BASE * 1.0))
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1716
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1717 /**
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1718 * Read the beginning of a media file to get stream information. This
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1719 * is useful for file formats with no headers such as MPEG. This
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1720 * function also compute the real frame rate in case of mpeg2 repeat
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1721 * frame mode.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1722 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1723 * @param ic media file handle
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1724 * @return >=0 if OK. AVERROR_xxx if error.
737
119ac74d1c49 PIX_FMT_NONE and related fixes
michael
parents: 717
diff changeset
1725 * @todo let user decide somehow what information is needed so we dont waste time geting stuff the user doesnt need
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1726 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1727 int av_find_stream_info(AVFormatContext *ic)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1728 {
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1729 int i, count, ret, read_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1730 AVStream *st;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1731 AVPacket pkt1, *pkt;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1732 AVPacketList *pktl=NULL, **ppktl;
620
7dbdbe073bcd try to guess the fps if they are variable
michael
parents: 618
diff changeset
1733 int64_t last_dts[MAX_STREAMS];
750
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1734 int64_t duration_sum[MAX_STREAMS];
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1735 int duration_count[MAX_STREAMS]={0};
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1736
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1737 for(i=0;i<ic->nb_streams;i++) {
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1738 st = ic->streams[i];
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1739 if(st->codec.codec_type == CODEC_TYPE_VIDEO){
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1740 /* if(!st->time_base.num)
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1741 st->time_base= */
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1742 if(!st->codec.time_base.num)
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1743 st->codec.time_base= st->time_base;
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1744 }
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;
750
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1749 duration_sum[i]= INT64_MAX;
620
7dbdbe073bcd try to guess the fps if they are variable
michael
parents: 618
diff changeset
1750 }
7dbdbe073bcd try to guess the fps if they are variable
michael
parents: 618
diff changeset
1751
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];
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
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 */
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1762 if( st->codec.time_base.den >= 1000LL*st->codec.time_base.num
750
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
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;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1765 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1766 if (i == ic->nb_streams) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1767 /* NOTE: if the format has no header, then we need to read
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1768 some packets to get most of the streams, so we cannot
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1769 stop here */
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1770 if (!(ic->ctx_flags & AVFMTCTX_NOHEADER)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1771 /* if we found the info for all the codecs, we can stop */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1772 ret = count;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1773 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1774 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1775 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1776 /* we did not get all the codec info, but we read too much data */
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1777 if (read_size >= MAX_READ_SIZE) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1778 ret = count;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1779 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1780 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1781 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1782
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1783 /* 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
1784 (AVFMTCTX_NOHEADER) */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1785 ret = av_read_frame_internal(ic, &pkt1);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1786 if (ret < 0) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1787 /* EOF or error */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1788 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
1789 for(i=0;i<ic->nb_streams;i++) {
6a5ba24b2c6b fixing demuxing for short files where the framerate detection failed
michael
parents: 643
diff changeset
1790 st = ic->streams[i];
6a5ba24b2c6b fixing demuxing for short files where the framerate detection failed
michael
parents: 643
diff changeset
1791 if (!has_codec_parameters(&st->codec))
6a5ba24b2c6b fixing demuxing for short files where the framerate detection failed
michael
parents: 643
diff changeset
1792 break;
6a5ba24b2c6b fixing demuxing for short files where the framerate detection failed
michael
parents: 643
diff changeset
1793 }
750
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1794 if (i == ic->nb_streams)
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1795 ret = 0;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1796 break;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1797 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1798
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1799 pktl = av_mallocz(sizeof(AVPacketList));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1800 if (!pktl) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1801 ret = AVERROR_NOMEM;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1802 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1803 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1804
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1805 /* add the packet in the buffered packet list */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1806 *ppktl = pktl;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1807 ppktl = &pktl->next;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1808
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1809 pkt = &pktl->pkt;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1810 *pkt = pkt1;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1811
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1812 /* duplicate the packet */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1813 if (av_dup_packet(pkt) < 0) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1814 ret = AVERROR_NOMEM;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1815 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1816 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1817
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1818 read_size += pkt->size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1819
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1820 st = ic->streams[pkt->stream_index];
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1821 st->codec_info_duration += pkt->duration;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1822 if (pkt->duration != 0)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1823 st->codec_info_nb_frames++;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1824
772
d3cec742f7c0 av_find_stream_info() end check fixes
michael
parents: 764
diff changeset
1825 {
750
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1826 int index= pkt->stream_index;
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1827 int64_t last= last_dts[index];
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1828 int64_t duration= pkt->dts - last;
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1829
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1830 if(pkt->dts != AV_NOPTS_VALUE && last != AV_NOPTS_VALUE && duration>0){
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1831 if(duration*duration_count[index]*10/9 < duration_sum[index]){
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1832 duration_sum[index]= duration;
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1833 duration_count[index]=1;
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1834 }else{
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1835 int factor= av_rescale(duration, duration_count[index], duration_sum[index]);
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1836 duration_sum[index] += duration;
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1837 duration_count[index]+= factor;
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1838 }
772
d3cec742f7c0 av_find_stream_info() end check fixes
michael
parents: 764
diff changeset
1839 if(st->codec_info_nb_frames == 0)
d3cec742f7c0 av_find_stream_info() end check fixes
michael
parents: 764
diff changeset
1840 st->codec_info_duration += duration;
620
7dbdbe073bcd try to guess the fps if they are variable
michael
parents: 618
diff changeset
1841 }
7dbdbe073bcd try to guess the fps if they are variable
michael
parents: 618
diff changeset
1842 last_dts[pkt->stream_index]= pkt->dts;
7dbdbe073bcd try to guess the fps if they are variable
michael
parents: 618
diff changeset
1843 }
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1844 /* 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
1845 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
1846 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
1847 decompress for Quicktime. */
737
119ac74d1c49 PIX_FMT_NONE and related fixes
michael
parents: 717
diff changeset
1848 if (!has_codec_parameters(&st->codec) /*&&
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1849 (st->codec.codec_id == CODEC_ID_FLV1 ||
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1850 st->codec.codec_id == CODEC_ID_H264 ||
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1851 st->codec.codec_id == CODEC_ID_H263 ||
588
113101b95d3b raw h261 demuxing fix
michael
parents: 586
diff changeset
1852 st->codec.codec_id == CODEC_ID_H261 ||
404
6579fe3ade40 remove spyware from ogg*.c
michael
parents: 371
diff changeset
1853 st->codec.codec_id == CODEC_ID_VORBIS ||
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents: 488
diff changeset
1854 st->codec.codec_id == CODEC_ID_MJPEG ||
581
03377d4de76a porting png support from -f image to -f image2
michael
parents: 578
diff changeset
1855 st->codec.codec_id == CODEC_ID_PNG ||
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
1856 st->codec.codec_id == CODEC_ID_PAM ||
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
1857 st->codec.codec_id == CODEC_ID_PGM ||
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
1858 st->codec.codec_id == CODEC_ID_PGMYUV ||
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
1859 st->codec.codec_id == CODEC_ID_PBM ||
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
1860 st->codec.codec_id == CODEC_ID_PPM ||
686
e2687b784c3a shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents: 683
diff changeset
1861 st->codec.codec_id == CODEC_ID_SHORTEN ||
737
119ac74d1c49 PIX_FMT_NONE and related fixes
michael
parents: 717
diff changeset
1862 (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
1863 try_decode_frame(st, pkt->data, pkt->size);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1864
772
d3cec742f7c0 av_find_stream_info() end check fixes
michael
parents: 764
diff changeset
1865 if (av_rescale_q(st->codec_info_duration, st->time_base, AV_TIME_BASE_Q) >= MAX_STREAM_DURATION) {
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1866 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1867 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1868 count++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1869 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1870
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1871 for(i=0;i<ic->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1872 st = ic->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1873 if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
600
6446e6aee91e fixing playback of ftp://ftp.mplayerhq.hu/MPlayer/incoming/blender_raw.avi
michael
parents: 599
diff changeset
1874 if(st->codec.codec_id == CODEC_ID_RAWVIDEO && !st->codec.codec_tag && !st->codec.bits_per_sample)
578
8305c0755df7 fix image stream copy
michael
parents: 572
diff changeset
1875 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
1876
757
7177bd7f1f47 10l (overflows)
michael
parents: 750
diff changeset
1877 if(duration_count[i] && st->codec.time_base.num*1000LL <= st->codec.time_base.den &&
750
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1878 st->time_base.num*duration_sum[i]/duration_count[i]*1000LL > st->time_base.den){
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1879 AVRational fps1;
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1880 int64_t num, den;
625
4add6a5abe3e prefer integer fps if possible when guessing
michael
parents: 624
diff changeset
1881
750
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1882 num= st->time_base.den*duration_count[i];
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1883 den= st->time_base.num*duration_sum[i];
625
4add6a5abe3e prefer integer fps if possible when guessing
michael
parents: 624
diff changeset
1884
750
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1885 av_reduce(&fps1.num, &fps1.den, num*1001, den*1000, FFMAX(st->time_base.den, st->time_base.num)/4);
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1886 av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, num, den, FFMAX(st->time_base.den, st->time_base.num)/4);
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1887 if(fps1.num < st->r_frame_rate.num && fps1.den == 1 && (fps1.num==24 || fps1.num==30)){ //FIXME better decission
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1888 st->r_frame_rate.num= fps1.num*1000;
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1889 st->r_frame_rate.den= fps1.den*1001;
ba67f8c7f8f9 better r_frame_rate guessing code
michael
parents: 748
diff changeset
1890 }
620
7dbdbe073bcd try to guess the fps if they are variable
michael
parents: 618
diff changeset
1891 }
7dbdbe073bcd try to guess the fps if they are variable
michael
parents: 618
diff changeset
1892
578
8305c0755df7 fix image stream copy
michael
parents: 572
diff changeset
1893 /* set real frame rate info */
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1894 /* compute the real frame rate for telecine */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1895 if ((st->codec.codec_id == CODEC_ID_MPEG1VIDEO ||
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1896 st->codec.codec_id == CODEC_ID_MPEG2VIDEO) &&
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1897 st->codec.sub_id == 2) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1898 if (st->codec_info_nb_frames >= 20) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1899 float coded_frame_rate, est_frame_rate;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1900 est_frame_rate = ((double)st->codec_info_nb_frames * AV_TIME_BASE) /
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1901 (double)st->codec_info_duration ;
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1902 coded_frame_rate = 1.0/av_q2d(st->codec.time_base);
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1903 #if 0
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1904 printf("telecine: coded_frame_rate=%0.3f est_frame_rate=%0.3f\n",
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1905 coded_frame_rate, est_frame_rate);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1906 #endif
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1907 /* if we detect that it could be a telecine, we
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1908 signal it. It would be better to do it at a
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1909 higher level as it can change in a film */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1910 if (coded_frame_rate >= 24.97 &&
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1911 (est_frame_rate >= 23.5 && est_frame_rate < 24.5)) {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1912 st->r_frame_rate = (AVRational){24000, 1001};
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1913 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1914 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1915 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1916 /* if no real frame rate, use the codec one */
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1917 if (!st->r_frame_rate.num){
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1918 st->r_frame_rate.num = st->codec.time_base.den;
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
1919 st->r_frame_rate.den = st->codec.time_base.num;
85
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 75
diff changeset
1920 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1921 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1922 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1923
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
1924 av_estimate_timings(ic);
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1925 #if 0
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1926 /* correct DTS for b frame streams with no timestamps */
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1927 for(i=0;i<ic->nb_streams;i++) {
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1928 st = ic->streams[i];
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1929 if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1930 if(b-frames){
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1931 ppktl = &ic->packet_buffer;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1932 while(ppkt1){
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1933 if(ppkt1->stream_index != i)
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1934 continue;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1935 if(ppkt1->pkt->dts < 0)
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1936 break;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1937 if(ppkt1->pkt->pts != AV_NOPTS_VALUE)
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1938 break;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1939 ppkt1->pkt->dts -= delta;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1940 ppkt1= ppkt1->next;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1941 }
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1942 if(ppkt1)
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1943 continue;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1944 st->cur_dts -= delta;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1945 }
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1946 }
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1947 }
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
1948 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1949 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1950 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1951
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1952 /*******************************************************/
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1953
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1954 /**
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1955 * start playing a network based stream (e.g. RTSP stream) at the
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1956 * current position
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1957 */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1958 int av_read_play(AVFormatContext *s)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1959 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1960 if (!s->iformat->read_play)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1961 return AVERROR_NOTSUPP;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1962 return s->iformat->read_play(s);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1963 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1964
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1965 /**
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1966 * pause a network based stream (e.g. RTSP stream). Use av_read_play()
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1967 * to resume it.
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1968 */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1969 int av_read_pause(AVFormatContext *s)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1970 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1971 if (!s->iformat->read_pause)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1972 return AVERROR_NOTSUPP;
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1973 return s->iformat->read_pause(s);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1974 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1975
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1976 /**
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1977 * Close a media file (but not its codecs)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1978 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1979 * @param s media file handle
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1980 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1981 void av_close_input_file(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1982 {
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
1983 int i, must_open_file;
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
1984 AVStream *st;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1985
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1986 /* free previous packet */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1987 if (s->cur_st && s->cur_st->parser)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1988 av_free_packet(&s->cur_pkt);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1989
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1990 if (s->iformat->read_close)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1991 s->iformat->read_close(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1992 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
1993 /* free all data in a stream component */
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
1994 st = s->streams[i];
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1995 if (st->parser) {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
1996 av_parser_close(st->parser);
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 av_free(st->index_entries);
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
1999 av_free(st);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2000 }
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2001 flush_packet_queue(s);
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
2002 must_open_file = 1;
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
2003 if (s->iformat->flags & AVFMT_NOFILE) {
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
2004 must_open_file = 0;
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
2005 }
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 168
diff changeset
2006 if (must_open_file) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2007 url_fclose(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2008 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2009 av_freep(&s->priv_data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2010 av_free(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2011 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2012
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2013 /**
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2014 * Add a new stream to a media file. Can only be called in the
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
2015 * read_header function. If the flag AVFMTCTX_NOHEADER is in the
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
2016 * format context, then new streams can be added in read_packet too.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2017 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2018 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2019 * @param s media file handle
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 290
diff changeset
2020 * @param id file format dependent stream id
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2021 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2022 AVStream *av_new_stream(AVFormatContext *s, int id)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2023 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2024 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2025
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2026 if (s->nb_streams >= MAX_STREAMS)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2027 return NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2028
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2029 st = av_mallocz(sizeof(AVStream));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2030 if (!st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2031 return NULL;
5
39c4c4336486 cleanup
michaelni
parents: 0
diff changeset
2032 avcodec_get_context_defaults(&st->codec);
193
5079b6e20e91 no default bit rate if decoding
bellard
parents: 192
diff changeset
2033 if (s->iformat) {
5079b6e20e91 no default bit rate if decoding
bellard
parents: 192
diff changeset
2034 /* no default bitrate if decoding */
5079b6e20e91 no default bit rate if decoding
bellard
parents: 192
diff changeset
2035 st->codec.bit_rate = 0;
5079b6e20e91 no default bit rate if decoding
bellard
parents: 192
diff changeset
2036 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2037 st->index = s->nb_streams;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2038 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
2039 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
2040 st->duration = AV_NOPTS_VALUE;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2041 st->cur_dts = AV_NOPTS_VALUE;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 453
diff changeset
2042
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 453
diff changeset
2043 /* default pts settings is MPEG like */
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 453
diff changeset
2044 av_set_pts_info(st, 33, 1, 90000);
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
2045 st->last_IP_pts = AV_NOPTS_VALUE;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 453
diff changeset
2046
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2047 s->streams[s->nb_streams++] = st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2048 return st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2049 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2050
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2051 /************************************************************/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2052 /* output media file */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2053
20
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2054 int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap)
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2055 {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2056 int ret;
32
cd0155c9022e zero sized malloc patch by Roman Shaposhnick
bellard
parents: 30
diff changeset
2057
cd0155c9022e zero sized malloc patch by Roman Shaposhnick
bellard
parents: 30
diff changeset
2058 if (s->oformat->priv_data_size > 0) {
cd0155c9022e zero sized malloc patch by Roman Shaposhnick
bellard
parents: 30
diff changeset
2059 s->priv_data = av_mallocz(s->oformat->priv_data_size);
cd0155c9022e zero sized malloc patch by Roman Shaposhnick
bellard
parents: 30
diff changeset
2060 if (!s->priv_data)
cd0155c9022e zero sized malloc patch by Roman Shaposhnick
bellard
parents: 30
diff changeset
2061 return AVERROR_NOMEM;
cd0155c9022e zero sized malloc patch by Roman Shaposhnick
bellard
parents: 30
diff changeset
2062 } else
cd0155c9022e zero sized malloc patch by Roman Shaposhnick
bellard
parents: 30
diff changeset
2063 s->priv_data = NULL;
cd0155c9022e zero sized malloc patch by Roman Shaposhnick
bellard
parents: 30
diff changeset
2064
20
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2065 if (s->oformat->set_parameters) {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2066 ret = s->oformat->set_parameters(s, ap);
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2067 if (ret < 0)
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2068 return ret;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2069 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2070 return 0;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2071 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2072
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2073 /**
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2074 * allocate the stream private data and write the stream header to an
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2075 * output media file
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2076 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2077 * @param s media file handle
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2078 * @return 0 if OK. AVERROR_xxx if error.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2079 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2080 int av_write_header(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2081 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2082 int ret, i;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2083 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2084
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2085 ret = s->oformat->write_header(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2086 if (ret < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2087 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2088
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2089 /* init PTS generation */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2090 for(i=0;i<s->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2091 st = s->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2092
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2093 switch (st->codec.codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2094 case CODEC_TYPE_AUDIO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2095 av_frac_init(&st->pts, 0, 0,
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 453
diff changeset
2096 (int64_t)st->time_base.num * st->codec.sample_rate);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2097 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2098 case CODEC_TYPE_VIDEO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2099 av_frac_init(&st->pts, 0, 0,
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
2100 (int64_t)st->time_base.num * st->codec.time_base.den);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2101 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2102 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2103 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2104 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2105 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2106 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2107 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2108
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2109 //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
2110 static int compute_pkt_fields2(AVStream *st, AVPacket *pkt){
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2111 int b_frames = FFMAX(st->codec.has_b_frames, st->codec.max_b_frames);
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2112 int num, den, frame_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2113
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2114 // av_log(NULL, AV_LOG_DEBUG, "av_write_frame: pts:%lld dts:%lld cur_dts:%lld b:%d size:%d st:%d\n", pkt->pts, pkt->dts, st->cur_dts, b_frames, pkt->size, pkt->stream_index);
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2115
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2116 /* if(pkt->pts == AV_NOPTS_VALUE && pkt->dts == AV_NOPTS_VALUE)
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2117 return -1;*/
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2118
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2119 /* duration field */
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2120 if (pkt->duration == 0) {
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2121 compute_frame_duration(&num, &den, st, NULL, pkt);
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2122 if (den && num) {
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2123 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
2124 }
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2125 }
409
b6949d80b7a9 move zero size hack from ogg.c to utils.c
michael
parents: 406
diff changeset
2126
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2127 //XXX/FIXME this is a temporary hack until all encoders output pts
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2128 if((pkt->pts == 0 || pkt->pts == AV_NOPTS_VALUE) && pkt->dts == AV_NOPTS_VALUE && !b_frames){
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2129 pkt->dts=
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2130 // pkt->pts= st->cur_dts;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2131 pkt->pts= st->pts.val;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2132 }
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2133
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2134 //calculate dts from pts
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2135 if(pkt->pts != AV_NOPTS_VALUE && pkt->dts == AV_NOPTS_VALUE){
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2136 if(b_frames){
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2137 if(st->last_IP_pts == AV_NOPTS_VALUE){
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2138 st->last_IP_pts= -pkt->duration;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2139 }
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2140 if(st->last_IP_pts < pkt->pts){
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2141 pkt->dts= st->last_IP_pts;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2142 st->last_IP_pts= pkt->pts;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2143 }else
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2144 pkt->dts= pkt->pts;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2145 }else
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2146 pkt->dts= pkt->pts;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2147 }
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2148
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
2149 if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && st->cur_dts >= pkt->dts){
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
2150 av_log(NULL, AV_LOG_ERROR, "error, non monotone timestamps %Ld >= %Ld\n", st->cur_dts, pkt->dts);
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
2151 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
2152 }
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
2153 if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts < pkt->dts){
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
2154 av_log(NULL, AV_LOG_ERROR, "error, pts < dts\n");
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
2155 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
2156 }
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
2157
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2158 // av_log(NULL, AV_LOG_DEBUG, "av_write_frame: pts2:%lld dts2:%lld\n", pkt->pts, pkt->dts);
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2159 st->cur_dts= pkt->dts;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2160 st->pts.val= pkt->dts;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2161
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2162 /* update pts */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2163 switch (st->codec.codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2164 case CODEC_TYPE_AUDIO:
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 466
diff changeset
2165 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
2166
409
b6949d80b7a9 move zero size hack from ogg.c to utils.c
michael
parents: 406
diff changeset
2167 /* 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
2168 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
2169 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
2170 av_frac_add(&st->pts, (int64_t)st->time_base.den * frame_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2171 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2172 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2173 case CODEC_TYPE_VIDEO:
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
2174 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
2175 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2176 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2177 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2178 }
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
2179 return 0;
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2180 }
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2181
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2182 static void truncate_ts(AVStream *st, AVPacket *pkt){
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2183 int64_t pts_mask = (2LL << (st->pts_wrap_bits-1)) - 1;
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2184
547
b832a27355ec initial dts fix
michael
parents: 542
diff changeset
2185 // if(pkt->dts < 0)
b832a27355ec initial dts fix
michael
parents: 542
diff changeset
2186 // pkt->dts= 0; //this happens for low_delay=0 and b frames, FIXME, needs further invstigation about what we should do here
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2187
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2188 pkt->pts &= pts_mask;
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2189 pkt->dts &= pts_mask;
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2190 }
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2191
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2192 /**
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2193 * Write a packet to an output media file. The packet shall contain
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2194 * one audio or video frame.
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2195 *
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2196 * @param s media file handle
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2197 * @param pkt the packet, which contains the stream_index, buf/buf_size, dts/pts, ...
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2198 * @return < 0 if error, = 0 if OK, 1 if end of stream wanted.
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2199 */
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2200 int av_write_frame(AVFormatContext *s, AVPacket *pkt)
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2201 {
554
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2202 int ret;
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2203
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
2204 ret=compute_pkt_fields2(s->streams[pkt->stream_index], pkt);
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
2205 if(ret<0)
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
2206 return ret;
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2207
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2208 truncate_ts(s->streams[pkt->stream_index], pkt);
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2209
554
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2210 ret= s->oformat->write_packet(s, pkt);
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2211 if(!ret)
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2212 ret= url_ferror(&s->pb);
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2213 return ret;
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2214 }
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2215
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2216 /**
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
2217 * interleave_packet implementation which will interleave per DTS.
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2218 */
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
2219 static 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
2220 AVPacketList *pktl, **next_point, *this_pktl;
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2221 int stream_count=0;
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2222 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
2223
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2224 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
2225 AVStream *st= s->streams[ pkt->stream_index];
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2226
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
2227 assert(pkt->destruct != av_destruct_packet); //FIXME
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2228
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
2229 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
2230 this_pktl->pkt= *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
2231 av_dup_packet(&this_pktl->pkt);
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2232
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
2233 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
2234 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
2235 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
2236 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
2237 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
2238 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
2239 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
2240 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
2241 }
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2242 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
2243 *next_point= this_pktl;
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 memset(streams, 0, sizeof(streams));
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2247 pktl= s->packet_buffer;
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2248 while(pktl){
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2249 //av_log(s, AV_LOG_DEBUG, "show st:%d dts:%lld\n", pktl->pkt.stream_index, pktl->pkt.dts);
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2250 if(streams[ pktl->pkt.stream_index ] == 0)
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2251 stream_count++;
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2252 streams[ pktl->pkt.stream_index ]++;
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2253 pktl= pktl->next;
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2254 }
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
2255
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2256 if(s->nb_streams == stream_count || (flush && stream_count)){
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2257 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
2258 *out= pktl->pkt;
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2259
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2260 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
2261 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
2262 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
2263 }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
2264 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
2265 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
2266 }
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2267 }
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2268
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2269 /**
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2270 * 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
2271 * @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
2272 * @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
2273 * @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
2274 * remaining packets should be output
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2275 * @return 1 if a packet was output, 0 if no packet could be output,
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2276 * < 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
2277 */
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 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
2279 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
2280 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
2281 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
2282 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
2283 }
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2284
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
2285 /**
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2286 * Writes a packet to an output media file ensuring correct interleaving.
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2287 * The packet shall contain one audio or video frame.
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2288 * If the packets are already correctly interleaved the application should
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2289 * call av_write_frame() instead as its slightly faster, its also important
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2290 * to keep in mind that completly non interleaved input will need huge amounts
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 * of memory to interleave with this, so its prefereable to interleave at the
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 * demuxer level
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 *
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 * @param s media file handle
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 * @param pkt the packet, which contains the stream_index, buf/buf_size, dts/pts, ...
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 * @return < 0 if error, = 0 if OK, 1 if end of stream wanted.
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 */
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 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
2299 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
2300
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 //FIXME/XXX/HACK drop zero sized packets
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2302 if(st->codec.codec_type == CODEC_TYPE_AUDIO && pkt->size==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
2303 return 0;
717
a79f89d39c3c discard dummy packets before doing inapropriate checks on them and failing as a result
michael
parents: 708
diff changeset
2304
a79f89d39c3c discard dummy packets before doing inapropriate checks on them and failing as a result
michael
parents: 708
diff changeset
2305 //av_log(NULL, AV_LOG_DEBUG, "av_interleaved_write_frame %d %Ld %Ld\n", pkt->size, pkt->dts, pkt->pts);
a79f89d39c3c discard dummy packets before doing inapropriate checks on them and failing as a result
michael
parents: 708
diff changeset
2306 if(compute_pkt_fields2(st, pkt) < 0)
a79f89d39c3c discard dummy packets before doing inapropriate checks on them and failing as a result
michael
parents: 708
diff changeset
2307 return -1;
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
2308
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2309 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
2310 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
2311
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2312 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
2313 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
2314 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
2315 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
2316 return 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
2317
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2318 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
2319 ret= s->oformat->write_packet(s, &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
2320
76c47c58064f move packet interleaving function into AVOutputFormat, so it 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 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
2322 pkt= NULL;
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2323
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2324 if(ret<0)
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2325 return ret;
554
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2326 if(url_ferror(&s->pb))
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2327 return url_ferror(&s->pb);
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2328 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2329 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2330
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2331 /**
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2332 * write the stream trailer to an output media file and and free the
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2333 * file private data.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2334 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2335 * @param s media file handle
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2336 * @return 0 if OK. AVERROR_xxx if error. */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2337 int av_write_trailer(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2338 {
540
26a477a5ebda move free() of AVStream priv data to av_write_trailer()
michael
parents: 536
diff changeset
2339 int ret, i;
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2340
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
2341 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
2342 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
2343 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
2344 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
2345 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
2346 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
2347 break;
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2348
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
2349 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
2350 ret= s->oformat->write_packet(s, &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
2351
76c47c58064f move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
michael
parents: 535
diff changeset
2352 av_free_packet(&pkt);
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2353
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2354 if(ret<0)
540
26a477a5ebda move free() of AVStream priv data to av_write_trailer()
michael
parents: 536
diff changeset
2355 goto fail;
554
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2356 if(url_ferror(&s->pb))
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2357 goto fail;
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2358 }
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
2359
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2360 ret = s->oformat->write_trailer(s);
540
26a477a5ebda move free() of AVStream priv data to av_write_trailer()
michael
parents: 536
diff changeset
2361 fail:
554
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2362 if(ret == 0)
e1f17fcfb92c write error handling
michael
parents: 547
diff changeset
2363 ret=url_ferror(&s->pb);
540
26a477a5ebda move free() of AVStream priv data to av_write_trailer()
michael
parents: 536
diff changeset
2364 for(i=0;i<s->nb_streams;i++)
26a477a5ebda move free() of AVStream priv data to av_write_trailer()
michael
parents: 536
diff changeset
2365 av_freep(&s->streams[i]->priv_data);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2366 av_freep(&s->priv_data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2367 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2368 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2369
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2370 /* "user interface" functions */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2371
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2372 void dump_format(AVFormatContext *ic,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2373 int index,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2374 const char *url,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2375 int is_output)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2376 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2377 int i, flags;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2378 char buf[256];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2379
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2380 av_log(NULL, AV_LOG_INFO, "%s #%d, %s, %s '%s':\n",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2381 is_output ? "Output" : "Input",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2382 index,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2383 is_output ? ic->oformat->name : ic->iformat->name,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2384 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
2385 if (!is_output) {
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2386 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
2387 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
2388 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
2389 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
2390 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
2391 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
2392 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
2393 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
2394 mins %= 60;
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2395 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
2396 (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
2397 } else {
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2398 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
2399 }
556
cb5f220888c0 print start_time patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents: 555
diff changeset
2400 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
2401 int secs, us;
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2402 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
2403 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
2404 us = ic->start_time % AV_TIME_BASE;
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2405 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
2406 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
2407 }
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2408 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
2409 if (ic->bit_rate) {
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2410 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
2411 } else {
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2412 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
2413 }
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2414 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
2415 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2416 for(i=0;i<ic->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2417 AVStream *st = ic->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2418 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
2419 av_log(NULL, AV_LOG_INFO, " Stream #%d.%d", index, i);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2420 /* the pid is an important information, so we display it */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2421 /* XXX: add a generic system */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2422 if (is_output)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2423 flags = ic->oformat->flags;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2424 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2425 flags = ic->iformat->flags;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2426 if (flags & AVFMT_SHOW_IDS) {
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2427 av_log(NULL, AV_LOG_INFO, "[0x%x]", st->id);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2428 }
776
47c7fa7c2e7c changing a few AV_LOG_DEBUG to AV_LOG_INFO
michael
parents: 775
diff changeset
2429 av_log(NULL, AV_LOG_INFO, ": %s\n", buf);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2430 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2431 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2432
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2433 typedef struct {
168
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2434 const char *abv;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2435 int width, height;
168
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2436 int frame_rate, frame_rate_base;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2437 } AbvEntry;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2438
168
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2439 static AbvEntry frame_abvs[] = {
204
61f9cad50ff3 * making resolution abbreviations right
romansh
parents: 199
diff changeset
2440 { "ntsc", 720, 480, 30000, 1001 },
61f9cad50ff3 * making resolution abbreviations right
romansh
parents: 199
diff changeset
2441 { "pal", 720, 576, 25, 1 },
61f9cad50ff3 * making resolution abbreviations right
romansh
parents: 199
diff changeset
2442 { "qntsc", 352, 240, 30000, 1001 }, /* VCD compliant ntsc */
61f9cad50ff3 * making resolution abbreviations right
romansh
parents: 199
diff changeset
2443 { "qpal", 352, 288, 25, 1 }, /* VCD compliant pal */
205
e5491d64edb3 1000l in abbrv. table
romansh
parents: 204
diff changeset
2444 { "sntsc", 640, 480, 30000, 1001 }, /* square pixel ntsc */
e5491d64edb3 1000l in abbrv. table
romansh
parents: 204
diff changeset
2445 { "spal", 768, 576, 25, 1 }, /* square pixel pal */
168
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2446 { "film", 352, 240, 24, 1 },
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2447 { "ntsc-film", 352, 240, 24000, 1001 },
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2448 { "sqcif", 128, 96, 0, 0 },
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2449 { "qcif", 176, 144, 0, 0 },
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2450 { "cif", 352, 288, 0, 0 },
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2451 { "4cif", 704, 576, 0, 0 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2452 };
168
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2453
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2454 int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2455 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2456 int i;
168
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2457 int n = sizeof(frame_abvs) / sizeof(AbvEntry);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2458 const char *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2459 int frame_width = 0, frame_height = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2460
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2461 for(i=0;i<n;i++) {
168
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2462 if (!strcmp(frame_abvs[i].abv, str)) {
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2463 frame_width = frame_abvs[i].width;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2464 frame_height = frame_abvs[i].height;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2465 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2466 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2467 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2468 if (i == n) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2469 p = str;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2470 frame_width = strtol(p, (char **)&p, 10);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2471 if (*p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2472 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2473 frame_height = strtol(p, (char **)&p, 10);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2474 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2475 if (frame_width <= 0 || frame_height <= 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2476 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2477 *width_ptr = frame_width;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2478 *height_ptr = frame_height;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2479 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2480 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2481
168
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2482 int parse_frame_rate(int *frame_rate, int *frame_rate_base, const char *arg)
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2483 {
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2484 int i;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2485 char* cp;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2486
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2487 /* First, we check our abbreviation table */
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2488 for (i = 0; i < sizeof(frame_abvs)/sizeof(*frame_abvs); ++i)
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2489 if (!strcmp(frame_abvs[i].abv, arg)) {
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2490 *frame_rate = frame_abvs[i].frame_rate;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2491 *frame_rate_base = frame_abvs[i].frame_rate_base;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2492 return 0;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2493 }
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2494
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2495 /* Then, we try to parse it as fraction */
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2496 cp = strchr(arg, '/');
662
549e594a13c2 support colon-separated rates patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 652
diff changeset
2497 if (!cp)
549e594a13c2 support colon-separated rates patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 652
diff changeset
2498 cp = strchr(arg, ':');
168
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2499 if (cp) {
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2500 char* cpp;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2501 *frame_rate = strtol(arg, &cpp, 10);
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2502 if (cpp != arg || cpp == cp)
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2503 *frame_rate_base = strtol(cp+1, &cpp, 10);
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2504 else
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2505 *frame_rate = 0;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2506 }
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2507 else {
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2508 /* Finally we give up and parse it as double */
404
6579fe3ade40 remove spyware from ogg*.c
michael
parents: 371
diff changeset
2509 *frame_rate_base = DEFAULT_FRAME_RATE_BASE; //FIXME use av_d2q()
168
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2510 *frame_rate = (int)(strtod(arg, 0) * (*frame_rate_base) + 0.5);
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2511 }
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2512 if (!*frame_rate || !*frame_rate_base)
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2513 return -1;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2514 else
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2515 return 0;
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2516 }
808dabf5a88e * First round of AV sync fixes.
romansh
parents: 162
diff changeset
2517
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2518 /* Syntax:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2519 * - If not a duration:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2520 * [{YYYY-MM-DD|YYYYMMDD}]{T| }{HH[:MM[:SS[.m...]]][Z]|HH[MM[SS[.m...]]][Z]}
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2521 * Time is localtime unless Z is suffixed to the end. In this case GMT
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2522 * Return the date in micro seconds since 1970
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2523 * - If duration:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2524 * HH[:MM[:SS[.m...]]]
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2525 * S+[.m...]
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2526 */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
2527 int64_t parse_date(const char *datestr, int duration)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2528 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2529 const char *p;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
2530 int64_t t;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2531 struct tm dt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2532 int i;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2533 static const char *date_fmt[] = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2534 "%Y-%m-%d",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2535 "%Y%m%d",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2536 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2537 static const char *time_fmt[] = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2538 "%H:%M:%S",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2539 "%H%M%S",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2540 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2541 const char *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2542 int is_utc, len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2543 char lastch;
477
3fc285cdb791 user specified start time offset
michael
parents: 470
diff changeset
2544 int negative = 0;
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 404
diff changeset
2545
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 404
diff changeset
2546 #undef time
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2547 time_t now = time(0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2548
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2549 len = strlen(datestr);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2550 if (len > 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2551 lastch = datestr[len - 1];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2552 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2553 lastch = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2554 is_utc = (lastch == 'z' || lastch == 'Z');
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2555
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2556 memset(&dt, 0, sizeof(dt));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2557
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2558 p = datestr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2559 q = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2560 if (!duration) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2561 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
2562 q = small_strptime(p, date_fmt[i], &dt);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2563 if (q) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2564 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2565 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2566 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2567
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2568 if (!q) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2569 if (is_utc) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2570 dt = *gmtime(&now);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2571 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2572 dt = *localtime(&now);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2573 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2574 dt.tm_hour = dt.tm_min = dt.tm_sec = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2575 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2576 p = q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2577 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2578
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2579 if (*p == 'T' || *p == 't' || *p == ' ')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2580 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2581
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2582 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
2583 q = small_strptime(p, time_fmt[i], &dt);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2584 if (q) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2585 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2586 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2587 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2588 } else {
477
3fc285cdb791 user specified start time offset
michael
parents: 470
diff changeset
2589 if (p[0] == '-') {
3fc285cdb791 user specified start time offset
michael
parents: 470
diff changeset
2590 negative = 1;
3fc285cdb791 user specified start time offset
michael
parents: 470
diff changeset
2591 ++p;
3fc285cdb791 user specified start time offset
michael
parents: 470
diff changeset
2592 }
230
9f4f4ca9f7b5 simpler strptime - added os_support.[ch] - moved localtime_r to os_support.c
bellard
parents: 229
diff changeset
2593 q = small_strptime(p, time_fmt[0], &dt);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2594 if (!q) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2595 dt.tm_sec = strtol(p, (char **)&q, 10);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2596 dt.tm_min = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2597 dt.tm_hour = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2598 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2599 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2600
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2601 /* Now we have all the fields that we can get */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2602 if (!q) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2603 if (duration)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2604 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2605 else
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
2606 return now * int64_t_C(1000000);
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 if (duration) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2610 t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2611 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2612 dt.tm_isdst = -1; /* unknown */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2613 if (is_utc) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2614 t = mktimegm(&dt);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2615 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2616 t = mktime(&dt);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2617 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2618 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2619
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2620 t *= 1000000;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2621
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2622 if (*q == '.') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2623 int val, n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2624 q++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2625 for (val = 0, n = 100000; n >= 1; n /= 10, q++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2626 if (!isdigit(*q))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2627 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2628 val += n * (*q - '0');
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2629 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2630 t += val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2631 }
477
3fc285cdb791 user specified start time offset
michael
parents: 470
diff changeset
2632 return negative ? -t : t;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2633 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2634
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2635 /* syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done. Return
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2636 1 if found */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2637 int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2638 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2639 const char *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2640 char tag[128], *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2641
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2642 p = info;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2643 if (*p == '?')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2644 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2645 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2646 q = tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2647 while (*p != '\0' && *p != '=' && *p != '&') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2648 if ((q - tag) < sizeof(tag) - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2649 *q++ = *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2650 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2651 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2652 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2653 q = arg;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2654 if (*p == '=') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2655 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2656 while (*p != '&' && *p != '\0') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2657 if ((q - arg) < arg_size - 1) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2658 if (*p == '+')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2659 *q++ = ' ';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2660 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2661 *q++ = *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2662 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2663 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2664 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2665 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2666 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2667 if (!strcmp(tag, tag1))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2668 return 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2669 if (*p != '&')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2670 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2671 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2672 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2673 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2674 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2675
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2676 /* Return in 'buf' the path with '%d' replaced by number. Also handles
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2677 the '%0nd' format where 'n' is the total number of digits and
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2678 '%%'. Return 0 if OK, and -1 if format error */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2679 int get_frame_filename(char *buf, int buf_size,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2680 const char *path, int number)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2681 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2682 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
2683 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
2684 int nd, len, percentd_found;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2685
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2686 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2687 p = path;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2688 percentd_found = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2689 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2690 c = *p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2691 if (c == '\0')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2692 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2693 if (c == '%') {
9
97e61383cb81 * Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents: 7
diff changeset
2694 do {
97e61383cb81 * Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents: 7
diff changeset
2695 nd = 0;
97e61383cb81 * Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents: 7
diff changeset
2696 while (isdigit(*p)) {
97e61383cb81 * Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents: 7
diff changeset
2697 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
2698 }
97e61383cb81 * Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents: 7
diff changeset
2699 c = *p++;
97e61383cb81 * Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents: 7
diff changeset
2700 } while (isdigit(c));
97e61383cb81 * Extend the syntax of a filename for the img reader to allow looping. Thus
philipjsg
parents: 7
diff changeset
2701
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2702 switch(c) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2703 case '%':
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2704 goto addchar;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2705 case 'd':
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2706 if (percentd_found)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2707 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2708 percentd_found = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2709 snprintf(buf1, sizeof(buf1), "%0*d", nd, number);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2710 len = strlen(buf1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2711 if ((q - buf + len) > buf_size - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2712 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2713 memcpy(q, buf1, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2714 q += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2715 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2716 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2717 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2718 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2719 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2720 addchar:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2721 if ((q - buf) < buf_size - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2722 *q++ = c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2723 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2724 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2725 if (!percentd_found)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2726 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2727 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2728 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2729 fail:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2730 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2731 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2732 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2733
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2734 /**
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2735 * Print nice hexa dump of a buffer
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2736 * @param f stream for output
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2737 * @param buf buffer
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2738 * @param size buffer size
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2739 */
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2740 void av_hex_dump(FILE *f, uint8_t *buf, int size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2741 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2742 int len, i, j, c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2743
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2744 for(i=0;i<size;i+=16) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2745 len = size - i;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2746 if (len > 16)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2747 len = 16;
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2748 fprintf(f, "%08x ", i);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2749 for(j=0;j<16;j++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2750 if (j < len)
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2751 fprintf(f, " %02x", buf[i+j]);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2752 else
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2753 fprintf(f, " ");
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2754 }
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2755 fprintf(f, " ");
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2756 for(j=0;j<len;j++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2757 c = buf[i+j];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2758 if (c < ' ' || c > '~')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2759 c = '.';
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2760 fprintf(f, "%c", c);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2761 }
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2762 fprintf(f, "\n");
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2763 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2764 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2765
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2766 /**
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2767 * Print on 'f' a nice dump of a packet
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2768 * @param f stream for output
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2769 * @param pkt packet to dump
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2770 * @param dump_payload true if the payload must be displayed too
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2771 */
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
2772 //FIXME needs to know the time_base
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2773 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
2774 {
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2775 fprintf(f, "stream #%d:\n", pkt->stream_index);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2776 fprintf(f, " keyframe=%d\n", ((pkt->flags & PKT_FLAG_KEY) != 0));
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2777 fprintf(f, " duration=%0.3f\n", (double)pkt->duration / AV_TIME_BASE);
333
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
2778 /* DTS is _always_ valid after av_read_frame() */
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
2779 fprintf(f, " dts=");
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
2780 if (pkt->dts == AV_NOPTS_VALUE)
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
2781 fprintf(f, "N/A");
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
2782 else
e3beadc2ed83 make av_read_frame() return buffered frames at EOF
bellard
parents: 330
diff changeset
2783 fprintf(f, "%0.3f", (double)pkt->dts / AV_TIME_BASE);
303
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2784 /* PTS may be not known if B frames are present */
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2785 fprintf(f, " pts=");
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2786 if (pkt->pts == AV_NOPTS_VALUE)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2787 fprintf(f, "N/A");
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2788 else
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2789 fprintf(f, "%0.3f", (double)pkt->pts / AV_TIME_BASE);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2790 fprintf(f, "\n");
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2791 fprintf(f, " size=%d\n", pkt->size);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2792 if (dump_payload)
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2793 av_hex_dump(f, pkt->data, pkt->size);
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2794 }
2833c2311b66 initial av_read_frame() and av_seek_frame() support
bellard
parents: 293
diff changeset
2795
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2796 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
2797 char *authorization, int authorization_size,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2798 char *hostname, int hostname_size,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2799 int *port_ptr,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2800 char *path, int path_size,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2801 const char *url)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2802 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2803 const char *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2804 char *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2805 int port;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2806
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2807 port = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2808
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2809 p = url;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2810 q = proto;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2811 while (*p != ':' && *p != '\0') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2812 if ((q - proto) < proto_size - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2813 *q++ = *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2814 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2815 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2816 if (proto_size > 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2817 *q = '\0';
511
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2818 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
2819 authorization[0] = '\0';
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2820 if (*p == '\0') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2821 if (proto_size > 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2822 proto[0] = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2823 if (hostname_size > 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2824 hostname[0] = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2825 p = url;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2826 } else {
511
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2827 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
2828
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2829 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2830 if (*p == '/')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2831 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2832 if (*p == '/')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2833 p++;
511
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2834 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
2835 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
2836 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
2837
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2838 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
2839
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2840 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
2841 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
2842 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
2843 *q = '\0';
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2844 q = hostname;
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2845 at = NULL;
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2846 } 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
2847 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
2848 *q++ = *p;
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2849 } else {
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2850 if ((q - authorization) < authorization_size - 1)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2851 *q++ = *p;
511
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 502
diff changeset
2852 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2853 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2854 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2855 if (hostname_size > 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2856 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2857 if (*p == ':') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2858 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2859 port = strtoul(p, (char **)&p, 10);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2860 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2861 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2862 if (port_ptr)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2863 *port_ptr = port;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2864 pstrcpy(path, path_size, p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2865 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2866
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2867 /**
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2868 * Set the pts for a given stream
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2869 * @param s stream
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2870 * @param pts_wrap_bits number of bits effectively used by the pts
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2871 * (used for wrap control, 33 is the value for MPEG)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2872 * @param pts_num numerator to convert to seconds (MPEG: 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2873 * @param pts_den denominator to convert to seconds (MPEG: 90000)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2874 */
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 453
diff changeset
2875 void av_set_pts_info(AVStream *s, int pts_wrap_bits,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2876 int pts_num, int pts_den)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2877 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2878 s->pts_wrap_bits = pts_wrap_bits;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 453
diff changeset
2879 s->time_base.num = pts_num;
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 453
diff changeset
2880 s->time_base.den = pts_den;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2881 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2882
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2883 /* fraction handling */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2884
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2885 /**
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2886 * f = val + (num / den) + 0.5. 'num' is normalized so that it is such
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2887 * as 0 <= num < den.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2888 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2889 * @param f fractional number
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2890 * @param val integer value
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2891 * @param num must be >= 0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2892 * @param den must be >= 1
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2893 */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
2894 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
2895 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2896 num += (den >> 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2897 if (num >= den) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2898 val += num / den;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2899 num = num % den;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2900 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2901 f->val = val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2902 f->num = num;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2903 f->den = den;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2904 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2905
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2906 /* set f to (val + 0.5) */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
2907 void av_frac_set(AVFrac *f, int64_t val)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2908 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2909 f->val = val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2910 f->num = f->den >> 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2911 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2912
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2913 /**
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2914 * Fractionnal addition to f: f = f + (incr / f->den)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2915 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2916 * @param f fractional number
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2917 * @param incr increment, can be positive or negative
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2918 */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
2919 void av_frac_add(AVFrac *f, int64_t incr)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2920 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
2921 int64_t num, den;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2922
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2923 num = f->num + incr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2924 den = f->den;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2925 if (num < 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2926 f->val += num / den;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2927 num = num % den;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2928 if (num < 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2929 num += den;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2930 f->val--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2931 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2932 } else if (num >= den) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2933 f->val += num / den;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2934 num = num % den;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2935 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2936 f->num = num;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2937 }
20
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2938
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2939 /**
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2940 * register a new image format
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2941 * @param img_fmt Image format descriptor
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2942 */
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2943 void av_register_image_format(AVImageFormat *img_fmt)
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2944 {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2945 AVImageFormat **p;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2946
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2947 p = &first_image_format;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2948 while (*p != NULL) p = &(*p)->next;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2949 *p = img_fmt;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2950 img_fmt->next = NULL;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2951 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2952
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2953 /* guess image format */
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2954 AVImageFormat *av_probe_image_format(AVProbeData *pd)
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2955 {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2956 AVImageFormat *fmt1, *fmt;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2957 int score, score_max;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2958
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2959 fmt = NULL;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2960 score_max = 0;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2961 for(fmt1 = first_image_format; fmt1 != NULL; fmt1 = fmt1->next) {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2962 if (fmt1->img_probe) {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2963 score = fmt1->img_probe(pd);
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2964 if (score > score_max) {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2965 score_max = score;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2966 fmt = fmt1;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2967 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2968 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2969 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2970 return fmt;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2971 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2972
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2973 AVImageFormat *guess_image_format(const char *filename)
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2974 {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2975 AVImageFormat *fmt1;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2976
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2977 for(fmt1 = first_image_format; fmt1 != NULL; fmt1 = fmt1->next) {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2978 if (fmt1->extensions && match_ext(filename, fmt1->extensions))
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2979 return fmt1;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2980 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2981 return NULL;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2982 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2983
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2984 /**
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2985 * Read an image from a stream.
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2986 * @param gb byte stream containing the image
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2987 * @param fmt image format, NULL if probing is required
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2988 */
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2989 int av_read_image(ByteIOContext *pb, const char *filename,
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2990 AVImageFormat *fmt,
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2991 int (*alloc_cb)(void *, AVImageInfo *info), void *opaque)
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2992 {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2993 char buf[PROBE_BUF_SIZE];
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2994 AVProbeData probe_data, *pd = &probe_data;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2995 offset_t pos;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2996 int ret;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2997
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
2998 if (!fmt) {
64
b0e0eb595e29 * static,const,compiler warning cleanup
kabi
parents: 53
diff changeset
2999 pd->filename = filename;
20
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3000 pd->buf = buf;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3001 pos = url_ftell(pb);
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3002 pd->buf_size = get_buffer(pb, buf, PROBE_BUF_SIZE);
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3003 url_fseek(pb, pos, SEEK_SET);
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3004 fmt = av_probe_image_format(pd);
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3005 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3006 if (!fmt)
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3007 return AVERROR_NOFMT;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3008 ret = fmt->img_read(pb, alloc_cb, opaque);
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3009 return ret;
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3010 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3011
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3012 /**
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3013 * Write an image to a stream.
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3014 * @param pb byte stream for the image output
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3015 * @param fmt image format
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3016 * @param img image data and informations
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3017 */
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3018 int av_write_image(ByteIOContext *pb, AVImageFormat *fmt, AVImageInfo *img)
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3019 {
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3020 return fmt->img_write(pb, img);
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3021 }
3d52de18ecc3 added still image support
bellard
parents: 11
diff changeset
3022