Mercurial > libavformat.hg
annotate avidec.c @ 4154:bd4d3fee45d0 libavformat
rename AVMetaData to AVMetadata and meta_data to metadata
author | aurel |
---|---|
date | Sun, 04 Jan 2009 23:31:31 +0000 |
parents | 1f857a4519bd |
children | 27d9df19f066 |
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 |
3538 | 3 * Copyright (c) 2001 Fabrice Bellard |
0 | 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; | |
3157
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
46 uint32_t pal[256]; |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
47 int has_pal; |
311 | 48 } AVIStream; |
0 | 49 |
50 typedef struct { | |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
51 int64_t riff_end; |
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
52 int64_t movi_end; |
2383 | 53 int64_t fsize; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3908
diff
changeset
|
54 int64_t movi_list; |
3984 | 55 int64_t last_pkt_pos; |
311 | 56 int index_loaded; |
510 | 57 int is_odml; |
701 | 58 int non_interleaved; |
59 int stream_index; | |
296
252946de6d3f
* DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents:
262
diff
changeset
|
60 DVDemuxContext* dv_demux; |
0 | 61 } AVIContext; |
62 | |
2578 | 63 static const char avi_headers[][8] = { |
64 { 'R', 'I', 'F', 'F', 'A', 'V', 'I', ' ' }, | |
65 { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' }, | |
66 { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 0x19}, | |
2579 | 67 { 'O', 'N', '2', ' ', 'O', 'N', '2', 'f' }, |
2584 | 68 { 'R', 'I', 'F', 'F', 'A', 'M', 'V', ' ' }, |
2578 | 69 { 0 } |
70 }; | |
71 | |
469
6a4cc19e8d9b
exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents:
466
diff
changeset
|
72 static int avi_load_index(AVFormatContext *s); |
979 | 73 static int guess_ni_flag(AVFormatContext *s); |
469
6a4cc19e8d9b
exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents:
466
diff
changeset
|
74 |
0 | 75 #ifdef DEBUG |
76 static void print_tag(const char *str, unsigned int tag, int size) | |
77 { | |
78 printf("%s: tag=%c%c%c%c size=0x%x\n", | |
79 str, tag & 0xff, | |
80 (tag >> 8) & 0xff, | |
81 (tag >> 16) & 0xff, | |
82 (tag >> 24) & 0xff, | |
83 size); | |
84 } | |
85 #endif | |
86 | |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
87 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
|
88 { |
2578 | 89 char header[8]; |
90 int i; | |
91 | |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
92 /* check RIFF header */ |
2578 | 93 get_buffer(pb, header, 4); |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
94 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
|
95 avi->riff_end += url_ftell(pb); /* RIFF chunk end */ |
2578 | 96 get_buffer(pb, header+4, 4); |
97 | |
98 for(i=0; avi_headers[i][0]; i++) | |
99 if(!memcmp(header, avi_headers[i], 8)) | |
100 break; | |
101 if(!avi_headers[i][0]) | |
102 return -1; | |
103 | |
104 if(header[7] == 0x19) | |
3538 | 105 av_log(NULL, AV_LOG_INFO, "This file has been generated by a totally broken muxer.\n"); |
885 | 106 |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
107 return 0; |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
108 } |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
109 |
977 | 110 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
|
111 AVIContext *avi = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
112 ByteIOContext *pb = s->pb; |
977 | 113 int longs_pre_entry= get_le16(pb); |
114 int index_sub_type = get_byte(pb); | |
115 int index_type = get_byte(pb); | |
116 int entries_in_use = get_le32(pb); | |
117 int chunk_id = get_le32(pb); | |
118 int64_t base = get_le64(pb); | |
119 int stream_id= 10*((chunk_id&0xFF) - '0') + (((chunk_id>>8)&0xFF) - '0'); | |
120 AVStream *st; | |
121 AVIStream *ast; | |
122 int i; | |
984
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
123 int64_t last_pos= -1; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
124 int64_t filesize= url_fsize(s->pb); |
977 | 125 |
1277 | 126 #ifdef DEBUG_SEEK |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
127 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 | 128 longs_pre_entry,index_type, entries_in_use, chunk_id, base); |
129 #endif | |
977 | 130 |
131 if(stream_id > s->nb_streams || stream_id < 0) | |
132 return -1; | |
133 st= s->streams[stream_id]; | |
134 ast = st->priv_data; | |
135 | |
136 if(index_sub_type) | |
137 return -1; | |
138 | |
139 get_le32(pb); | |
140 | |
141 if(index_type && longs_pre_entry != 2) | |
142 return -1; | |
143 if(index_type>1) | |
144 return -1; | |
145 | |
1277 | 146 if(filesize > 0 && base >= filesize){ |
147 av_log(s, AV_LOG_ERROR, "ODML index invalid\n"); | |
148 if(base>>32 == (base & 0xFFFFFFFF) && (base & 0xFFFFFFFF) < filesize && filesize <= 0xFFFFFFFF) | |
149 base &= 0xFFFFFFFF; | |
150 else | |
151 return -1; | |
152 } | |
153 | |
977 | 154 for(i=0; i<entries_in_use; i++){ |
155 if(index_type){ | |
979 | 156 int64_t pos= get_le32(pb) + base - 8; |
977 | 157 int len = get_le32(pb); |
979 | 158 int key= len >= 0; |
159 len &= 0x7FFFFFFF; | |
977 | 160 |
1277 | 161 #ifdef DEBUG_SEEK |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
162 av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len); |
1277 | 163 #endif |
984
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
164 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
|
165 avi->non_interleaved= 1; |
4117
095a26342923
Fix bug where the avi demxuer lost the first frame of malformed
michael
parents:
4107
diff
changeset
|
166 if(last_pos != pos) |
1522
68620a6be643
fix support for avis with sample_size > packet size
michael
parents:
1489
diff
changeset
|
167 av_add_index_entry(st, pos, ast->cum_len / FFMAX(1, ast->sample_size), len, 0, key ? AVINDEX_KEYFRAME : 0); |
977 | 168 |
169 if(ast->sample_size) | |
1522
68620a6be643
fix support for avis with sample_size > packet size
michael
parents:
1489
diff
changeset
|
170 ast->cum_len += len; |
977 | 171 else |
172 ast->cum_len ++; | |
984
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
173 last_pos= pos; |
977 | 174 }else{ |
1144 | 175 int64_t offset, pos; |
176 int duration; | |
177 offset = get_le64(pb); | |
178 get_le32(pb); /* size */ | |
179 duration = get_le32(pb); | |
180 pos = url_ftell(pb); | |
977 | 181 |
182 url_fseek(pb, offset+8, SEEK_SET); | |
183 read_braindead_odml_indx(s, frame_num); | |
184 frame_num += duration; | |
185 | |
186 url_fseek(pb, pos, SEEK_SET); | |
187 } | |
188 } | |
1277 | 189 avi->index_loaded=1; |
977 | 190 return 0; |
191 } | |
192 | |
983
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
193 static void clean_index(AVFormatContext *s){ |
1277 | 194 int i; |
195 int64_t j; | |
983
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 for(i=0; i<s->nb_streams; i++){ |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
198 AVStream *st = s->streams[i]; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
199 AVIStream *ast = st->priv_data; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
200 int n= st->nb_index_entries; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
201 int max= ast->sample_size; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
202 int64_t pos, size, ts; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
203 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
204 if(n != 1 || ast->sample_size==0) |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
205 continue; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
206 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
207 while(max < 1024) max+=max; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
208 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
209 pos= st->index_entries[0].pos; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
210 size= st->index_entries[0].size; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
211 ts= st->index_entries[0].timestamp; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
212 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
213 for(j=0; j<size; j+=max){ |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
214 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
|
215 } |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
216 } |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
217 } |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
218 |
4149 | 219 static int avi_read_tag(AVFormatContext *s, const char *key, unsigned int size) |
1256 | 220 { |
4149 | 221 ByteIOContext *pb = s->pb; |
222 uint8_t value[1024]; | |
223 | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3908
diff
changeset
|
224 int64_t i = url_ftell(pb); |
1256 | 225 size += (size & 1); |
4149 | 226 get_strz(pb, value, sizeof(value)); |
1256 | 227 url_fseek(pb, i+size, SEEK_SET); |
4149 | 228 |
4154
bd4d3fee45d0
rename AVMetaData to AVMetadata and meta_data to metadata
aurel
parents:
4149
diff
changeset
|
229 return av_metadata_set(&s->metadata, (const AVMetadataTag){key, value}); |
1256 | 230 } |
231 | |
0 | 232 static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) |
233 { | |
234 AVIContext *avi = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
235 ByteIOContext *pb = s->pb; |
98
cae6ddfadf51
AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
92
diff
changeset
|
236 uint32_t tag, tag1, handler; |
703 | 237 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
|
238 unsigned int size, nb_frames; |
1785
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
239 int i; |
0 | 240 AVStream *st; |
1144 | 241 AVIStream *ast = NULL; |
2584 | 242 int avih_width=0, avih_height=0; |
243 int amv_file_format=0; | |
0 | 244 |
701 | 245 avi->stream_index= -1; |
885 | 246 |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
247 if (get_riff(avi, pb) < 0) |
0 | 248 return -1; |
249 | |
2383 | 250 avi->fsize = url_fsize(pb); |
251 if(avi->fsize<=0) | |
252 avi->fsize= avi->riff_end; | |
253 | |
0 | 254 /* first list tag */ |
255 stream_index = -1; | |
256 codec_type = -1; | |
257 frame_period = 0; | |
258 for(;;) { | |
259 if (url_feof(pb)) | |
260 goto fail; | |
261 tag = get_le32(pb); | |
262 size = get_le32(pb); | |
263 #ifdef DEBUG | |
264 print_tag("tag", tag, size); | |
265 #endif | |
266 | |
267 switch(tag) { | |
268 case MKTAG('L', 'I', 'S', 'T'): | |
3538 | 269 /* Ignored, except at start of video packets. */ |
0 | 270 tag1 = get_le32(pb); |
271 #ifdef DEBUG | |
272 print_tag("list", tag1, 0); | |
273 #endif | |
274 if (tag1 == MKTAG('m', 'o', 'v', 'i')) { | |
311 | 275 avi->movi_list = url_ftell(pb) - 4; |
1286 | 276 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
|
277 else avi->movi_end = url_fsize(pb); |
0 | 278 #ifdef DEBUG |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
279 printf("movi end=%"PRIx64"\n", avi->movi_end); |
0 | 280 #endif |
281 goto end_of_header; | |
282 } | |
283 break; | |
510 | 284 case MKTAG('d', 'm', 'l', 'h'): |
887 | 285 avi->is_odml = 1; |
286 url_fskip(pb, size + (size & 1)); | |
287 break; | |
2584 | 288 case MKTAG('a', 'm', 'v', 'h'): |
289 amv_file_format=1; | |
0 | 290 case MKTAG('a', 'v', 'i', 'h'): |
3538 | 291 /* AVI header */ |
0 | 292 /* using frame_period is bad idea */ |
293 frame_period = get_le32(pb); | |
294 bit_rate = get_le32(pb) * 8; | |
981
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
295 get_le32(pb); |
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
296 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
|
297 |
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
298 url_fskip(pb, 2 * 4); |
1785
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
299 get_le32(pb); |
2584 | 300 get_le32(pb); |
301 avih_width=get_le32(pb); | |
302 avih_height=get_le32(pb); | |
1785
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
303 |
2584 | 304 url_fskip(pb, size - 10 * 4); |
1785
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
305 break; |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
306 case MKTAG('s', 't', 'r', 'h'): |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
307 /* stream header */ |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
308 |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
309 tag1 = get_le32(pb); |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
310 handler = get_le32(pb); /* codec tag */ |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
311 |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
312 if(tag1 == MKTAG('p', 'a', 'd', 's')){ |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
313 url_fskip(pb, size - 8); |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
314 break; |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
315 }else{ |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
316 stream_index++; |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
317 st = av_new_stream(s, stream_index); |
0 | 318 if (!st) |
319 goto fail; | |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
457
diff
changeset
|
320 |
311 | 321 ast = av_mallocz(sizeof(AVIStream)); |
322 if (!ast) | |
323 goto fail; | |
324 st->priv_data = ast; | |
887 | 325 } |
2584 | 326 if(amv_file_format) |
327 tag1 = stream_index ? MKTAG('a','u','d','s') : MKTAG('v','i','d','s'); | |
1785
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
328 |
471 | 329 #ifdef DEBUG |
1441
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
330 print_tag("strh", tag1, -1); |
471 | 331 #endif |
703 | 332 if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){ |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
333 int64_t dv_dur; |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
334 |
885 | 335 /* |
887 | 336 * After some consideration -- I don't think we |
3538 | 337 * have to support anything but DV in type1 AVIs. |
887 | 338 */ |
339 if (s->nb_streams != 1) | |
340 goto fail; | |
885 | 341 |
887 | 342 if (handler != MKTAG('d', 'v', 's', 'd') && |
343 handler != MKTAG('d', 'v', 'h', 'd') && | |
344 handler != MKTAG('d', 'v', 's', 'l')) | |
345 goto fail; | |
885 | 346 |
887 | 347 ast = s->streams[0]->priv_data; |
348 av_freep(&s->streams[0]->codec->extradata); | |
349 av_freep(&s->streams[0]); | |
350 s->nb_streams = 0; | |
1488
41a7ed2b064a
Fix avidec.c compilation when dv demuxer is disabled.
aurel
parents:
1472
diff
changeset
|
351 if (ENABLE_DV_DEMUXER) { |
1489 | 352 avi->dv_demux = dv_init_demux(s); |
353 if (!avi->dv_demux) | |
354 goto fail; | |
1488
41a7ed2b064a
Fix avidec.c compilation when dv demuxer is disabled.
aurel
parents:
1472
diff
changeset
|
355 } |
887 | 356 s->streams[0]->priv_data = ast; |
357 url_fskip(pb, 3 * 4); | |
358 ast->scale = get_le32(pb); | |
359 ast->rate = get_le32(pb); | |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
360 url_fskip(pb, 4); /* start time */ |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
361 |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
362 dv_dur = get_le32(pb); |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
363 if (ast->scale > 0 && ast->rate > 0 && dv_dur > 0) { |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
364 dv_dur *= AV_TIME_BASE; |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
365 s->duration = av_rescale(dv_dur, ast->scale, ast->rate); |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
366 } |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
367 /* |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
368 * else, leave duration alone; timing estimation in utils.c |
3538 | 369 * will make a guess based on bitrate. |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
370 */ |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
371 |
887 | 372 stream_index = s->nb_streams - 1; |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
373 url_fskip(pb, size - 9*4); |
703 | 374 break; |
375 } | |
376 | |
1785
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
377 assert(stream_index < s->nb_streams); |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
378 st->codec->stream_codec_tag= handler; |
703 | 379 |
380 get_le32(pb); /* flags */ | |
381 get_le16(pb); /* priority */ | |
382 get_le16(pb); /* language */ | |
383 get_le32(pb); /* initial frame */ | |
384 ast->scale = get_le32(pb); | |
385 ast->rate = get_le32(pb); | |
3210 | 386 if(!(ast->scale && ast->rate)){ |
3538 | 387 av_log(s, AV_LOG_WARNING, "scale/rate is %u/%u which is invalid. (This file has been generated by broken software.)\n", ast->scale, ast->rate); |
3211 | 388 if(frame_period){ |
389 ast->rate = 1000000; | |
390 ast->scale = frame_period; | |
391 }else{ | |
392 ast->rate = 25; | |
393 ast->scale = 1; | |
394 } | |
3210 | 395 } |
703 | 396 av_set_pts_info(st, 64, ast->scale, ast->rate); |
885 | 397 |
989 | 398 ast->cum_len=get_le32(pb); /* start */ |
703 | 399 nb_frames = get_le32(pb); |
400 | |
401 st->start_time = 0; | |
743 | 402 st->duration = nb_frames; |
703 | 403 get_le32(pb); /* buffer size */ |
404 get_le32(pb); /* quality */ | |
405 ast->sample_size = get_le32(pb); /* sample ssize */ | |
1522
68620a6be643
fix support for avis with sample_size > packet size
michael
parents:
1489
diff
changeset
|
406 ast->cum_len *= FFMAX(1, ast->sample_size); |
703 | 407 // av_log(NULL, AV_LOG_DEBUG, "%d %d %d %d\n", ast->rate, ast->scale, ast->start, ast->sample_size); |
408 | |
409 switch(tag1) { | |
887 | 410 case MKTAG('v', 'i', 'd', 's'): |
0 | 411 codec_type = CODEC_TYPE_VIDEO; |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
412 |
703 | 413 ast->sample_size = 0; |
0 | 414 break; |
415 case MKTAG('a', 'u', 'd', 's'): | |
703 | 416 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
|
417 break; |
471 | 418 case MKTAG('t', 'x', 't', 's'): |
885 | 419 //FIXME |
471 | 420 codec_type = CODEC_TYPE_DATA; //CODEC_TYPE_SUB ? FIXME |
421 break; | |
3479 | 422 case MKTAG('d', 'a', 't', 's'): |
423 codec_type = CODEC_TYPE_DATA; | |
424 break; | |
73
d40ddc73858a
reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents:
65
diff
changeset
|
425 default: |
534 | 426 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
|
427 goto fail; |
0 | 428 } |
1522
68620a6be643
fix support for avis with sample_size > packet size
michael
parents:
1489
diff
changeset
|
429 ast->frame_offset= ast->cum_len; |
703 | 430 url_fskip(pb, size - 12 * 4); |
0 | 431 break; |
432 case MKTAG('s', 't', 'r', 'f'): | |
433 /* stream header */ | |
1785
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
434 if (stream_index >= (unsigned)s->nb_streams || avi->dv_demux) { |
0 | 435 url_fskip(pb, size); |
436 } else { | |
437 st = s->streams[stream_index]; | |
438 switch(codec_type) { | |
439 case CODEC_TYPE_VIDEO: | |
2584 | 440 if(amv_file_format){ |
441 st->codec->width=avih_width; | |
442 st->codec->height=avih_height; | |
443 st->codec->codec_type = CODEC_TYPE_VIDEO; | |
444 st->codec->codec_id = CODEC_ID_AMV; | |
445 url_fskip(pb, size); | |
446 break; | |
447 } | |
0 | 448 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
|
449 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
|
450 st->codec->height = get_le32(pb); |
0 | 451 get_le16(pb); /* panes */ |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3759
diff
changeset
|
452 st->codec->bits_per_coded_sample= get_le16(pb); /* depth */ |
0 | 453 tag1 = get_le32(pb); |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
454 get_le32(pb); /* ImageSize */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
455 get_le32(pb); /* XPelsPerMeter */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
456 get_le32(pb); /* YPelsPerMeter */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
457 get_le32(pb); /* ClrUsed */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
458 get_le32(pb); /* ClrImportant */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
459 |
2315 | 460 if (tag1 == MKTAG('D', 'X', 'S', 'B')) { |
461 st->codec->codec_type = CODEC_TYPE_SUBTITLE; | |
462 st->codec->codec_tag = tag1; | |
463 st->codec->codec_id = CODEC_ID_XSUB; | |
464 break; | |
465 } | |
466 | |
1441
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
467 if(size > 10*4 && size<(1<<30)){ |
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
468 st->codec->extradata_size= size - 10*4; |
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
469 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
|
470 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
|
471 } |
885 | 472 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
473 if(st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly |
76 | 474 get_byte(pb); |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
475 |
3538 | 476 /* Extract palette from extradata if bpp <= 8. */ |
477 /* This code assumes that extradata contains only palette. */ | |
478 /* This is true for all paletted codecs implemented in FFmpeg. */ | |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3759
diff
changeset
|
479 if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
480 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
481 #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
|
482 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
|
483 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
|
484 #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
|
485 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
|
486 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
487 #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
|
488 st->codec->palctrl->palette_changed = 1; |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
489 } |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
490 |
0 | 491 #ifdef DEBUG |
492 print_tag("video", tag1, 0); | |
493 #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
|
494 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
|
495 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
|
496 st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1); |
3538 | 497 st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts. |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
498 // url_fskip(pb, size - 5 * 4); |
0 | 499 break; |
73
d40ddc73858a
reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents:
65
diff
changeset
|
500 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
|
501 get_wav_header(pb, st->codec, size); |
3105 | 502 if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){ |
3104 | 503 av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align); |
3105 | 504 ast->sample_size= st->codec->block_align; |
505 } | |
13
8a5285a0ca2f
Fix for odd strf tag in Stargate SG-1 - 3x18 - Shades of Grey.avi
mmu_man
parents:
5
diff
changeset
|
506 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
|
507 url_fskip(pb, 1); |
1527 | 508 /* Force parsing as several audio frames can be in |
3538 | 509 * one packet and timestamps refer to packet start. */ |
2020 | 510 st->need_parsing = AVSTREAM_PARSE_TIMESTAMPS; |
3538 | 511 /* ADTS header is in extradata, AAC without header must be |
512 * stored as exact frames. Parser not needed and it will | |
513 * fail. */ | |
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
|
514 if (st->codec->codec_id == CODEC_ID_AAC && st->codec->extradata_size) |
2023 | 515 st->need_parsing = AVSTREAM_PARSE_NONE; |
1526
135565ec768d
Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents:
1522
diff
changeset
|
516 /* AVI files with Xan DPCM audio (wrongly) declare PCM |
135565ec768d
Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents:
1522
diff
changeset
|
517 * audio in the header but have Axan as stream_code_tag. */ |
135565ec768d
Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents:
1522
diff
changeset
|
518 if (st->codec->stream_codec_tag == ff_get_fourcc("Axan")){ |
135565ec768d
Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents:
1522
diff
changeset
|
519 st->codec->codec_id = CODEC_ID_XAN_DPCM; |
135565ec768d
Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents:
1522
diff
changeset
|
520 st->codec->codec_tag = 0; |
135565ec768d
Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents:
1522
diff
changeset
|
521 } |
2584 | 522 if (amv_file_format) |
523 st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV; | |
0 | 524 break; |
525 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
|
526 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
|
527 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
|
528 st->codec->codec_tag= 0; |
0 | 529 url_fskip(pb, size); |
530 break; | |
531 } | |
532 } | |
533 break; | |
977 | 534 case MKTAG('i', 'n', 'd', 'x'): |
535 i= url_ftell(pb); | |
1294
12398b868e18
ignore index parameter to ignore the ODML index in avi
michael
parents:
1286
diff
changeset
|
536 if(!url_is_streamed(pb) && !(s->flags & AVFMT_FLAG_IGNIDX)){ |
1115 | 537 read_braindead_odml_indx(s, 0); |
538 } | |
977 | 539 url_fseek(pb, i+size, SEEK_SET); |
540 break; | |
2877 | 541 case MKTAG('v', 'p', 'r', 'p'): |
542 if(stream_index < (unsigned)s->nb_streams && size > 9*4){ | |
543 AVRational active, active_aspect; | |
544 | |
545 st = s->streams[stream_index]; | |
546 get_le32(pb); | |
547 get_le32(pb); | |
548 get_le32(pb); | |
549 get_le32(pb); | |
550 get_le32(pb); | |
551 | |
3177 | 552 active_aspect.den= get_le16(pb); |
2877 | 553 active_aspect.num= get_le16(pb); |
554 active.num = get_le32(pb); | |
555 active.den = get_le32(pb); | |
556 get_le32(pb); //nbFieldsPerFrame | |
557 | |
558 if(active_aspect.num && active_aspect.den && active.num && active.den){ | |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3610
diff
changeset
|
559 st->sample_aspect_ratio= av_div_q(active_aspect, active); |
2877 | 560 //av_log(s, AV_LOG_ERROR, "vprp %d/%d %d/%d\n", active_aspect.num, active_aspect.den, active.num, active.den); |
561 } | |
562 size -= 9*4; | |
563 } | |
564 url_fseek(pb, size, SEEK_CUR); | |
565 break; | |
1256 | 566 case MKTAG('I', 'N', 'A', 'M'): |
4149 | 567 avi_read_tag(s, "Title", size); |
1256 | 568 break; |
569 case MKTAG('I', 'A', 'R', 'T'): | |
4149 | 570 avi_read_tag(s, "Artist", size); |
1256 | 571 break; |
572 case MKTAG('I', 'C', 'O', 'P'): | |
4149 | 573 avi_read_tag(s, "Copyright", size); |
1256 | 574 break; |
575 case MKTAG('I', 'C', 'M', 'T'): | |
4149 | 576 avi_read_tag(s, "Comment", size); |
1256 | 577 break; |
578 case MKTAG('I', 'G', 'N', 'R'): | |
4149 | 579 avi_read_tag(s, "Genre", size); |
1256 | 580 break; |
1296 | 581 case MKTAG('I', 'P', 'R', 'D'): |
4149 | 582 avi_read_tag(s, "Album", size); |
1296 | 583 break; |
1298
29fba975df47
Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents:
1296
diff
changeset
|
584 case MKTAG('I', 'P', 'R', 'T'): |
4149 | 585 avi_read_tag(s, "Track", size); |
1298
29fba975df47
Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents:
1296
diff
changeset
|
586 break; |
0 | 587 default: |
1894 | 588 if(size > 1000000){ |
3538 | 589 av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, " |
590 "I will ignore it and try to continue anyway.\n"); | |
1894 | 591 avi->movi_list = url_ftell(pb) - 4; |
592 avi->movi_end = url_fsize(pb); | |
593 goto end_of_header; | |
594 } | |
0 | 595 /* skip tag */ |
596 size += (size & 1); | |
597 url_fskip(pb, size); | |
598 break; | |
599 } | |
600 } | |
601 end_of_header: | |
602 /* check stream number */ | |
603 if (stream_index != s->nb_streams - 1) { | |
604 fail: | |
605 return -1; | |
606 } | |
607 | |
1115 | 608 if(!avi->index_loaded && !url_is_streamed(pb)) |
977 | 609 avi_load_index(s); |
469
6a4cc19e8d9b
exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents:
466
diff
changeset
|
610 avi->index_loaded = 1; |
979 | 611 avi->non_interleaved |= guess_ni_flag(s); |
3383 | 612 if(avi->non_interleaved) { |
3538 | 613 av_log(s, AV_LOG_INFO, "non-interleaved AVI\n"); |
983
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
614 clean_index(s); |
3383 | 615 } |
885 | 616 |
0 | 617 return 0; |
618 } | |
619 | |
3983 | 620 static int get_stream_idx(int *d){ |
621 if( d[0] >= '0' && d[0] <= '9' | |
622 && d[1] >= '0' && d[1] <= '9'){ | |
623 return (d[0] - '0') * 10 + (d[1] - '0'); | |
624 }else{ | |
625 return 100; //invalid stream ID | |
626 } | |
627 } | |
628 | |
0 | 629 static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) |
630 { | |
631 AVIContext *avi = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
632 ByteIOContext *pb = s->pb; |
510 | 633 int n, d[8], size; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3908
diff
changeset
|
634 int64_t i, sync; |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
635 void* dstr; |
885 | 636 |
1488
41a7ed2b064a
Fix avidec.c compilation when dv demuxer is disabled.
aurel
parents:
1472
diff
changeset
|
637 if (ENABLE_DV_DEMUXER && avi->dv_demux) { |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
638 size = dv_get_packet(avi->dv_demux, pkt); |
887 | 639 if (size >= 0) |
640 return size; | |
149 | 641 } |
885 | 642 |
701 | 643 if(avi->non_interleaved){ |
851
62e66722e9bb
Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents:
842
diff
changeset
|
644 int best_stream_index = 0; |
701 | 645 AVStream *best_st= NULL; |
646 AVIStream *best_ast; | |
647 int64_t best_ts= INT64_MAX; | |
648 int i; | |
885 | 649 |
701 | 650 for(i=0; i<s->nb_streams; i++){ |
651 AVStream *st = s->streams[i]; | |
652 AVIStream *ast = st->priv_data; | |
653 int64_t ts= ast->frame_offset; | |
569 | 654 |
701 | 655 if(ast->sample_size) |
656 ts /= ast->sample_size; | |
657 ts= av_rescale(ts, AV_TIME_BASE * (int64_t)st->time_base.num, st->time_base.den); | |
658 | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
659 // av_log(NULL, AV_LOG_DEBUG, "%"PRId64" %d/%d %"PRId64"\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset); |
3361 | 660 if(ts < best_ts && st->nb_index_entries){ |
701 | 661 best_ts= ts; |
662 best_st= st; | |
663 best_stream_index= i; | |
664 } | |
665 } | |
3384 | 666 if(!best_st) |
667 return -1; | |
668 | |
701 | 669 best_ast = best_st->priv_data; |
670 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 | |
671 if(best_ast->remaining) | |
672 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD); | |
4104 | 673 else{ |
701 | 674 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY); |
4104 | 675 if(i>=0) |
4107 | 676 best_ast->frame_offset= best_st->index_entries[i].timestamp |
677 * FFMAX(1, best_ast->sample_size); | |
4104 | 678 } |
701 | 679 |
680 // av_log(NULL, AV_LOG_DEBUG, "%d\n", i); | |
681 if(i>=0){ | |
682 int64_t pos= best_st->index_entries[i].pos; | |
980 | 683 pos += best_ast->packet_size - best_ast->remaining; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
684 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
|
685 // av_log(NULL, AV_LOG_DEBUG, "pos=%"PRId64"\n", pos); |
885 | 686 |
982 | 687 assert(best_ast->remaining <= best_ast->packet_size); |
688 | |
981
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
689 avi->stream_index= best_stream_index; |
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
690 if(!best_ast->remaining) |
982 | 691 best_ast->packet_size= |
981
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
692 best_ast->remaining= best_st->index_entries[i].size; |
701 | 693 } |
694 } | |
885 | 695 |
569 | 696 resync: |
701 | 697 if(avi->stream_index >= 0){ |
698 AVStream *st= s->streams[ avi->stream_index ]; | |
699 AVIStream *ast= st->priv_data; | |
700 int size; | |
885 | 701 |
988 | 702 if(ast->sample_size <= 1) // minorityreport.AVI block_align=1024 sample_size=1 IMA-ADPCM |
701 | 703 size= INT_MAX; |
885 | 704 else if(ast->sample_size < 32) |
701 | 705 size= 64*ast->sample_size; |
706 else | |
707 size= ast->sample_size; | |
708 | |
709 if(size > ast->remaining) | |
710 size= ast->remaining; | |
3984 | 711 avi->last_pkt_pos= url_ftell(pb); |
775 | 712 av_get_packet(pb, pkt, size); |
885 | 713 |
3157
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
714 if(ast->has_pal && pkt->data && pkt->size<(unsigned)INT_MAX/2){ |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
715 ast->has_pal=0; |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
716 pkt->size += 4*256; |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
717 pkt->data = av_realloc(pkt->data, pkt->size + FF_INPUT_BUFFER_PADDING_SIZE); |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
718 if(pkt->data) |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
719 memcpy(pkt->data + pkt->size - 4*256, ast->pal, 4*256); |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
720 } |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
721 |
1488
41a7ed2b064a
Fix avidec.c compilation when dv demuxer is disabled.
aurel
parents:
1472
diff
changeset
|
722 if (ENABLE_DV_DEMUXER && avi->dv_demux) { |
701 | 723 dstr = pkt->destruct; |
724 size = dv_produce_packet(avi->dv_demux, pkt, | |
725 pkt->data, pkt->size); | |
726 pkt->destruct = dstr; | |
727 pkt->flags |= PKT_FLAG_KEY; | |
728 } else { | |
3538 | 729 /* XXX: How to handle B-frames in AVI? */ |
701 | 730 pkt->dts = ast->frame_offset; |
731 // pkt->dts += ast->start; | |
732 if(ast->sample_size) | |
733 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
|
734 //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 | 735 pkt->stream_index = avi->stream_index; |
736 | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
737 if (st->codec->codec_type == CODEC_TYPE_VIDEO) { |
1758 | 738 AVIndexEntry *e; |
739 int index; | |
1757
9d217a18aa49
dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents:
1721
diff
changeset
|
740 assert(st->index_entries); |
701 | 741 |
1758 | 742 index= av_index_search_timestamp(st, pkt->dts, 0); |
743 e= &st->index_entries[index]; | |
885 | 744 |
1758 | 745 if(index >= 0 && e->timestamp == ast->frame_offset){ |
746 if (e->flags & AVINDEX_KEYFRAME) | |
747 pkt->flags |= PKT_FLAG_KEY; | |
748 } | |
701 | 749 } else { |
885 | 750 pkt->flags |= PKT_FLAG_KEY; |
701 | 751 } |
752 if(ast->sample_size) | |
753 ast->frame_offset += pkt->size; | |
754 else | |
755 ast->frame_offset++; | |
756 } | |
757 ast->remaining -= size; | |
758 if(!ast->remaining){ | |
759 avi->stream_index= -1; | |
760 ast->packet_size= 0; | |
761 } | |
762 | |
763 return size; | |
764 } | |
765 | |
569 | 766 memset(d, -1, sizeof(int)*8); |
767 for(i=sync=url_ftell(pb); !url_feof(pb); i++) { | |
82 | 768 int j; |
769 | |
770 for(j=0; j<7; j++) | |
771 d[j]= d[j+1]; | |
772 d[7]= get_byte(pb); | |
885 | 773 |
82 | 774 size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24); |
885 | 775 |
3983 | 776 n= get_stream_idx(d+2); |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
777 //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); |
2383 | 778 if(i + size > avi->fsize || d[0]<0) |
519 | 779 continue; |
885 | 780 |
82 | 781 //parse ix## |
519 | 782 if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams) |
887 | 783 //parse JUNK |
2384 | 784 ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K') |
785 ||(d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')){ | |
82 | 786 url_fskip(pb, size); |
519 | 787 //av_log(NULL, AV_LOG_DEBUG, "SKIP\n"); |
569 | 788 goto resync; |
82 | 789 } |
510 | 790 |
3983 | 791 n= get_stream_idx(d); |
885 | 792 |
3984 | 793 if(!((i-avi->last_pkt_pos)&1) && get_stream_idx(d+1) < s->nb_streams) |
794 continue; | |
795 | |
82 | 796 //parse ##dc/##wb |
705 | 797 if(n < s->nb_streams){ |
3185 | 798 AVStream *st; |
799 AVIStream *ast; | |
800 st = s->streams[n]; | |
801 ast = st->priv_data; | |
3183 | 802 |
3184
de03f6b32914
1000l to myself, dereferencing uninitalized pointer.
michael
parents:
3183
diff
changeset
|
803 if(s->nb_streams>=2){ |
de03f6b32914
1000l to myself, dereferencing uninitalized pointer.
michael
parents:
3183
diff
changeset
|
804 AVStream *st1 = s->streams[1]; |
de03f6b32914
1000l to myself, dereferencing uninitalized pointer.
michael
parents:
3183
diff
changeset
|
805 AVIStream *ast1= st1->priv_data; |
3185 | 806 //workaround for broken small-file-bug402.avi |
807 if( d[2] == 'w' && d[3] == 'b' | |
808 && n==0 | |
809 && st ->codec->codec_type == CODEC_TYPE_VIDEO | |
810 && st1->codec->codec_type == CODEC_TYPE_AUDIO | |
811 && ast->prefix == 'd'*256+'c' | |
812 && (d[2]*256+d[3] == ast1->prefix || !ast1->prefix_count) | |
813 ){ | |
814 n=1; | |
815 st = st1; | |
816 ast = ast1; | |
3538 | 817 av_log(s, AV_LOG_WARNING, "Invalid stream + prefix combination, assuming audio.\n"); |
3185 | 818 } |
3184
de03f6b32914
1000l to myself, dereferencing uninitalized pointer.
michael
parents:
3183
diff
changeset
|
819 } |
3183 | 820 |
821 | |
3185 | 822 if( (st->discard >= AVDISCARD_DEFAULT && size==0) |
823 /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & PKT_FLAG_KEY))*/ //FIXME needs a little reordering | |
824 || st->discard >= AVDISCARD_ALL){ | |
708 | 825 if(ast->sample_size) ast->frame_offset += pkt->size; |
826 else ast->frame_offset++; | |
650 | 827 url_fskip(pb, size); |
828 goto resync; | |
3185 | 829 } |
519 | 830 |
3185 | 831 if (d[2] == 'p' && d[3] == 'c' && size<=4*256+4) { |
3157
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
832 int k = get_byte(pb); |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
833 int last = (k + get_byte(pb) - 1) & 0xFF; |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
834 |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
835 get_le16(pb); //flags |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
836 |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
837 for (; k <= last; k++) |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
838 ast->pal[k] = get_be32(pb)>>8;// b + (g << 8) + (r << 16); |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
839 ast->has_pal= 1; |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
840 goto resync; |
3185 | 841 } else if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) || |
842 d[2]*256+d[3] == ast->prefix /*|| | |
843 (d[2] == 'd' && d[3] == 'c') || | |
844 (d[2] == 'w' && d[3] == 'b')*/) { | |
519 | 845 |
846 //av_log(NULL, AV_LOG_DEBUG, "OK\n"); | |
3185 | 847 if(d[2]*256+d[3] == ast->prefix) |
848 ast->prefix_count++; | |
849 else{ | |
850 ast->prefix= d[2]*256+d[3]; | |
851 ast->prefix_count= 0; | |
852 } | |
519 | 853 |
3185 | 854 avi->stream_index= n; |
855 ast->packet_size= size + 8; | |
856 ast->remaining= size; | |
1757
9d217a18aa49
dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents:
1721
diff
changeset
|
857 |
3185 | 858 { |
859 uint64_t pos= url_ftell(pb) - 8; | |
860 if(!st->index_entries || !st->nb_index_entries || st->index_entries[st->nb_index_entries - 1].pos < pos){ | |
861 av_add_index_entry(st, pos, ast->frame_offset / FFMAX(1, ast->sample_size), size, 0, AVINDEX_KEYFRAME); | |
862 } | |
1757
9d217a18aa49
dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents:
1721
diff
changeset
|
863 } |
3185 | 864 goto resync; |
1757
9d217a18aa49
dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents:
1721
diff
changeset
|
865 } |
82 | 866 } |
867 } | |
519 | 868 |
82 | 869 return -1; |
0 | 870 } |
871 | |
3538 | 872 /* XXX: We make the implicit supposition that the positions are sorted |
873 for each stream. */ | |
311 | 874 static int avi_read_idx1(AVFormatContext *s, int size) |
875 { | |
701 | 876 AVIContext *avi = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
877 ByteIOContext *pb = s->pb; |
311 | 878 int nb_index_entries, i; |
879 AVStream *st; | |
880 AVIStream *ast; | |
881 unsigned int index, tag, flags, pos, len; | |
701 | 882 unsigned last_pos= -1; |
885 | 883 |
311 | 884 nb_index_entries = size / 16; |
885 if (nb_index_entries <= 0) | |
886 return -1; | |
887 | |
3538 | 888 /* Read the entries and sort them in each stream component. */ |
311 | 889 for(i = 0; i < nb_index_entries; i++) { |
890 tag = get_le32(pb); | |
891 flags = get_le32(pb); | |
892 pos = get_le32(pb); | |
893 len = get_le32(pb); | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
894 #if defined(DEBUG_SEEK) |
885 | 895 av_log(NULL, AV_LOG_DEBUG, "%d: tag=0x%x flags=0x%x pos=0x%x len=%d/", |
311 | 896 i, tag, flags, pos, len); |
897 #endif | |
701 | 898 if(i==0 && pos > avi->movi_list) |
899 avi->movi_list= 0; //FIXME better check | |
980 | 900 pos += avi->movi_list; |
701 | 901 |
311 | 902 index = ((tag & 0xff) - '0') * 10; |
903 index += ((tag >> 8) & 0xff) - '0'; | |
904 if (index >= s->nb_streams) | |
905 continue; | |
906 st = s->streams[index]; | |
907 ast = st->priv_data; | |
885 | 908 |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
909 #if defined(DEBUG_SEEK) |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
910 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
|
911 #endif |
705 | 912 if(last_pos == pos) |
913 avi->non_interleaved= 1; | |
914 else | |
1522
68620a6be643
fix support for avis with sample_size > packet size
michael
parents:
1489
diff
changeset
|
915 av_add_index_entry(st, pos, ast->cum_len / FFMAX(1, ast->sample_size), len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0); |
701 | 916 if(ast->sample_size) |
1522
68620a6be643
fix support for avis with sample_size > packet size
michael
parents:
1489
diff
changeset
|
917 ast->cum_len += len; |
701 | 918 else |
919 ast->cum_len ++; | |
920 last_pos= pos; | |
311 | 921 } |
922 return 0; | |
923 } | |
924 | |
701 | 925 static int guess_ni_flag(AVFormatContext *s){ |
926 int i; | |
927 int64_t last_start=0; | |
928 int64_t first_end= INT64_MAX; | |
885 | 929 |
701 | 930 for(i=0; i<s->nb_streams; i++){ |
931 AVStream *st = s->streams[i]; | |
932 int n= st->nb_index_entries; | |
933 | |
934 if(n <= 0) | |
935 continue; | |
936 | |
937 if(st->index_entries[0].pos > last_start) | |
938 last_start= st->index_entries[0].pos; | |
939 if(st->index_entries[n-1].pos < first_end) | |
940 first_end= st->index_entries[n-1].pos; | |
941 } | |
942 return last_start > first_end; | |
943 } | |
944 | |
311 | 945 static int avi_load_index(AVFormatContext *s) |
946 { | |
947 AVIContext *avi = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
948 ByteIOContext *pb = s->pb; |
311 | 949 uint32_t tag, size; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3908
diff
changeset
|
950 int64_t pos= url_ftell(pb); |
885 | 951 |
311 | 952 url_fseek(pb, avi->movi_end, SEEK_SET); |
953 #ifdef DEBUG_SEEK | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
954 printf("movi_end=0x%"PRIx64"\n", avi->movi_end); |
311 | 955 #endif |
956 for(;;) { | |
957 if (url_feof(pb)) | |
958 break; | |
959 tag = get_le32(pb); | |
960 size = get_le32(pb); | |
961 #ifdef DEBUG_SEEK | |
962 printf("tag=%c%c%c%c size=0x%x\n", | |
963 tag & 0xff, | |
964 (tag >> 8) & 0xff, | |
965 (tag >> 16) & 0xff, | |
966 (tag >> 24) & 0xff, | |
967 size); | |
968 #endif | |
969 switch(tag) { | |
970 case MKTAG('i', 'd', 'x', '1'): | |
971 if (avi_read_idx1(s, size) < 0) | |
972 goto skip; | |
973 else | |
974 goto the_end; | |
975 break; | |
976 default: | |
977 skip: | |
978 size += (size & 1); | |
979 url_fskip(pb, size); | |
980 break; | |
981 } | |
982 } | |
983 the_end: | |
343 | 984 url_fseek(pb, pos, SEEK_SET); |
311 | 985 return 0; |
986 } | |
987 | |
558 | 988 static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) |
311 | 989 { |
990 AVIContext *avi = s->priv_data; | |
991 AVStream *st; | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
992 int i, index; |
311 | 993 int64_t pos; |
994 | |
995 if (!avi->index_loaded) { | |
996 /* we only load the index on demand */ | |
997 avi_load_index(s); | |
998 avi->index_loaded = 1; | |
999 } | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1000 assert(stream_index>= 0); |
311 | 1001 |
1002 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
|
1003 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
|
1004 if(index<0) |
311 | 1005 return -1; |
885 | 1006 |
311 | 1007 /* find the position */ |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1008 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
|
1009 timestamp = st->index_entries[index].timestamp; |
311 | 1010 |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
1011 // 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
|
1012 |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1013 if (ENABLE_DV_DEMUXER && avi->dv_demux) { |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1014 /* One and only one real stream for DV in AVI, and it has video */ |
3365 | 1015 /* offsets. Calling with other stream indexes should have failed */ |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1016 /* the av_index_search_timestamp call above. */ |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1017 assert(stream_index == 0); |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1018 |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1019 /* Feed the DV video stream version of the timestamp to the */ |
3538 | 1020 /* DV demux so it can synthesize correct timestamps. */ |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1021 dv_offset_reset(avi->dv_demux, timestamp); |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1022 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
1023 url_fseek(s->pb, pos, SEEK_SET); |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1024 avi->stream_index= -1; |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1025 return 0; |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1026 } |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1027 |
311 | 1028 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
|
1029 AVStream *st2 = s->streams[i]; |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1030 AVIStream *ast2 = st2->priv_data; |
701 | 1031 |
1032 ast2->packet_size= | |
1033 ast2->remaining= 0; | |
1034 | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1035 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
|
1036 continue; |
885 | 1037 |
988 | 1038 // assert(st2->codec->block_align); |
3610
71ce7d228291
change assert test due to the new reducing of time_base in av_set_pts_info, fix #561
bcoudurier
parents:
3538
diff
changeset
|
1039 assert((int64_t)st2->time_base.num*ast2->rate == (int64_t)st2->time_base.den*ast2->scale); |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1040 index = av_index_search_timestamp( |
885 | 1041 st2, |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1042 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
|
1043 flags | AVSEEK_FLAG_BACKWARD); |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1044 if(index<0) |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1045 index=0; |
885 | 1046 |
701 | 1047 if(!avi->non_interleaved){ |
1048 while(index>0 && st2->index_entries[index].pos > pos) | |
1049 index--; | |
1050 while(index+1 < st2->nb_index_entries && st2->index_entries[index].pos < pos) | |
1051 index++; | |
1052 } | |
1053 | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
1054 // 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
|
1055 /* extract the current frame number */ |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1056 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
|
1057 if(ast2->sample_size) |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1058 ast2->frame_offset *=ast2->sample_size; |
311 | 1059 } |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1060 |
311 | 1061 /* do the seek */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
1062 url_fseek(s->pb, pos, SEEK_SET); |
701 | 1063 avi->stream_index= -1; |
311 | 1064 return 0; |
1065 } | |
1066 | |
0 | 1067 static int avi_read_close(AVFormatContext *s) |
1068 { | |
110 | 1069 int i; |
1070 AVIContext *avi = s->priv_data; | |
1071 | |
1072 for(i=0;i<s->nb_streams;i++) { | |
1073 AVStream *st = s->streams[i]; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
1074 av_free(st->codec->palctrl); |
110 | 1075 } |
1076 | |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
1077 if (avi->dv_demux) |
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
1078 av_free(avi->dv_demux); |
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
1079 |
0 | 1080 return 0; |
1081 } | |
1082 | |
1083 static int avi_probe(AVProbeData *p) | |
1084 { | |
2578 | 1085 int i; |
1086 | |
0 | 1087 /* check file header */ |
2578 | 1088 for(i=0; avi_headers[i][0]; i++) |
1089 if(!memcmp(p->buf , avi_headers[i] , 4) && | |
1090 !memcmp(p->buf+8, avi_headers[i]+4, 4)) | |
1091 return AVPROBE_SCORE_MAX; | |
1092 | |
1093 return 0; | |
0 | 1094 } |
1095 | |
1169 | 1096 AVInputFormat avi_demuxer = { |
0 | 1097 "avi", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3384
diff
changeset
|
1098 NULL_IF_CONFIG_SMALL("AVI format"), |
0 | 1099 sizeof(AVIContext), |
1100 avi_probe, | |
1101 avi_read_header, | |
1102 avi_read_packet, | |
1103 avi_read_close, | |
311 | 1104 avi_read_seek, |
0 | 1105 }; |