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