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