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