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