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