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