Mercurial > libavformat.hg
annotate avidec.c @ 1345:0a74030d9dd7 libavformat
Fix wrong ASF duration of generated files
Patch by Brian Brice % bbrice AH newtek.com %
Original thread:
Message-ID: <451DA316.6060001@newtek.com>
Date: Fri, 29 Sep 2006 17:49:58 -0500
Subject: [Ffmpeg-devel] [PATCH] ASF Duration
author | gpoirier |
---|---|
date | Sun, 01 Oct 2006 17:05:25 +0000 |
parents | 29fba975df47 |
children | 0899bfe4105c |
rev | line source |
---|---|
0 | 1 /* |
2 * AVI decoder. | |
3 * Copyright (c) 2001 Fabrice Bellard. | |
4 * | |
5 * This library is free software; you can redistribute it and/or | |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
9 * | |
10 * This library is distributed in the hope that it will be useful, | |
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 * Lesser General Public License for more details. | |
14 * | |
15 * You should have received a copy of the GNU Lesser General Public | |
16 * License along with this library; if not, write to the Free Software | |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
887
diff
changeset
|
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 18 */ |
19 #include "avformat.h" | |
20 #include "avi.h" | |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
21 #include "dv.h" |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
22 #include "riff.h" |
0 | 23 |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
24 #undef NDEBUG |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
25 #include <assert.h> |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
26 |
0 | 27 //#define DEBUG |
311 | 28 //#define DEBUG_SEEK |
0 | 29 |
311 | 30 typedef struct AVIStream { |
701 | 31 int64_t frame_offset; /* current frame (video) or byte (audio) counter |
311 | 32 (used to compute the pts) */ |
701 | 33 int remaining; |
34 int packet_size; | |
35 | |
311 | 36 int scale; |
885 | 37 int rate; |
982 | 38 int sample_size; /* size of one sample (or packet) (in the rate/scale sense) in bytes */ |
885 | 39 |
977 | 40 int64_t cum_len; /* temporary storage (used during seek) */ |
885 | 41 |
519 | 42 int prefix; ///< normally 'd'<<8 + 'c' or 'w'<<8 + 'b' |
43 int prefix_count; | |
311 | 44 } AVIStream; |
0 | 45 |
46 typedef struct { | |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
47 int64_t riff_end; |
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
48 int64_t movi_end; |
0 | 49 offset_t movi_list; |
311 | 50 int index_loaded; |
510 | 51 int is_odml; |
701 | 52 int non_interleaved; |
53 int stream_index; | |
296
252946de6d3f
* DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents:
262
diff
changeset
|
54 DVDemuxContext* dv_demux; |
0 | 55 } AVIContext; |
56 | |
469
6a4cc19e8d9b
exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents:
466
diff
changeset
|
57 static int avi_load_index(AVFormatContext *s); |
979 | 58 static int guess_ni_flag(AVFormatContext *s); |
469
6a4cc19e8d9b
exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents:
466
diff
changeset
|
59 |
0 | 60 #ifdef DEBUG |
61 static void print_tag(const char *str, unsigned int tag, int size) | |
62 { | |
63 printf("%s: tag=%c%c%c%c size=0x%x\n", | |
64 str, tag & 0xff, | |
65 (tag >> 8) & 0xff, | |
66 (tag >> 16) & 0xff, | |
67 (tag >> 24) & 0xff, | |
68 size); | |
69 } | |
70 #endif | |
71 | |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
72 static int get_riff(AVIContext *avi, ByteIOContext *pb) |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
73 { |
885 | 74 uint32_t tag; |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
75 /* check RIFF header */ |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
76 tag = get_le32(pb); |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
77 |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
78 if (tag != MKTAG('R', 'I', 'F', 'F')) |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
79 return -1; |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
80 avi->riff_end = get_le32(pb); /* RIFF chunk size */ |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
81 avi->riff_end += url_ftell(pb); /* RIFF chunk end */ |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
82 tag = get_le32(pb); |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
83 if (tag != MKTAG('A', 'V', 'I', ' ') && tag != MKTAG('A', 'V', 'I', 'X')) |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
84 return -1; |
885 | 85 |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
86 return 0; |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
87 } |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
88 |
977 | 89 static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){ |
984
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
90 AVIContext *avi = s->priv_data; |
977 | 91 ByteIOContext *pb = &s->pb; |
92 int longs_pre_entry= get_le16(pb); | |
93 int index_sub_type = get_byte(pb); | |
94 int index_type = get_byte(pb); | |
95 int entries_in_use = get_le32(pb); | |
96 int chunk_id = get_le32(pb); | |
97 int64_t base = get_le64(pb); | |
98 int stream_id= 10*((chunk_id&0xFF) - '0') + (((chunk_id>>8)&0xFF) - '0'); | |
99 AVStream *st; | |
100 AVIStream *ast; | |
101 int i; | |
984
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
102 int64_t last_pos= -1; |
1277 | 103 int64_t filesize= url_fsize(&s->pb); |
977 | 104 |
1277 | 105 #ifdef DEBUG_SEEK |
106 av_log(s, AV_LOG_ERROR, "longs_pre_entry:%d index_type:%d entries_in_use:%d chunk_id:%X base:%16LX\n", | |
107 longs_pre_entry,index_type, entries_in_use, chunk_id, base); | |
108 #endif | |
977 | 109 |
110 if(stream_id > s->nb_streams || stream_id < 0) | |
111 return -1; | |
112 st= s->streams[stream_id]; | |
113 ast = st->priv_data; | |
114 | |
115 if(index_sub_type) | |
116 return -1; | |
117 | |
118 get_le32(pb); | |
119 | |
120 if(index_type && longs_pre_entry != 2) | |
121 return -1; | |
122 if(index_type>1) | |
123 return -1; | |
124 | |
1277 | 125 if(filesize > 0 && base >= filesize){ |
126 av_log(s, AV_LOG_ERROR, "ODML index invalid\n"); | |
127 if(base>>32 == (base & 0xFFFFFFFF) && (base & 0xFFFFFFFF) < filesize && filesize <= 0xFFFFFFFF) | |
128 base &= 0xFFFFFFFF; | |
129 else | |
130 return -1; | |
131 } | |
132 | |
977 | 133 for(i=0; i<entries_in_use; i++){ |
134 if(index_type){ | |
979 | 135 int64_t pos= get_le32(pb) + base - 8; |
977 | 136 int len = get_le32(pb); |
979 | 137 int key= len >= 0; |
138 len &= 0x7FFFFFFF; | |
977 | 139 |
1277 | 140 #ifdef DEBUG_SEEK |
141 av_log(s, AV_LOG_ERROR, "pos:%Ld, len:%X\n", pos, len); | |
142 #endif | |
984
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
143 if(last_pos == pos || pos == base - 8) |
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
144 avi->non_interleaved= 1; |
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
145 else |
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
146 av_add_index_entry(st, pos, ast->cum_len, len, 0, key ? AVINDEX_KEYFRAME : 0); |
977 | 147 |
148 if(ast->sample_size) | |
149 ast->cum_len += len / ast->sample_size; | |
150 else | |
151 ast->cum_len ++; | |
984
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
152 last_pos= pos; |
977 | 153 }else{ |
1144 | 154 int64_t offset, pos; |
155 int duration; | |
156 offset = get_le64(pb); | |
157 get_le32(pb); /* size */ | |
158 duration = get_le32(pb); | |
159 pos = url_ftell(pb); | |
977 | 160 |
161 url_fseek(pb, offset+8, SEEK_SET); | |
162 read_braindead_odml_indx(s, frame_num); | |
163 frame_num += duration; | |
164 | |
165 url_fseek(pb, pos, SEEK_SET); | |
166 } | |
167 } | |
1277 | 168 avi->index_loaded=1; |
977 | 169 return 0; |
170 } | |
171 | |
983
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
172 static void clean_index(AVFormatContext *s){ |
1277 | 173 int i; |
174 int64_t j; | |
983
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
175 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
176 for(i=0; i<s->nb_streams; i++){ |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
177 AVStream *st = s->streams[i]; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
178 AVIStream *ast = st->priv_data; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
179 int n= st->nb_index_entries; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
180 int max= ast->sample_size; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
181 int64_t pos, size, ts; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
182 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
183 if(n != 1 || ast->sample_size==0) |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
184 continue; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
185 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
186 while(max < 1024) max+=max; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
187 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
188 pos= st->index_entries[0].pos; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
189 size= st->index_entries[0].size; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
190 ts= st->index_entries[0].timestamp; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
191 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
192 for(j=0; j<size; j+=max){ |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
193 av_add_index_entry(st, pos+j, ts + j/ast->sample_size, FFMIN(max, size-j), 0, AVINDEX_KEYFRAME); |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
194 } |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
195 } |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
196 } |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
197 |
1256 | 198 static int avi_read_tag(ByteIOContext *pb, char *buf, int maxlen, unsigned int size) |
199 { | |
200 offset_t i = url_ftell(pb); | |
201 size += (size & 1); | |
202 get_strz(pb, buf, maxlen); | |
203 url_fseek(pb, i+size, SEEK_SET); | |
204 return 0; | |
205 } | |
206 | |
0 | 207 static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) |
208 { | |
209 AVIContext *avi = s->priv_data; | |
210 ByteIOContext *pb = &s->pb; | |
98
cae6ddfadf51
AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
92
diff
changeset
|
211 uint32_t tag, tag1, handler; |
703 | 212 int codec_type, stream_index, frame_period, bit_rate; |
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
149
diff
changeset
|
213 unsigned int size, nb_frames; |
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
149
diff
changeset
|
214 int i, n; |
0 | 215 AVStream *st; |
1144 | 216 AVIStream *ast = NULL; |
227 | 217 int xan_video = 0; /* hack to support Xan A/V */ |
1298
29fba975df47
Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents:
1296
diff
changeset
|
218 char str_track[4]; |
0 | 219 |
701 | 220 avi->stream_index= -1; |
885 | 221 |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
222 if (get_riff(avi, pb) < 0) |
0 | 223 return -1; |
224 | |
225 /* first list tag */ | |
226 stream_index = -1; | |
227 codec_type = -1; | |
228 frame_period = 0; | |
229 for(;;) { | |
230 if (url_feof(pb)) | |
231 goto fail; | |
232 tag = get_le32(pb); | |
233 size = get_le32(pb); | |
234 #ifdef DEBUG | |
235 print_tag("tag", tag, size); | |
236 #endif | |
237 | |
238 switch(tag) { | |
239 case MKTAG('L', 'I', 'S', 'T'): | |
240 /* ignored, except when start of video packets */ | |
241 tag1 = get_le32(pb); | |
242 #ifdef DEBUG | |
243 print_tag("list", tag1, 0); | |
244 #endif | |
245 if (tag1 == MKTAG('m', 'o', 'v', 'i')) { | |
311 | 246 avi->movi_list = url_ftell(pb) - 4; |
1286 | 247 if(size) avi->movi_end = avi->movi_list + size + (size & 1); |
764
cdb845a57ae4
drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents:
743
diff
changeset
|
248 else avi->movi_end = url_fsize(pb); |
0 | 249 #ifdef DEBUG |
250 printf("movi end=%Lx\n", avi->movi_end); | |
251 #endif | |
252 goto end_of_header; | |
253 } | |
254 break; | |
510 | 255 case MKTAG('d', 'm', 'l', 'h'): |
887 | 256 avi->is_odml = 1; |
257 url_fskip(pb, size + (size & 1)); | |
258 break; | |
0 | 259 case MKTAG('a', 'v', 'i', 'h'): |
887 | 260 /* avi header */ |
0 | 261 /* using frame_period is bad idea */ |
262 frame_period = get_le32(pb); | |
263 bit_rate = get_le32(pb) * 8; | |
981
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
264 get_le32(pb); |
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
265 avi->non_interleaved |= get_le32(pb) & AVIF_MUSTUSEINDEX; |
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
266 |
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
267 url_fskip(pb, 2 * 4); |
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
149
diff
changeset
|
268 n = get_le32(pb); |
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
149
diff
changeset
|
269 for(i=0;i<n;i++) { |
311 | 270 AVIStream *ast; |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
271 st = av_new_stream(s, i); |
0 | 272 if (!st) |
273 goto fail; | |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
457
diff
changeset
|
274 |
311 | 275 ast = av_mallocz(sizeof(AVIStream)); |
276 if (!ast) | |
277 goto fail; | |
278 st->priv_data = ast; | |
887 | 279 } |
0 | 280 url_fskip(pb, size - 7 * 4); |
281 break; | |
282 case MKTAG('s', 't', 'r', 'h'): | |
283 /* stream header */ | |
284 stream_index++; | |
285 tag1 = get_le32(pb); | |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
286 handler = get_le32(pb); /* codec tag */ |
471 | 287 #ifdef DEBUG |
288 print_tag("strh", tag1, -1); | |
289 #endif | |
703 | 290 if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){ |
885 | 291 /* |
887 | 292 * After some consideration -- I don't think we |
293 * have to support anything but DV in a type1 AVIs. | |
294 */ | |
295 if (s->nb_streams != 1) | |
296 goto fail; | |
885 | 297 |
887 | 298 if (handler != MKTAG('d', 'v', 's', 'd') && |
299 handler != MKTAG('d', 'v', 'h', 'd') && | |
300 handler != MKTAG('d', 'v', 's', 'l')) | |
301 goto fail; | |
885 | 302 |
887 | 303 ast = s->streams[0]->priv_data; |
304 av_freep(&s->streams[0]->codec->extradata); | |
305 av_freep(&s->streams[0]); | |
306 s->nb_streams = 0; | |
307 avi->dv_demux = dv_init_demux(s); | |
308 if (!avi->dv_demux) | |
309 goto fail; | |
310 s->streams[0]->priv_data = ast; | |
311 url_fskip(pb, 3 * 4); | |
312 ast->scale = get_le32(pb); | |
313 ast->rate = get_le32(pb); | |
314 stream_index = s->nb_streams - 1; | |
315 url_fskip(pb, size - 7*4); | |
703 | 316 break; |
317 } | |
318 | |
319 if (stream_index >= s->nb_streams) { | |
320 url_fskip(pb, size - 8); | |
1051 | 321 /* ignore padding stream */ |
322 if (tag1 == MKTAG('p', 'a', 'd', 's')) | |
323 stream_index--; | |
703 | 324 break; |
885 | 325 } |
703 | 326 st = s->streams[stream_index]; |
327 ast = st->priv_data; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
328 st->codec->stream_codec_tag= handler; |
703 | 329 |
330 get_le32(pb); /* flags */ | |
331 get_le16(pb); /* priority */ | |
332 get_le16(pb); /* language */ | |
333 get_le32(pb); /* initial frame */ | |
334 ast->scale = get_le32(pb); | |
335 ast->rate = get_le32(pb); | |
336 if(ast->scale && ast->rate){ | |
337 }else if(frame_period){ | |
338 ast->rate = 1000000; | |
339 ast->scale = frame_period; | |
340 }else{ | |
341 ast->rate = 25; | |
342 ast->scale = 1; | |
343 } | |
344 av_set_pts_info(st, 64, ast->scale, ast->rate); | |
885 | 345 |
989 | 346 ast->cum_len=get_le32(pb); /* start */ |
703 | 347 nb_frames = get_le32(pb); |
348 | |
349 st->start_time = 0; | |
743 | 350 st->duration = nb_frames; |
703 | 351 get_le32(pb); /* buffer size */ |
352 get_le32(pb); /* quality */ | |
353 ast->sample_size = get_le32(pb); /* sample ssize */ | |
354 // av_log(NULL, AV_LOG_DEBUG, "%d %d %d %d\n", ast->rate, ast->scale, ast->start, ast->sample_size); | |
355 | |
356 switch(tag1) { | |
887 | 357 case MKTAG('v', 'i', 'd', 's'): |
0 | 358 codec_type = CODEC_TYPE_VIDEO; |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
359 |
703 | 360 ast->sample_size = 0; |
0 | 361 break; |
362 case MKTAG('a', 'u', 'd', 's'): | |
703 | 363 codec_type = CODEC_TYPE_AUDIO; |
73
d40ddc73858a
reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents:
65
diff
changeset
|
364 break; |
471 | 365 case MKTAG('t', 'x', 't', 's'): |
885 | 366 //FIXME |
471 | 367 codec_type = CODEC_TYPE_DATA; //CODEC_TYPE_SUB ? FIXME |
368 break; | |
534 | 369 case MKTAG('p', 'a', 'd', 's'): |
370 codec_type = CODEC_TYPE_UNKNOWN; | |
371 stream_index--; | |
372 break; | |
73
d40ddc73858a
reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents:
65
diff
changeset
|
373 default: |
534 | 374 av_log(s, AV_LOG_ERROR, "unknown stream type %X\n", tag1); |
73
d40ddc73858a
reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents:
65
diff
changeset
|
375 goto fail; |
0 | 376 } |
989 | 377 ast->frame_offset= ast->cum_len * FFMAX(ast->sample_size, 1); |
703 | 378 url_fskip(pb, size - 12 * 4); |
0 | 379 break; |
380 case MKTAG('s', 't', 'r', 'f'): | |
381 /* stream header */ | |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
382 if (stream_index >= s->nb_streams || avi->dv_demux) { |
0 | 383 url_fskip(pb, size); |
384 } else { | |
385 st = s->streams[stream_index]; | |
386 switch(codec_type) { | |
387 case CODEC_TYPE_VIDEO: | |
388 get_le32(pb); /* size */ | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
389 st->codec->width = get_le32(pb); |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
390 st->codec->height = get_le32(pb); |
0 | 391 get_le16(pb); /* panes */ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
392 st->codec->bits_per_sample= get_le16(pb); /* depth */ |
0 | 393 tag1 = get_le32(pb); |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
394 get_le32(pb); /* ImageSize */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
395 get_le32(pb); /* XPelsPerMeter */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
396 get_le32(pb); /* YPelsPerMeter */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
397 get_le32(pb); /* ClrUsed */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
398 get_le32(pb); /* ClrImportant */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
399 |
639 | 400 if(size > 10*4 && size<(1<<30)){ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
401 st->codec->extradata_size= size - 10*4; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
402 st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
403 get_buffer(pb, st->codec->extradata, st->codec->extradata_size); |
639 | 404 } |
885 | 405 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
406 if(st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly |
76 | 407 get_byte(pb); |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
408 |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
409 /* Extract palette from extradata if bpp <= 8 */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
410 /* This code assumes that extradata contains only palette */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
411 /* This is true for all paletted codecs implemented in ffmpeg */ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
412 if (st->codec->extradata_size && (st->codec->bits_per_sample <= 8)) { |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
413 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
414 #ifdef WORDS_BIGENDIAN |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
415 for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++) |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
416 st->codec->palctrl->palette[i] = bswap_32(((uint32_t*)st->codec->extradata)[i]); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
417 #else |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
418 memcpy(st->codec->palctrl->palette, st->codec->extradata, |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
419 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
420 #endif |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
421 st->codec->palctrl->palette_changed = 1; |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
422 } |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
423 |
0 | 424 #ifdef DEBUG |
425 print_tag("video", tag1, 0); | |
426 #endif | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
427 st->codec->codec_type = CODEC_TYPE_VIDEO; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
428 st->codec->codec_tag = tag1; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
429 st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1); |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
430 if (st->codec->codec_id == CODEC_ID_XAN_WC4) |
227 | 431 xan_video = 1; |
842 | 432 st->need_parsing = 2; //only parse headers dont do slower repacketization, this is needed to get the pict type which is needed for generating correct pts |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
433 // url_fskip(pb, size - 5 * 4); |
0 | 434 break; |
73
d40ddc73858a
reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents:
65
diff
changeset
|
435 case CODEC_TYPE_AUDIO: |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
436 get_wav_header(pb, st->codec, size); |
988 | 437 if(ast->sample_size && st->codec->block_align && ast->sample_size % st->codec->block_align) |
438 av_log(s, AV_LOG_DEBUG, "invalid sample size or block align detected\n"); | |
13
8a5285a0ca2f
Fix for odd strf tag in Stargate SG-1 - 3x18 - Shades of Grey.avi
mmu_man
parents:
5
diff
changeset
|
439 if (size%2) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */ |
8a5285a0ca2f
Fix for odd strf tag in Stargate SG-1 - 3x18 - Shades of Grey.avi
mmu_man
parents:
5
diff
changeset
|
440 url_fskip(pb, 1); |
227 | 441 /* special case time: To support Xan DPCM, hardcode |
442 * the format if Xxan is the video codec */ | |
311 | 443 st->need_parsing = 1; |
444 /* force parsing as several audio frames can be in | |
445 one packet */ | |
227 | 446 if (xan_video) |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
447 st->codec->codec_id = CODEC_ID_XAN_DPCM; |
0 | 448 break; |
449 default: | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
450 st->codec->codec_type = CODEC_TYPE_DATA; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
451 st->codec->codec_id= CODEC_ID_NONE; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
452 st->codec->codec_tag= 0; |
0 | 453 url_fskip(pb, size); |
454 break; | |
455 } | |
456 } | |
457 break; | |
977 | 458 case MKTAG('i', 'n', 'd', 'x'): |
459 i= url_ftell(pb); | |
1294
12398b868e18
ignore index parameter to ignore the ODML index in avi
michael
parents:
1286
diff
changeset
|
460 if(!url_is_streamed(pb) && !(s->flags & AVFMT_FLAG_IGNIDX)){ |
1115 | 461 read_braindead_odml_indx(s, 0); |
462 } | |
977 | 463 url_fseek(pb, i+size, SEEK_SET); |
464 break; | |
1256 | 465 case MKTAG('I', 'N', 'A', 'M'): |
466 avi_read_tag(pb, s->title, sizeof(s->title), size); | |
467 break; | |
468 case MKTAG('I', 'A', 'R', 'T'): | |
469 avi_read_tag(pb, s->author, sizeof(s->author), size); | |
470 break; | |
471 case MKTAG('I', 'C', 'O', 'P'): | |
472 avi_read_tag(pb, s->copyright, sizeof(s->copyright), size); | |
473 break; | |
474 case MKTAG('I', 'C', 'M', 'T'): | |
475 avi_read_tag(pb, s->comment, sizeof(s->comment), size); | |
476 break; | |
477 case MKTAG('I', 'G', 'N', 'R'): | |
478 avi_read_tag(pb, s->genre, sizeof(s->genre), size); | |
479 break; | |
1296 | 480 case MKTAG('I', 'P', 'R', 'D'): |
481 avi_read_tag(pb, s->album, sizeof(s->album), size); | |
482 break; | |
1298
29fba975df47
Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents:
1296
diff
changeset
|
483 case MKTAG('I', 'P', 'R', 'T'): |
29fba975df47
Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents:
1296
diff
changeset
|
484 avi_read_tag(pb, str_track, sizeof(str_track), size); |
29fba975df47
Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents:
1296
diff
changeset
|
485 sscanf(str_track, "%d", &s->track); |
29fba975df47
Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents:
1296
diff
changeset
|
486 break; |
0 | 487 default: |
488 /* skip tag */ | |
489 size += (size & 1); | |
490 url_fskip(pb, size); | |
491 break; | |
492 } | |
493 } | |
494 end_of_header: | |
495 /* check stream number */ | |
496 if (stream_index != s->nb_streams - 1) { | |
497 fail: | |
498 for(i=0;i<s->nb_streams;i++) { | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
499 av_freep(&s->streams[i]->codec->extradata); |
0 | 500 av_freep(&s->streams[i]); |
501 } | |
502 return -1; | |
503 } | |
504 | |
1115 | 505 if(!avi->index_loaded && !url_is_streamed(pb)) |
977 | 506 avi_load_index(s); |
469
6a4cc19e8d9b
exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents:
466
diff
changeset
|
507 avi->index_loaded = 1; |
979 | 508 avi->non_interleaved |= guess_ni_flag(s); |
983
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
509 if(avi->non_interleaved) |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
510 clean_index(s); |
885 | 511 |
0 | 512 return 0; |
513 } | |
514 | |
515 static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) | |
516 { | |
517 AVIContext *avi = s->priv_data; | |
518 ByteIOContext *pb = &s->pb; | |
510 | 519 int n, d[8], size; |
569 | 520 offset_t i, sync; |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
521 void* dstr; |
885 | 522 |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
523 if (avi->dv_demux) { |
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
524 size = dv_get_packet(avi->dv_demux, pkt); |
887 | 525 if (size >= 0) |
526 return size; | |
149 | 527 } |
885 | 528 |
701 | 529 if(avi->non_interleaved){ |
851
62e66722e9bb
Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents:
842
diff
changeset
|
530 int best_stream_index = 0; |
701 | 531 AVStream *best_st= NULL; |
532 AVIStream *best_ast; | |
533 int64_t best_ts= INT64_MAX; | |
534 int i; | |
885 | 535 |
701 | 536 for(i=0; i<s->nb_streams; i++){ |
537 AVStream *st = s->streams[i]; | |
538 AVIStream *ast = st->priv_data; | |
539 int64_t ts= ast->frame_offset; | |
569 | 540 |
701 | 541 if(ast->sample_size) |
542 ts /= ast->sample_size; | |
543 ts= av_rescale(ts, AV_TIME_BASE * (int64_t)st->time_base.num, st->time_base.den); | |
544 | |
545 // av_log(NULL, AV_LOG_DEBUG, "%Ld %d/%d %Ld\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset); | |
546 if(ts < best_ts){ | |
547 best_ts= ts; | |
548 best_st= st; | |
549 best_stream_index= i; | |
550 } | |
551 } | |
552 best_ast = best_st->priv_data; | |
553 best_ts= av_rescale(best_ts, best_st->time_base.den, AV_TIME_BASE * (int64_t)best_st->time_base.num); //FIXME a little ugly | |
554 if(best_ast->remaining) | |
555 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD); | |
556 else | |
557 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY); | |
558 | |
559 // av_log(NULL, AV_LOG_DEBUG, "%d\n", i); | |
560 if(i>=0){ | |
561 int64_t pos= best_st->index_entries[i].pos; | |
980 | 562 pos += best_ast->packet_size - best_ast->remaining; |
981
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
563 url_fseek(&s->pb, pos + 8, SEEK_SET); |
701 | 564 // av_log(NULL, AV_LOG_DEBUG, "pos=%Ld\n", pos); |
885 | 565 |
982 | 566 assert(best_ast->remaining <= best_ast->packet_size); |
567 | |
981
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
568 avi->stream_index= best_stream_index; |
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
569 if(!best_ast->remaining) |
982 | 570 best_ast->packet_size= |
981
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
571 best_ast->remaining= best_st->index_entries[i].size; |
701 | 572 } |
573 } | |
885 | 574 |
569 | 575 resync: |
701 | 576 if(avi->stream_index >= 0){ |
577 AVStream *st= s->streams[ avi->stream_index ]; | |
578 AVIStream *ast= st->priv_data; | |
579 int size; | |
885 | 580 |
988 | 581 if(ast->sample_size <= 1) // minorityreport.AVI block_align=1024 sample_size=1 IMA-ADPCM |
701 | 582 size= INT_MAX; |
885 | 583 else if(ast->sample_size < 32) |
701 | 584 size= 64*ast->sample_size; |
585 else | |
586 size= ast->sample_size; | |
587 | |
588 if(size > ast->remaining) | |
589 size= ast->remaining; | |
775 | 590 av_get_packet(pb, pkt, size); |
885 | 591 |
701 | 592 if (avi->dv_demux) { |
593 dstr = pkt->destruct; | |
594 size = dv_produce_packet(avi->dv_demux, pkt, | |
595 pkt->data, pkt->size); | |
596 pkt->destruct = dstr; | |
597 pkt->flags |= PKT_FLAG_KEY; | |
598 } else { | |
599 /* XXX: how to handle B frames in avi ? */ | |
600 pkt->dts = ast->frame_offset; | |
601 // pkt->dts += ast->start; | |
602 if(ast->sample_size) | |
603 pkt->dts /= ast->sample_size; | |
982 | 604 //av_log(NULL, AV_LOG_DEBUG, "dts:%Ld offset:%Ld %d/%d smpl_siz:%d base:%d st:%d size:%d\n", pkt->dts, ast->frame_offset, ast->scale, ast->rate, ast->sample_size, AV_TIME_BASE, avi->stream_index, size); |
701 | 605 pkt->stream_index = avi->stream_index; |
606 | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
607 if (st->codec->codec_type == CODEC_TYPE_VIDEO) { |
701 | 608 if(st->index_entries){ |
609 AVIndexEntry *e; | |
610 int index; | |
611 | |
612 index= av_index_search_timestamp(st, pkt->dts, 0); | |
613 e= &st->index_entries[index]; | |
885 | 614 |
718 | 615 if(index >= 0 && e->timestamp == ast->frame_offset){ |
701 | 616 if (e->flags & AVINDEX_KEYFRAME) |
617 pkt->flags |= PKT_FLAG_KEY; | |
618 } | |
619 } else { | |
620 /* if no index, better to say that all frames | |
621 are key frames */ | |
622 pkt->flags |= PKT_FLAG_KEY; | |
623 } | |
624 } else { | |
885 | 625 pkt->flags |= PKT_FLAG_KEY; |
701 | 626 } |
627 if(ast->sample_size) | |
628 ast->frame_offset += pkt->size; | |
629 else | |
630 ast->frame_offset++; | |
631 } | |
632 ast->remaining -= size; | |
633 if(!ast->remaining){ | |
634 avi->stream_index= -1; | |
635 ast->packet_size= 0; | |
636 if (size & 1) { | |
637 get_byte(pb); | |
638 size++; | |
639 } | |
640 } | |
641 | |
642 return size; | |
643 } | |
644 | |
569 | 645 memset(d, -1, sizeof(int)*8); |
646 for(i=sync=url_ftell(pb); !url_feof(pb); i++) { | |
82 | 647 int j; |
648 | |
887 | 649 if (i >= avi->movi_end) { |
650 if (avi->is_odml) { | |
651 url_fskip(pb, avi->riff_end - i); | |
652 avi->riff_end = avi->movi_end = url_fsize(pb); | |
653 } else | |
654 break; | |
655 } | |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
656 |
82 | 657 for(j=0; j<7; j++) |
658 d[j]= d[j+1]; | |
659 d[7]= get_byte(pb); | |
885 | 660 |
82 | 661 size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24); |
885 | 662 |
519 | 663 if( d[2] >= '0' && d[2] <= '9' |
664 && d[3] >= '0' && d[3] <= '9'){ | |
665 n= (d[2] - '0') * 10 + (d[3] - '0'); | |
666 }else{ | |
667 n= 100; //invalid stream id | |
668 } | |
669 //av_log(NULL, AV_LOG_DEBUG, "%X %X %X %X %X %X %X %X %lld %d %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n); | |
670 if(i + size > avi->movi_end || d[0]<0) | |
671 continue; | |
885 | 672 |
82 | 673 //parse ix## |
519 | 674 if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams) |
887 | 675 //parse JUNK |
519 | 676 ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K')){ |
82 | 677 url_fskip(pb, size); |
519 | 678 //av_log(NULL, AV_LOG_DEBUG, "SKIP\n"); |
569 | 679 goto resync; |
82 | 680 } |
510 | 681 |
519 | 682 if( d[0] >= '0' && d[0] <= '9' |
683 && d[1] >= '0' && d[1] <= '9'){ | |
684 n= (d[0] - '0') * 10 + (d[1] - '0'); | |
685 }else{ | |
686 n= 100; //invalid stream id | |
510 | 687 } |
885 | 688 |
82 | 689 //parse ##dc/##wb |
705 | 690 if(n < s->nb_streams){ |
519 | 691 AVStream *st; |
692 AVIStream *ast; | |
693 st = s->streams[n]; | |
694 ast = st->priv_data; | |
885 | 695 |
708 | 696 if( (st->discard >= AVDISCARD_DEFAULT && size==0) |
697 /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & PKT_FLAG_KEY))*/ //FIXME needs a little reordering | |
698 || st->discard >= AVDISCARD_ALL){ | |
699 if(ast->sample_size) ast->frame_offset += pkt->size; | |
700 else ast->frame_offset++; | |
650 | 701 url_fskip(pb, size); |
702 goto resync; | |
703 } | |
519 | 704 |
885 | 705 if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) || |
519 | 706 d[2]*256+d[3] == ast->prefix /*|| |
885 | 707 (d[2] == 'd' && d[3] == 'c') || |
887 | 708 (d[2] == 'w' && d[3] == 'b')*/) { |
519 | 709 |
710 //av_log(NULL, AV_LOG_DEBUG, "OK\n"); | |
711 if(d[2]*256+d[3] == ast->prefix) | |
712 ast->prefix_count++; | |
713 else{ | |
714 ast->prefix= d[2]*256+d[3]; | |
715 ast->prefix_count= 0; | |
716 } | |
717 | |
701 | 718 avi->stream_index= n; |
719 ast->packet_size= size + 8; | |
720 ast->remaining= size; | |
721 goto resync; | |
519 | 722 } |
82 | 723 } |
520
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
724 /* palette changed chunk */ |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
725 if ( d[0] >= '0' && d[0] <= '9' |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
726 && d[1] >= '0' && d[1] <= '9' |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
727 && ((d[2] == 'p' && d[3] == 'c')) |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
728 && n < s->nb_streams && i + size <= avi->movi_end) { |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
729 |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
730 AVStream *st; |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
731 int first, clr, flags, k, p; |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
732 |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
733 st = s->streams[n]; |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
734 |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
735 first = get_byte(pb); |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
736 clr = get_byte(pb); |
887 | 737 if(!clr) /* all 256 colors used */ |
738 clr = 256; | |
520
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
739 flags = get_le16(pb); |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
740 p = 4; |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
741 for (k = first; k < clr + first; k++) { |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
742 int r, g, b; |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
743 r = get_byte(pb); |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
744 g = get_byte(pb); |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
745 b = get_byte(pb); |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
746 get_byte(pb); |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
747 st->codec->palctrl->palette[k] = b + (g << 8) + (r << 16); |
520
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
748 } |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
749 st->codec->palctrl->palette_changed = 1; |
569 | 750 goto resync; |
520
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
751 } |
5d96fe8f6560
added support for the elusive AVI palette change chunk, courtesy of
melanson
parents:
519
diff
changeset
|
752 |
82 | 753 } |
519 | 754 |
82 | 755 return -1; |
0 | 756 } |
757 | |
311 | 758 /* XXX: we make the implicit supposition that the position are sorted |
759 for each stream */ | |
760 static int avi_read_idx1(AVFormatContext *s, int size) | |
761 { | |
701 | 762 AVIContext *avi = s->priv_data; |
311 | 763 ByteIOContext *pb = &s->pb; |
764 int nb_index_entries, i; | |
765 AVStream *st; | |
766 AVIStream *ast; | |
767 unsigned int index, tag, flags, pos, len; | |
701 | 768 unsigned last_pos= -1; |
885 | 769 |
311 | 770 nb_index_entries = size / 16; |
771 if (nb_index_entries <= 0) | |
772 return -1; | |
773 | |
774 /* read the entries and sort them in each stream component */ | |
775 for(i = 0; i < nb_index_entries; i++) { | |
776 tag = get_le32(pb); | |
777 flags = get_le32(pb); | |
778 pos = get_le32(pb); | |
779 len = get_le32(pb); | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
780 #if defined(DEBUG_SEEK) |
885 | 781 av_log(NULL, AV_LOG_DEBUG, "%d: tag=0x%x flags=0x%x pos=0x%x len=%d/", |
311 | 782 i, tag, flags, pos, len); |
783 #endif | |
701 | 784 if(i==0 && pos > avi->movi_list) |
785 avi->movi_list= 0; //FIXME better check | |
980 | 786 pos += avi->movi_list; |
701 | 787 |
311 | 788 index = ((tag & 0xff) - '0') * 10; |
789 index += ((tag >> 8) & 0xff) - '0'; | |
790 if (index >= s->nb_streams) | |
791 continue; | |
792 st = s->streams[index]; | |
793 ast = st->priv_data; | |
885 | 794 |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
795 #if defined(DEBUG_SEEK) |
1277 | 796 av_log(NULL, AV_LOG_DEBUG, "%d cum_len=%Ld\n", len, ast->cum_len); |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
797 #endif |
705 | 798 if(last_pos == pos) |
799 avi->non_interleaved= 1; | |
800 else | |
979 | 801 av_add_index_entry(st, pos, ast->cum_len, len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0); |
701 | 802 if(ast->sample_size) |
803 ast->cum_len += len / ast->sample_size; | |
804 else | |
805 ast->cum_len ++; | |
806 last_pos= pos; | |
311 | 807 } |
808 return 0; | |
809 } | |
810 | |
701 | 811 static int guess_ni_flag(AVFormatContext *s){ |
812 int i; | |
813 int64_t last_start=0; | |
814 int64_t first_end= INT64_MAX; | |
885 | 815 |
701 | 816 for(i=0; i<s->nb_streams; i++){ |
817 AVStream *st = s->streams[i]; | |
818 int n= st->nb_index_entries; | |
819 | |
820 if(n <= 0) | |
821 continue; | |
822 | |
823 if(st->index_entries[0].pos > last_start) | |
824 last_start= st->index_entries[0].pos; | |
825 if(st->index_entries[n-1].pos < first_end) | |
826 first_end= st->index_entries[n-1].pos; | |
827 } | |
828 return last_start > first_end; | |
829 } | |
830 | |
311 | 831 static int avi_load_index(AVFormatContext *s) |
832 { | |
833 AVIContext *avi = s->priv_data; | |
834 ByteIOContext *pb = &s->pb; | |
835 uint32_t tag, size; | |
343 | 836 offset_t pos= url_ftell(pb); |
885 | 837 |
311 | 838 url_fseek(pb, avi->movi_end, SEEK_SET); |
839 #ifdef DEBUG_SEEK | |
840 printf("movi_end=0x%llx\n", avi->movi_end); | |
841 #endif | |
842 for(;;) { | |
843 if (url_feof(pb)) | |
844 break; | |
845 tag = get_le32(pb); | |
846 size = get_le32(pb); | |
847 #ifdef DEBUG_SEEK | |
848 printf("tag=%c%c%c%c size=0x%x\n", | |
849 tag & 0xff, | |
850 (tag >> 8) & 0xff, | |
851 (tag >> 16) & 0xff, | |
852 (tag >> 24) & 0xff, | |
853 size); | |
854 #endif | |
855 switch(tag) { | |
856 case MKTAG('i', 'd', 'x', '1'): | |
857 if (avi_read_idx1(s, size) < 0) | |
858 goto skip; | |
859 else | |
860 goto the_end; | |
861 break; | |
862 default: | |
863 skip: | |
864 size += (size & 1); | |
865 url_fskip(pb, size); | |
866 break; | |
867 } | |
868 } | |
869 the_end: | |
343 | 870 url_fseek(pb, pos, SEEK_SET); |
311 | 871 return 0; |
872 } | |
873 | |
558 | 874 static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) |
311 | 875 { |
876 AVIContext *avi = s->priv_data; | |
877 AVStream *st; | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
878 int i, index; |
311 | 879 int64_t pos; |
880 | |
881 if (!avi->index_loaded) { | |
882 /* we only load the index on demand */ | |
883 avi_load_index(s); | |
884 avi->index_loaded = 1; | |
885 } | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
886 assert(stream_index>= 0); |
311 | 887 |
888 st = s->streams[stream_index]; | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
889 index= av_index_search_timestamp(st, timestamp, flags); |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
890 if(index<0) |
311 | 891 return -1; |
885 | 892 |
311 | 893 /* find the position */ |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
894 pos = st->index_entries[index].pos; |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
895 timestamp = st->index_entries[index].timestamp; |
311 | 896 |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
897 // av_log(NULL, AV_LOG_DEBUG, "XX %Ld %d %Ld\n", timestamp, index, st->index_entries[index].timestamp); |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
898 |
311 | 899 for(i = 0; i < s->nb_streams; i++) { |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
900 AVStream *st2 = s->streams[i]; |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
901 AVIStream *ast2 = st2->priv_data; |
701 | 902 |
903 ast2->packet_size= | |
904 ast2->remaining= 0; | |
905 | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
906 if (st2->nb_index_entries <= 0) |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
907 continue; |
885 | 908 |
988 | 909 // assert(st2->codec->block_align); |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
910 assert(st2->time_base.den == ast2->rate); |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
911 assert(st2->time_base.num == ast2->scale); |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
912 index = av_index_search_timestamp( |
885 | 913 st2, |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
914 av_rescale(timestamp, st2->time_base.den*(int64_t)st->time_base.num, st->time_base.den * (int64_t)st2->time_base.num), |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
915 flags | AVSEEK_FLAG_BACKWARD); |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
916 if(index<0) |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
917 index=0; |
885 | 918 |
701 | 919 if(!avi->non_interleaved){ |
920 while(index>0 && st2->index_entries[index].pos > pos) | |
921 index--; | |
922 while(index+1 < st2->nb_index_entries && st2->index_entries[index].pos < pos) | |
923 index++; | |
924 } | |
925 | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
926 // av_log(NULL, AV_LOG_DEBUG, "%Ld %d %Ld\n", timestamp, index, st2->index_entries[index].timestamp); |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
927 /* extract the current frame number */ |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
928 ast2->frame_offset = st2->index_entries[index].timestamp; |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
929 if(ast2->sample_size) |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
930 ast2->frame_offset *=ast2->sample_size; |
311 | 931 } |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
932 |
562
bf3231dd1d7c
* static allocation for audio packets. This will make it a little bit
romansh
parents:
558
diff
changeset
|
933 if (avi->dv_demux) |
bf3231dd1d7c
* static allocation for audio packets. This will make it a little bit
romansh
parents:
558
diff
changeset
|
934 dv_flush_audio_packets(avi->dv_demux); |
311 | 935 /* do the seek */ |
936 url_fseek(&s->pb, pos, SEEK_SET); | |
701 | 937 avi->stream_index= -1; |
311 | 938 return 0; |
939 } | |
940 | |
0 | 941 static int avi_read_close(AVFormatContext *s) |
942 { | |
110 | 943 int i; |
944 AVIContext *avi = s->priv_data; | |
945 | |
946 for(i=0;i<s->nb_streams;i++) { | |
947 AVStream *st = s->streams[i]; | |
311 | 948 AVIStream *ast = st->priv_data; |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
949 av_free(ast); |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
950 av_free(st->codec->palctrl); |
110 | 951 } |
952 | |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
953 if (avi->dv_demux) |
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
954 av_free(avi->dv_demux); |
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
955 |
0 | 956 return 0; |
957 } | |
958 | |
959 static int avi_probe(AVProbeData *p) | |
960 { | |
961 /* check file header */ | |
962 if (p->buf_size <= 32) | |
963 return 0; | |
964 if (p->buf[0] == 'R' && p->buf[1] == 'I' && | |
965 p->buf[2] == 'F' && p->buf[3] == 'F' && | |
966 p->buf[8] == 'A' && p->buf[9] == 'V' && | |
967 p->buf[10] == 'I' && p->buf[11] == ' ') | |
968 return AVPROBE_SCORE_MAX; | |
969 else | |
970 return 0; | |
971 } | |
972 | |
1169 | 973 AVInputFormat avi_demuxer = { |
0 | 974 "avi", |
975 "avi format", | |
976 sizeof(AVIContext), | |
977 avi_probe, | |
978 avi_read_header, | |
979 avi_read_packet, | |
980 avi_read_close, | |
311 | 981 avi_read_seek, |
0 | 982 }; |