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