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