Mercurial > libavformat.hg
annotate avidec.c @ 6434:ca5676c4563d libavformat
cosmetic
author | aurel |
---|---|
date | Sun, 29 Aug 2010 21:23:52 +0000 |
parents | 3ef72a19674e |
children | c64b9d69a1ce |
rev | line source |
---|---|
0 | 1 /* |
1415
3b00fb8ef8e4
replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents:
1358
diff
changeset
|
2 * AVI demuxer |
3538 | 3 * Copyright (c) 2001 Fabrice Bellard |
0 | 4 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1298
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1298
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1298
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
0 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * License as published by the Free Software Foundation; either | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1298
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
0 | 11 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1298
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
0 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1298
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
887
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 20 */ |
4203 | 21 |
4956
95ea72d4e51d
move DEBUG define before include to get dprintf and change printf to dprintf
bcoudurier
parents:
4753
diff
changeset
|
22 //#define DEBUG |
95ea72d4e51d
move DEBUG define before include to get dprintf and change printf to dprintf
bcoudurier
parents:
4753
diff
changeset
|
23 //#define DEBUG_SEEK |
95ea72d4e51d
move DEBUG define before include to get dprintf and change printf to dprintf
bcoudurier
parents:
4753
diff
changeset
|
24 |
4243 | 25 #include "libavutil/intreadwrite.h" |
4203 | 26 #include "libavutil/bswap.h" |
6338 | 27 #include "libavcodec/bytestream.h" |
0 | 28 #include "avformat.h" |
29 #include "avi.h" | |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
30 #include "dv.h" |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
31 #include "riff.h" |
0 | 32 |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
33 #undef NDEBUG |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
34 #include <assert.h> |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
35 |
311 | 36 typedef struct AVIStream { |
701 | 37 int64_t frame_offset; /* current frame (video) or byte (audio) counter |
311 | 38 (used to compute the pts) */ |
701 | 39 int remaining; |
40 int packet_size; | |
41 | |
311 | 42 int scale; |
885 | 43 int rate; |
982 | 44 int sample_size; /* size of one sample (or packet) (in the rate/scale sense) in bytes */ |
885 | 45 |
977 | 46 int64_t cum_len; /* temporary storage (used during seek) */ |
885 | 47 |
519 | 48 int prefix; ///< normally 'd'<<8 + 'c' or 'w'<<8 + 'b' |
49 int prefix_count; | |
3157
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
50 uint32_t pal[256]; |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
51 int has_pal; |
6225
b8a6ed04da91
Rename block_align variable in the avi demuxer to clearly seperate its purpose
michael
parents:
6221
diff
changeset
|
52 int dshow_block_align; ///< block align variable used to emulate bugs in the MS dshow demuxer |
6338 | 53 |
54 AVFormatContext *sub_ctx; | |
55 AVPacket sub_pkt; | |
56 uint8_t *sub_buffer; | |
311 | 57 } AVIStream; |
0 | 58 |
59 typedef struct { | |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
60 int64_t riff_end; |
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
61 int64_t movi_end; |
2383 | 62 int64_t fsize; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3908
diff
changeset
|
63 int64_t movi_list; |
3984 | 64 int64_t last_pkt_pos; |
311 | 65 int index_loaded; |
510 | 66 int is_odml; |
701 | 67 int non_interleaved; |
68 int stream_index; | |
296
252946de6d3f
* DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents:
262
diff
changeset
|
69 DVDemuxContext* dv_demux; |
6202 | 70 int odml_depth; |
71 #define MAX_ODML_DEPTH 1000 | |
0 | 72 } AVIContext; |
73 | |
2578 | 74 static const char avi_headers[][8] = { |
75 { 'R', 'I', 'F', 'F', 'A', 'V', 'I', ' ' }, | |
76 { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' }, | |
77 { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 0x19}, | |
2579 | 78 { 'O', 'N', '2', ' ', 'O', 'N', '2', 'f' }, |
2584 | 79 { 'R', 'I', 'F', 'F', 'A', 'M', 'V', ' ' }, |
2578 | 80 { 0 } |
81 }; | |
82 | |
469
6a4cc19e8d9b
exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents:
466
diff
changeset
|
83 static int avi_load_index(AVFormatContext *s); |
979 | 84 static int guess_ni_flag(AVFormatContext *s); |
469
6a4cc19e8d9b
exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents:
466
diff
changeset
|
85 |
0 | 86 #ifdef DEBUG |
87 static void print_tag(const char *str, unsigned int tag, int size) | |
88 { | |
4956
95ea72d4e51d
move DEBUG define before include to get dprintf and change printf to dprintf
bcoudurier
parents:
4753
diff
changeset
|
89 dprintf(NULL, "%s: tag=%c%c%c%c size=0x%x\n", |
0 | 90 str, tag & 0xff, |
91 (tag >> 8) & 0xff, | |
92 (tag >> 16) & 0xff, | |
93 (tag >> 24) & 0xff, | |
94 size); | |
95 } | |
96 #endif | |
97 | |
6204
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
98 static inline int get_duration(AVIStream *ast, int len){ |
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
99 if(ast->sample_size){ |
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
100 return len; |
6225
b8a6ed04da91
Rename block_align variable in the avi demuxer to clearly seperate its purpose
michael
parents:
6221
diff
changeset
|
101 }else if (ast->dshow_block_align){ |
b8a6ed04da91
Rename block_align variable in the avi demuxer to clearly seperate its purpose
michael
parents:
6221
diff
changeset
|
102 return (len + ast->dshow_block_align - 1)/ast->dshow_block_align; |
6204
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
103 }else |
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
104 return 1; |
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
105 } |
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
106 |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
107 static int get_riff(AVFormatContext *s, ByteIOContext *pb) |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
108 { |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
109 AVIContext *avi = s->priv_data; |
2578 | 110 char header[8]; |
111 int i; | |
112 | |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
113 /* check RIFF header */ |
2578 | 114 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
|
115 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
|
116 avi->riff_end += url_ftell(pb); /* RIFF chunk end */ |
2578 | 117 get_buffer(pb, header+4, 4); |
118 | |
119 for(i=0; avi_headers[i][0]; i++) | |
120 if(!memcmp(header, avi_headers[i], 8)) | |
121 break; | |
122 if(!avi_headers[i][0]) | |
123 return -1; | |
124 | |
125 if(header[7] == 0x19) | |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
126 av_log(s, AV_LOG_INFO, "This file has been generated by a totally broken muxer.\n"); |
885 | 127 |
92
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
128 return 0; |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
129 } |
5a4b5f03d13e
OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
91
diff
changeset
|
130 |
977 | 131 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
|
132 AVIContext *avi = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
133 ByteIOContext *pb = s->pb; |
977 | 134 int longs_pre_entry= get_le16(pb); |
135 int index_sub_type = get_byte(pb); | |
136 int index_type = get_byte(pb); | |
137 int entries_in_use = get_le32(pb); | |
138 int chunk_id = get_le32(pb); | |
139 int64_t base = get_le64(pb); | |
140 int stream_id= 10*((chunk_id&0xFF) - '0') + (((chunk_id>>8)&0xFF) - '0'); | |
141 AVStream *st; | |
142 AVIStream *ast; | |
143 int i; | |
984
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
144 int64_t last_pos= -1; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
145 int64_t filesize= url_fsize(s->pb); |
977 | 146 |
1277 | 147 #ifdef DEBUG_SEEK |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
148 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 | 149 longs_pre_entry,index_type, entries_in_use, chunk_id, base); |
150 #endif | |
977 | 151 |
5629
4dc2cb60c431
Correcting wrong looking stream_id validity check in avidec.
michael
parents:
5624
diff
changeset
|
152 if(stream_id >= s->nb_streams || stream_id < 0) |
977 | 153 return -1; |
154 st= s->streams[stream_id]; | |
155 ast = st->priv_data; | |
156 | |
157 if(index_sub_type) | |
158 return -1; | |
159 | |
160 get_le32(pb); | |
161 | |
162 if(index_type && longs_pre_entry != 2) | |
163 return -1; | |
164 if(index_type>1) | |
165 return -1; | |
166 | |
1277 | 167 if(filesize > 0 && base >= filesize){ |
168 av_log(s, AV_LOG_ERROR, "ODML index invalid\n"); | |
169 if(base>>32 == (base & 0xFFFFFFFF) && (base & 0xFFFFFFFF) < filesize && filesize <= 0xFFFFFFFF) | |
170 base &= 0xFFFFFFFF; | |
171 else | |
172 return -1; | |
173 } | |
174 | |
977 | 175 for(i=0; i<entries_in_use; i++){ |
176 if(index_type){ | |
979 | 177 int64_t pos= get_le32(pb) + base - 8; |
977 | 178 int len = get_le32(pb); |
979 | 179 int key= len >= 0; |
180 len &= 0x7FFFFFFF; | |
977 | 181 |
1277 | 182 #ifdef DEBUG_SEEK |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
183 av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len); |
1277 | 184 #endif |
4554 | 185 if(url_feof(pb)) |
186 return -1; | |
187 | |
984
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
188 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
|
189 avi->non_interleaved= 1; |
5327
a8e26981c104
Fix infinite loop with size==0 && sample_size!=0 in non interleaved avis.
michael
parents:
5326
diff
changeset
|
190 if(last_pos != pos && (len || !ast->sample_size)) |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
191 av_add_index_entry(st, pos, ast->cum_len, len, 0, key ? AVINDEX_KEYFRAME : 0); |
977 | 192 |
6204
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
193 ast->cum_len += get_duration(ast, len); |
984
b644fe79f7a2
fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents:
983
diff
changeset
|
194 last_pos= pos; |
977 | 195 }else{ |
1144 | 196 int64_t offset, pos; |
197 int duration; | |
198 offset = get_le64(pb); | |
199 get_le32(pb); /* size */ | |
200 duration = get_le32(pb); | |
4554 | 201 |
202 if(url_feof(pb)) | |
203 return -1; | |
204 | |
1144 | 205 pos = url_ftell(pb); |
977 | 206 |
6202 | 207 if(avi->odml_depth > MAX_ODML_DEPTH){ |
208 av_log(s, AV_LOG_ERROR, "Too deeply nested ODML indexes\n"); | |
209 return -1; | |
210 } | |
211 | |
977 | 212 url_fseek(pb, offset+8, SEEK_SET); |
6202 | 213 avi->odml_depth++; |
977 | 214 read_braindead_odml_indx(s, frame_num); |
6202 | 215 avi->odml_depth--; |
977 | 216 frame_num += duration; |
217 | |
218 url_fseek(pb, pos, SEEK_SET); | |
219 } | |
220 } | |
1277 | 221 avi->index_loaded=1; |
977 | 222 return 0; |
223 } | |
224 | |
983
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
225 static void clean_index(AVFormatContext *s){ |
1277 | 226 int i; |
227 int64_t j; | |
983
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
228 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
229 for(i=0; i<s->nb_streams; i++){ |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
230 AVStream *st = s->streams[i]; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
231 AVIStream *ast = st->priv_data; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
232 int n= st->nb_index_entries; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
233 int max= ast->sample_size; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
234 int64_t pos, size, ts; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
235 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
236 if(n != 1 || ast->sample_size==0) |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
237 continue; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
238 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
239 while(max < 1024) max+=max; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
240 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
241 pos= st->index_entries[0].pos; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
242 size= st->index_entries[0].size; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
243 ts= st->index_entries[0].timestamp; |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
244 |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
245 for(j=0; j<size; j+=max){ |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
246 av_add_index_entry(st, pos+j, ts+j, FFMIN(max, size-j), 0, AVINDEX_KEYFRAME); |
983
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
247 } |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
248 } |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
249 } |
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
250 |
5633 | 251 static int avi_read_tag(AVFormatContext *s, AVStream *st, uint32_t tag, uint32_t size) |
1256 | 252 { |
4149 | 253 ByteIOContext *pb = s->pb; |
5633 | 254 char key[5] = {0}, *value; |
4149 | 255 |
1256 | 256 size += (size & 1); |
4149 | 257 |
5446
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5327
diff
changeset
|
258 if (size == UINT_MAX) |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5327
diff
changeset
|
259 return -1; |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5327
diff
changeset
|
260 value = av_malloc(size+1); |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5327
diff
changeset
|
261 if (!value) |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5327
diff
changeset
|
262 return -1; |
5630 | 263 get_buffer(pb, value, size); |
264 value[size]=0; | |
5446
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5327
diff
changeset
|
265 |
5633 | 266 AV_WL32(key, tag); |
267 | |
5630 | 268 if(st) |
269 return av_metadata_set2(&st->metadata, key, value, | |
270 AV_METADATA_DONT_STRDUP_VAL); | |
271 else | |
5446
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5327
diff
changeset
|
272 return av_metadata_set2(&s->metadata, key, value, |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5327
diff
changeset
|
273 AV_METADATA_DONT_STRDUP_VAL); |
1256 | 274 } |
275 | |
5633 | 276 static void avi_read_info(AVFormatContext *s, uint64_t end) |
277 { | |
278 while (url_ftell(s->pb) < end) { | |
279 uint32_t tag = get_le32(s->pb); | |
280 uint32_t size = get_le32(s->pb); | |
281 avi_read_tag(s, NULL, tag, size); | |
282 } | |
283 } | |
284 | |
0 | 285 static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) |
286 { | |
287 AVIContext *avi = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
288 ByteIOContext *pb = s->pb; |
4230
de3cb095285c
Make unsigned int a variable that does not need to be explicitely 32 bits.
benoit
parents:
4210
diff
changeset
|
289 unsigned int tag, tag1, handler; |
703 | 290 int codec_type, stream_index, frame_period, bit_rate; |
5623 | 291 unsigned int size; |
1785
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
292 int i; |
0 | 293 AVStream *st; |
1144 | 294 AVIStream *ast = NULL; |
2584 | 295 int avih_width=0, avih_height=0; |
296 int amv_file_format=0; | |
5087
5de39afaca2e
Check size of "strf" header against size of enclosing "LIST" if there is one.
reimar
parents:
5058
diff
changeset
|
297 uint64_t list_end = 0; |
0 | 298 |
701 | 299 avi->stream_index= -1; |
885 | 300 |
4516 | 301 if (get_riff(s, pb) < 0) |
0 | 302 return -1; |
303 | |
2383 | 304 avi->fsize = url_fsize(pb); |
305 if(avi->fsize<=0) | |
4753
290a386de8d4
set avi fsize to INT64_MAX if riff tag end is not set and file size is not available
bcoudurier
parents:
4555
diff
changeset
|
306 avi->fsize= avi->riff_end == 8 ? INT64_MAX : avi->riff_end; |
2383 | 307 |
0 | 308 /* first list tag */ |
309 stream_index = -1; | |
310 codec_type = -1; | |
311 frame_period = 0; | |
312 for(;;) { | |
313 if (url_feof(pb)) | |
314 goto fail; | |
315 tag = get_le32(pb); | |
316 size = get_le32(pb); | |
317 #ifdef DEBUG | |
318 print_tag("tag", tag, size); | |
319 #endif | |
320 | |
321 switch(tag) { | |
322 case MKTAG('L', 'I', 'S', 'T'): | |
5087
5de39afaca2e
Check size of "strf" header against size of enclosing "LIST" if there is one.
reimar
parents:
5058
diff
changeset
|
323 list_end = url_ftell(pb) + size; |
3538 | 324 /* Ignored, except at start of video packets. */ |
0 | 325 tag1 = get_le32(pb); |
326 #ifdef DEBUG | |
327 print_tag("list", tag1, 0); | |
328 #endif | |
329 if (tag1 == MKTAG('m', 'o', 'v', 'i')) { | |
311 | 330 avi->movi_list = url_ftell(pb) - 4; |
1286 | 331 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
|
332 else avi->movi_end = url_fsize(pb); |
4956
95ea72d4e51d
move DEBUG define before include to get dprintf and change printf to dprintf
bcoudurier
parents:
4753
diff
changeset
|
333 dprintf(NULL, "movi end=%"PRIx64"\n", avi->movi_end); |
0 | 334 goto end_of_header; |
335 } | |
5633 | 336 else if (tag1 == MKTAG('I', 'N', 'F', 'O')) |
337 avi_read_info(s, list_end); | |
338 | |
0 | 339 break; |
510 | 340 case MKTAG('d', 'm', 'l', 'h'): |
887 | 341 avi->is_odml = 1; |
342 url_fskip(pb, size + (size & 1)); | |
343 break; | |
2584 | 344 case MKTAG('a', 'm', 'v', 'h'): |
345 amv_file_format=1; | |
0 | 346 case MKTAG('a', 'v', 'i', 'h'): |
3538 | 347 /* AVI header */ |
0 | 348 /* using frame_period is bad idea */ |
349 frame_period = get_le32(pb); | |
350 bit_rate = get_le32(pb) * 8; | |
981
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
351 get_le32(pb); |
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
352 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
|
353 |
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
354 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
|
355 get_le32(pb); |
2584 | 356 get_le32(pb); |
357 avih_width=get_le32(pb); | |
358 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
|
359 |
2584 | 360 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
|
361 break; |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
362 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
|
363 /* stream header */ |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
364 |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
365 tag1 = get_le32(pb); |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
366 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
|
367 |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
368 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
|
369 url_fskip(pb, size - 8); |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
370 break; |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
371 }else{ |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
372 stream_index++; |
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
373 st = av_new_stream(s, stream_index); |
0 | 374 if (!st) |
375 goto fail; | |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
457
diff
changeset
|
376 |
311 | 377 ast = av_mallocz(sizeof(AVIStream)); |
378 if (!ast) | |
379 goto fail; | |
380 st->priv_data = ast; | |
887 | 381 } |
2584 | 382 if(amv_file_format) |
383 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
|
384 |
471 | 385 #ifdef DEBUG |
1441
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
386 print_tag("strh", tag1, -1); |
471 | 387 #endif |
703 | 388 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
|
389 int64_t dv_dur; |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
390 |
885 | 391 /* |
887 | 392 * After some consideration -- I don't think we |
3538 | 393 * have to support anything but DV in type1 AVIs. |
887 | 394 */ |
395 if (s->nb_streams != 1) | |
396 goto fail; | |
885 | 397 |
887 | 398 if (handler != MKTAG('d', 'v', 's', 'd') && |
399 handler != MKTAG('d', 'v', 'h', 'd') && | |
400 handler != MKTAG('d', 'v', 's', 'l')) | |
401 goto fail; | |
885 | 402 |
887 | 403 ast = s->streams[0]->priv_data; |
404 av_freep(&s->streams[0]->codec->extradata); | |
6267
e3af32f5ee3e
avidec : Free codec context before initializing the chained DV demuxer.
jai_menon
parents:
6248
diff
changeset
|
405 av_freep(&s->streams[0]->codec); |
887 | 406 av_freep(&s->streams[0]); |
407 s->nb_streams = 0; | |
4210
ec95366371ba
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
4203
diff
changeset
|
408 if (CONFIG_DV_DEMUXER) { |
1489 | 409 avi->dv_demux = dv_init_demux(s); |
410 if (!avi->dv_demux) | |
411 goto fail; | |
1488
41a7ed2b064a
Fix avidec.c compilation when dv demuxer is disabled.
aurel
parents:
1472
diff
changeset
|
412 } |
887 | 413 s->streams[0]->priv_data = ast; |
414 url_fskip(pb, 3 * 4); | |
415 ast->scale = get_le32(pb); | |
416 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
|
417 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
|
418 |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
419 dv_dur = get_le32(pb); |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
420 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
|
421 dv_dur *= AV_TIME_BASE; |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
422 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
|
423 } |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
424 /* |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
425 * else, leave duration alone; timing estimation in utils.c |
3538 | 426 * will make a guess based on bitrate. |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
427 */ |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
428 |
887 | 429 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
|
430 url_fskip(pb, size - 9*4); |
703 | 431 break; |
432 } | |
433 | |
1785
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
434 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
|
435 st->codec->stream_codec_tag= handler; |
703 | 436 |
437 get_le32(pb); /* flags */ | |
438 get_le16(pb); /* priority */ | |
439 get_le16(pb); /* language */ | |
440 get_le32(pb); /* initial frame */ | |
441 ast->scale = get_le32(pb); | |
442 ast->rate = get_le32(pb); | |
3210 | 443 if(!(ast->scale && ast->rate)){ |
3538 | 444 av_log(s, AV_LOG_WARNING, "scale/rate is %u/%u which is invalid. (This file has been generated by broken software.)\n", ast->scale, ast->rate); |
3211 | 445 if(frame_period){ |
446 ast->rate = 1000000; | |
447 ast->scale = frame_period; | |
448 }else{ | |
449 ast->rate = 25; | |
450 ast->scale = 1; | |
451 } | |
3210 | 452 } |
703 | 453 av_set_pts_info(st, 64, ast->scale, ast->rate); |
885 | 454 |
989 | 455 ast->cum_len=get_le32(pb); /* start */ |
5623 | 456 st->nb_frames = get_le32(pb); |
703 | 457 |
458 st->start_time = 0; | |
459 get_le32(pb); /* buffer size */ | |
460 get_le32(pb); /* quality */ | |
461 ast->sample_size = get_le32(pb); /* sample ssize */ | |
1522
68620a6be643
fix support for avis with sample_size > packet size
michael
parents:
1489
diff
changeset
|
462 ast->cum_len *= FFMAX(1, ast->sample_size); |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
463 // av_log(s, AV_LOG_DEBUG, "%d %d %d %d\n", ast->rate, ast->scale, ast->start, ast->sample_size); |
703 | 464 |
465 switch(tag1) { | |
887 | 466 case MKTAG('v', 'i', 'd', 's'): |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
467 codec_type = AVMEDIA_TYPE_VIDEO; |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
468 |
703 | 469 ast->sample_size = 0; |
0 | 470 break; |
471 case MKTAG('a', 'u', 'd', 's'): | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
472 codec_type = AVMEDIA_TYPE_AUDIO; |
73
d40ddc73858a
reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents:
65
diff
changeset
|
473 break; |
471 | 474 case MKTAG('t', 'x', 't', 's'): |
6338 | 475 codec_type = AVMEDIA_TYPE_SUBTITLE; |
471 | 476 break; |
3479 | 477 case MKTAG('d', 'a', 't', 's'): |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
478 codec_type = AVMEDIA_TYPE_DATA; |
3479 | 479 break; |
73
d40ddc73858a
reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents:
65
diff
changeset
|
480 default: |
534 | 481 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
|
482 goto fail; |
0 | 483 } |
5624
71fc72a36677
Only set duration for streams where it is likely correct.
michael
parents:
5623
diff
changeset
|
484 if(ast->sample_size == 0) |
71fc72a36677
Only set duration for streams where it is likely correct.
michael
parents:
5623
diff
changeset
|
485 st->duration = st->nb_frames; |
1522
68620a6be643
fix support for avis with sample_size > packet size
michael
parents:
1489
diff
changeset
|
486 ast->frame_offset= ast->cum_len; |
703 | 487 url_fskip(pb, size - 12 * 4); |
0 | 488 break; |
489 case MKTAG('s', 't', 'r', 'f'): | |
490 /* stream header */ | |
1785
2376ab11ea73
support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents:
1761
diff
changeset
|
491 if (stream_index >= (unsigned)s->nb_streams || avi->dv_demux) { |
0 | 492 url_fskip(pb, size); |
493 } else { | |
5087
5de39afaca2e
Check size of "strf" header against size of enclosing "LIST" if there is one.
reimar
parents:
5058
diff
changeset
|
494 uint64_t cur_pos = url_ftell(pb); |
5de39afaca2e
Check size of "strf" header against size of enclosing "LIST" if there is one.
reimar
parents:
5058
diff
changeset
|
495 if (cur_pos < list_end) |
5de39afaca2e
Check size of "strf" header against size of enclosing "LIST" if there is one.
reimar
parents:
5058
diff
changeset
|
496 size = FFMIN(size, list_end - cur_pos); |
0 | 497 st = s->streams[stream_index]; |
498 switch(codec_type) { | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
499 case AVMEDIA_TYPE_VIDEO: |
2584 | 500 if(amv_file_format){ |
501 st->codec->width=avih_width; | |
502 st->codec->height=avih_height; | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
503 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
2584 | 504 st->codec->codec_id = CODEC_ID_AMV; |
505 url_fskip(pb, size); | |
506 break; | |
507 } | |
0 | 508 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
|
509 st->codec->width = get_le32(pb); |
4550
a36f9f2eefcb
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents:
4541
diff
changeset
|
510 st->codec->height = (int32_t)get_le32(pb); |
0 | 511 get_le16(pb); /* panes */ |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3759
diff
changeset
|
512 st->codec->bits_per_coded_sample= get_le16(pb); /* depth */ |
0 | 513 tag1 = get_le32(pb); |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
514 get_le32(pb); /* ImageSize */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
515 get_le32(pb); /* XPelsPerMeter */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
516 get_le32(pb); /* YPelsPerMeter */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
517 get_le32(pb); /* ClrUsed */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
518 get_le32(pb); /* ClrImportant */ |
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
519 |
5623 | 520 if (tag1 == MKTAG('D', 'X', 'S', 'B') || tag1 == MKTAG('D','X','S','A')) { |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
521 st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; |
2315 | 522 st->codec->codec_tag = tag1; |
523 st->codec->codec_id = CODEC_ID_XSUB; | |
524 break; | |
525 } | |
526 | |
1441
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
527 if(size > 10*4 && size<(1<<30)){ |
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
528 st->codec->extradata_size= size - 10*4; |
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
529 st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
5088
5da0e7ccc3c4
Check for failed extradata malloc, fixes a crash in out-of-memory conditions
reimar
parents:
5087
diff
changeset
|
530 if (!st->codec->extradata) { |
5da0e7ccc3c4
Check for failed extradata malloc, fixes a crash in out-of-memory conditions
reimar
parents:
5087
diff
changeset
|
531 st->codec->extradata_size= 0; |
5da0e7ccc3c4
Check for failed extradata malloc, fixes a crash in out-of-memory conditions
reimar
parents:
5087
diff
changeset
|
532 return AVERROR(ENOMEM); |
5da0e7ccc3c4
Check for failed extradata malloc, fixes a crash in out-of-memory conditions
reimar
parents:
5087
diff
changeset
|
533 } |
1441
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
534 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
|
535 } |
885 | 536 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
537 if(st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly |
76 | 538 get_byte(pb); |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
539 |
3538 | 540 /* Extract palette from extradata if bpp <= 8. */ |
541 /* This code assumes that extradata contains only palette. */ | |
542 /* This is true for all paletted codecs implemented in FFmpeg. */ | |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3759
diff
changeset
|
543 if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
544 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); |
5108 | 545 #if HAVE_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
|
546 for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++) |
6248 | 547 st->codec->palctrl->palette[i] = av_bswap32(((uint32_t*)st->codec->extradata)[i]); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
548 #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
|
549 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
|
550 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
551 #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
|
552 st->codec->palctrl->palette_changed = 1; |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
553 } |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
296
diff
changeset
|
554 |
0 | 555 #ifdef DEBUG |
556 print_tag("video", tag1, 0); | |
557 #endif | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
558 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
559 st->codec->codec_tag = tag1; |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4957
diff
changeset
|
560 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); |
3538 | 561 st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts. |
5522
7698da6e1f0a
Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
cehoyos
parents:
5446
diff
changeset
|
562 // Support "Resolution 1:1" for Avid AVI Codec |
7698da6e1f0a
Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
cehoyos
parents:
5446
diff
changeset
|
563 if(tag1 == MKTAG('A', 'V', 'R', 'n') && |
7698da6e1f0a
Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
cehoyos
parents:
5446
diff
changeset
|
564 st->codec->extradata_size >= 31 && |
7698da6e1f0a
Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
cehoyos
parents:
5446
diff
changeset
|
565 !memcmp(&st->codec->extradata[28], "1:1", 3)) |
7698da6e1f0a
Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
cehoyos
parents:
5446
diff
changeset
|
566 st->codec->codec_id = CODEC_ID_RAWVIDEO; |
4550
a36f9f2eefcb
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents:
4541
diff
changeset
|
567 |
a36f9f2eefcb
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents:
4541
diff
changeset
|
568 if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){ |
a36f9f2eefcb
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents:
4541
diff
changeset
|
569 st->codec->extradata_size+= 9; |
a36f9f2eefcb
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents:
4541
diff
changeset
|
570 st->codec->extradata= av_realloc(st->codec->extradata, st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
a36f9f2eefcb
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents:
4541
diff
changeset
|
571 if(st->codec->extradata) |
a36f9f2eefcb
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents:
4541
diff
changeset
|
572 memcpy(st->codec->extradata + st->codec->extradata_size - 9, "BottomUp", 9); |
a36f9f2eefcb
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents:
4541
diff
changeset
|
573 } |
a36f9f2eefcb
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents:
4541
diff
changeset
|
574 st->codec->height= FFABS(st->codec->height); |
a36f9f2eefcb
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents:
4541
diff
changeset
|
575 |
75
78bec272ce3a
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents:
73
diff
changeset
|
576 // url_fskip(pb, size - 5 * 4); |
0 | 577 break; |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
578 case AVMEDIA_TYPE_AUDIO: |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4957
diff
changeset
|
579 ff_get_wav_header(pb, st->codec, size); |
6225
b8a6ed04da91
Rename block_align variable in the avi demuxer to clearly seperate its purpose
michael
parents:
6221
diff
changeset
|
580 ast->dshow_block_align= st->codec->block_align; |
3105 | 581 if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){ |
3104 | 582 av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align); |
3105 | 583 ast->sample_size= st->codec->block_align; |
584 } | |
5970
8bb6b2e62a62
Change a %2 to &1. Patch by Sebastian Vater <cdgs DOT basty googlemail com>.
rbultje
parents:
5913
diff
changeset
|
585 if (size&1) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */ |
13
8a5285a0ca2f
Fix for odd strf tag in Stargate SG-1 - 3x18 - Shades of Grey.avi
mmu_man
parents:
5
diff
changeset
|
586 url_fskip(pb, 1); |
1527 | 587 /* Force parsing as several audio frames can be in |
3538 | 588 * one packet and timestamps refer to packet start. */ |
2020 | 589 st->need_parsing = AVSTREAM_PARSE_TIMESTAMPS; |
3538 | 590 /* ADTS header is in extradata, AAC without header must be |
591 * stored as exact frames. Parser not needed and it will | |
592 * fail. */ | |
1472
49d5a5ca2987
get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
bcoudurier
parents:
1443
diff
changeset
|
593 if (st->codec->codec_id == CODEC_ID_AAC && st->codec->extradata_size) |
2023 | 594 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
|
595 /* 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
|
596 * audio in the header but have Axan as stream_code_tag. */ |
4243 | 597 if (st->codec->stream_codec_tag == AV_RL32("Axan")){ |
1526
135565ec768d
Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents:
1522
diff
changeset
|
598 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
|
599 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
|
600 } |
6226
7b81ef3e7d99
Disable dshow specific bug emulation for amv files as they arent
michael
parents:
6225
diff
changeset
|
601 if (amv_file_format){ |
2584 | 602 st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV; |
6226
7b81ef3e7d99
Disable dshow specific bug emulation for amv files as they arent
michael
parents:
6225
diff
changeset
|
603 ast->dshow_block_align = 0; |
7b81ef3e7d99
Disable dshow specific bug emulation for amv files as they arent
michael
parents:
6225
diff
changeset
|
604 } |
0 | 605 break; |
6338 | 606 case AVMEDIA_TYPE_SUBTITLE: |
607 st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; | |
608 st->codec->codec_id = CODEC_ID_PROBE; | |
609 break; | |
0 | 610 default: |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
611 st->codec->codec_type = AVMEDIA_TYPE_DATA; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
612 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
|
613 st->codec->codec_tag= 0; |
0 | 614 url_fskip(pb, size); |
615 break; | |
616 } | |
617 } | |
618 break; | |
977 | 619 case MKTAG('i', 'n', 'd', 'x'): |
620 i= url_ftell(pb); | |
1294
12398b868e18
ignore index parameter to ignore the ODML index in avi
michael
parents:
1286
diff
changeset
|
621 if(!url_is_streamed(pb) && !(s->flags & AVFMT_FLAG_IGNIDX)){ |
1115 | 622 read_braindead_odml_indx(s, 0); |
623 } | |
977 | 624 url_fseek(pb, i+size, SEEK_SET); |
625 break; | |
2877 | 626 case MKTAG('v', 'p', 'r', 'p'): |
627 if(stream_index < (unsigned)s->nb_streams && size > 9*4){ | |
628 AVRational active, active_aspect; | |
629 | |
630 st = s->streams[stream_index]; | |
631 get_le32(pb); | |
632 get_le32(pb); | |
633 get_le32(pb); | |
634 get_le32(pb); | |
635 get_le32(pb); | |
636 | |
3177 | 637 active_aspect.den= get_le16(pb); |
2877 | 638 active_aspect.num= get_le16(pb); |
639 active.num = get_le32(pb); | |
640 active.den = get_le32(pb); | |
641 get_le32(pb); //nbFieldsPerFrame | |
642 | |
643 if(active_aspect.num && active_aspect.den && active.num && active.den){ | |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3610
diff
changeset
|
644 st->sample_aspect_ratio= av_div_q(active_aspect, active); |
2877 | 645 //av_log(s, AV_LOG_ERROR, "vprp %d/%d %d/%d\n", active_aspect.num, active_aspect.den, active.num, active.den); |
646 } | |
647 size -= 9*4; | |
648 } | |
649 url_fseek(pb, size, SEEK_CUR); | |
650 break; | |
5630 | 651 case MKTAG('s', 't', 'r', 'n'): |
652 if(s->nb_streams){ | |
5633 | 653 avi_read_tag(s, s->streams[s->nb_streams-1], tag, size); |
5630 | 654 break; |
655 } | |
0 | 656 default: |
1894 | 657 if(size > 1000000){ |
3538 | 658 av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, " |
659 "I will ignore it and try to continue anyway.\n"); | |
1894 | 660 avi->movi_list = url_ftell(pb) - 4; |
661 avi->movi_end = url_fsize(pb); | |
662 goto end_of_header; | |
663 } | |
0 | 664 /* skip tag */ |
665 size += (size & 1); | |
666 url_fskip(pb, size); | |
667 break; | |
668 } | |
669 } | |
670 end_of_header: | |
671 /* check stream number */ | |
672 if (stream_index != s->nb_streams - 1) { | |
673 fail: | |
674 return -1; | |
675 } | |
676 | |
1115 | 677 if(!avi->index_loaded && !url_is_streamed(pb)) |
977 | 678 avi_load_index(s); |
469
6a4cc19e8d9b
exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents:
466
diff
changeset
|
679 avi->index_loaded = 1; |
979 | 680 avi->non_interleaved |= guess_ni_flag(s); |
6023
d679feb6ead1
Disable non interleaved avi code when there is no index available.
michael
parents:
5990
diff
changeset
|
681 for(i=0; i<s->nb_streams; i++){ |
d679feb6ead1
Disable non interleaved avi code when there is no index available.
michael
parents:
5990
diff
changeset
|
682 AVStream *st = s->streams[i]; |
d679feb6ead1
Disable non interleaved avi code when there is no index available.
michael
parents:
5990
diff
changeset
|
683 if(st->nb_index_entries) |
d679feb6ead1
Disable non interleaved avi code when there is no index available.
michael
parents:
5990
diff
changeset
|
684 break; |
d679feb6ead1
Disable non interleaved avi code when there is no index available.
michael
parents:
5990
diff
changeset
|
685 } |
d679feb6ead1
Disable non interleaved avi code when there is no index available.
michael
parents:
5990
diff
changeset
|
686 if(i==s->nb_streams && avi->non_interleaved) { |
d679feb6ead1
Disable non interleaved avi code when there is no index available.
michael
parents:
5990
diff
changeset
|
687 av_log(s, AV_LOG_WARNING, "non-interleaved AVI without index, switching to interleaved\n"); |
d679feb6ead1
Disable non interleaved avi code when there is no index available.
michael
parents:
5990
diff
changeset
|
688 avi->non_interleaved=0; |
d679feb6ead1
Disable non interleaved avi code when there is no index available.
michael
parents:
5990
diff
changeset
|
689 } |
d679feb6ead1
Disable non interleaved avi code when there is no index available.
michael
parents:
5990
diff
changeset
|
690 |
3383 | 691 if(avi->non_interleaved) { |
3538 | 692 av_log(s, AV_LOG_INFO, "non-interleaved AVI\n"); |
983
558381bf97d2
support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents:
982
diff
changeset
|
693 clean_index(s); |
3383 | 694 } |
885 | 695 |
0 | 696 return 0; |
697 } | |
698 | |
6338 | 699 static int read_gab2_sub(AVStream *st, AVPacket *pkt) { |
700 if (!strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data+5) == 2) { | |
701 uint8_t desc[256], *d = desc; | |
702 uint8_t *end, *ptr = pkt->data+7; | |
703 unsigned int size, desc_len = bytestream_get_le32(&ptr); | |
704 int score = AVPROBE_SCORE_MAX / 2; | |
705 AVIStream *ast = st->priv_data; | |
706 AVInputFormat *sub_demuxer; | |
707 AVRational time_base; | |
708 ByteIOContext *pb; | |
709 AVProbeData pd; | |
710 | |
711 if (desc_len > FFMAX(pkt->size-17, 0)) | |
712 return 0; | |
713 | |
714 end = ptr + desc_len; | |
715 while (ptr < end-1) { | |
716 uint8_t tmp; | |
717 uint32_t ch; | |
718 GET_UTF16(ch, ptr < end-1 ? bytestream_get_le16(&ptr) : 0, break;); | |
719 PUT_UTF8(ch, tmp, if(d-desc < sizeof(desc)-1) *d++ = tmp;); | |
720 } | |
721 *d = 0; | |
722 if (*desc) | |
723 av_metadata_set2(&st->metadata, "title", desc, 0); | |
724 | |
725 ptr = end + 2; | |
726 size = bytestream_get_le32(&ptr); | |
727 size = FFMIN(size, pkt->size+pkt->data-ptr); | |
728 | |
729 pd = (AVProbeData) { .buf = ptr, .buf_size = size }; | |
730 if (!(sub_demuxer = av_probe_input_format2(&pd, 1, &score))) | |
731 return 0; | |
732 | |
733 pb = av_alloc_put_byte(ptr, size, 0, NULL, NULL, NULL, NULL); | |
734 if (!av_open_input_stream(&ast->sub_ctx, pb, "", sub_demuxer, NULL)) { | |
735 av_read_packet(ast->sub_ctx, &ast->sub_pkt); | |
736 *st->codec = *ast->sub_ctx->streams[0]->codec; | |
737 ast->sub_ctx->streams[0]->codec->extradata = NULL; | |
738 time_base = ast->sub_ctx->streams[0]->time_base; | |
739 av_set_pts_info(st, 64, time_base.num, time_base.den); | |
740 } | |
741 ast->sub_buffer = pkt->data; | |
742 memset(pkt, 0, sizeof(*pkt)); | |
743 return 1; | |
744 } | |
745 return 0; | |
746 } | |
747 | |
748 static AVStream *get_subtitle_pkt(AVFormatContext *s, AVStream *next_st, | |
749 AVPacket *pkt) | |
750 { | |
751 AVIStream *ast, *next_ast = next_st->priv_data; | |
752 int64_t ts, next_ts, ts_min = INT64_MAX; | |
753 AVStream *st, *sub_st = NULL; | |
754 int i; | |
755 | |
756 next_ts = av_rescale_q(next_ast->frame_offset, next_st->time_base, | |
757 AV_TIME_BASE_Q); | |
758 | |
759 for (i=0; i<s->nb_streams; i++) { | |
760 st = s->streams[i]; | |
761 ast = st->priv_data; | |
762 if (st->discard < AVDISCARD_ALL && ast->sub_pkt.data) { | |
763 ts = av_rescale_q(ast->sub_pkt.dts, st->time_base, AV_TIME_BASE_Q); | |
764 if (ts <= next_ts && ts < ts_min) { | |
765 ts_min = ts; | |
766 sub_st = st; | |
767 } | |
768 } | |
769 } | |
770 | |
771 if (sub_st) { | |
772 ast = sub_st->priv_data; | |
773 *pkt = ast->sub_pkt; | |
774 pkt->stream_index = sub_st->index; | |
775 if (av_read_packet(ast->sub_ctx, &ast->sub_pkt) < 0) | |
776 ast->sub_pkt.data = NULL; | |
777 } | |
778 return sub_st; | |
779 } | |
780 | |
3983 | 781 static int get_stream_idx(int *d){ |
782 if( d[0] >= '0' && d[0] <= '9' | |
783 && d[1] >= '0' && d[1] <= '9'){ | |
784 return (d[0] - '0') * 10 + (d[1] - '0'); | |
785 }else{ | |
786 return 100; //invalid stream ID | |
787 } | |
788 } | |
789 | |
0 | 790 static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) |
791 { | |
792 AVIContext *avi = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
793 ByteIOContext *pb = s->pb; |
4552
da2be12b7b4b
Handle chunks with the MSB in size set correctly that is unsigned.
michael
parents:
4550
diff
changeset
|
794 int n, d[8]; |
da2be12b7b4b
Handle chunks with the MSB in size set correctly that is unsigned.
michael
parents:
4550
diff
changeset
|
795 unsigned int size; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3908
diff
changeset
|
796 int64_t i, sync; |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
797 void* dstr; |
885 | 798 |
4210
ec95366371ba
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
4203
diff
changeset
|
799 if (CONFIG_DV_DEMUXER && avi->dv_demux) { |
4552
da2be12b7b4b
Handle chunks with the MSB in size set correctly that is unsigned.
michael
parents:
4550
diff
changeset
|
800 int size = dv_get_packet(avi->dv_demux, pkt); |
887 | 801 if (size >= 0) |
802 return size; | |
149 | 803 } |
885 | 804 |
701 | 805 if(avi->non_interleaved){ |
851
62e66722e9bb
Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents:
842
diff
changeset
|
806 int best_stream_index = 0; |
701 | 807 AVStream *best_st= NULL; |
808 AVIStream *best_ast; | |
809 int64_t best_ts= INT64_MAX; | |
810 int i; | |
885 | 811 |
701 | 812 for(i=0; i<s->nb_streams; i++){ |
813 AVStream *st = s->streams[i]; | |
814 AVIStream *ast = st->priv_data; | |
815 int64_t ts= ast->frame_offset; | |
5167
00fcfe0596e8
Fix a bug with reading non-interleaved AVI if one the streams is
cehoyos
parents:
5166
diff
changeset
|
816 int64_t last_ts; |
569 | 817 |
5166 | 818 if(!st->nb_index_entries) |
819 continue; | |
820 | |
5167
00fcfe0596e8
Fix a bug with reading non-interleaved AVI if one the streams is
cehoyos
parents:
5166
diff
changeset
|
821 last_ts = st->index_entries[st->nb_index_entries - 1].timestamp; |
00fcfe0596e8
Fix a bug with reading non-interleaved AVI if one the streams is
cehoyos
parents:
5166
diff
changeset
|
822 if(!ast->remaining && ts > last_ts) |
00fcfe0596e8
Fix a bug with reading non-interleaved AVI if one the streams is
cehoyos
parents:
5166
diff
changeset
|
823 continue; |
00fcfe0596e8
Fix a bug with reading non-interleaved AVI if one the streams is
cehoyos
parents:
5166
diff
changeset
|
824 |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
825 ts = av_rescale_q(ts, st->time_base, (AVRational){FFMAX(1, ast->sample_size), AV_TIME_BASE}); |
701 | 826 |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
827 // av_log(s, AV_LOG_DEBUG, "%"PRId64" %d/%d %"PRId64"\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset); |
5166 | 828 if(ts < best_ts){ |
701 | 829 best_ts= ts; |
830 best_st= st; | |
831 best_stream_index= i; | |
832 } | |
833 } | |
3384 | 834 if(!best_st) |
835 return -1; | |
836 | |
701 | 837 best_ast = best_st->priv_data; |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
838 best_ts = av_rescale_q(best_ts, (AVRational){FFMAX(1, best_ast->sample_size), AV_TIME_BASE}, best_st->time_base); |
701 | 839 if(best_ast->remaining) |
840 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD); | |
4104 | 841 else{ |
701 | 842 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY); |
4104 | 843 if(i>=0) |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
844 best_ast->frame_offset= best_st->index_entries[i].timestamp; |
4104 | 845 } |
701 | 846 |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
847 // av_log(s, AV_LOG_DEBUG, "%d\n", i); |
701 | 848 if(i>=0){ |
849 int64_t pos= best_st->index_entries[i].pos; | |
980 | 850 pos += best_ast->packet_size - best_ast->remaining; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
851 url_fseek(s->pb, pos + 8, SEEK_SET); |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
852 // av_log(s, AV_LOG_DEBUG, "pos=%"PRId64"\n", pos); |
885 | 853 |
982 | 854 assert(best_ast->remaining <= best_ast->packet_size); |
855 | |
981
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
856 avi->stream_index= best_stream_index; |
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
857 if(!best_ast->remaining) |
982 | 858 best_ast->packet_size= |
981
55519fa957c3
fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents:
980
diff
changeset
|
859 best_ast->remaining= best_st->index_entries[i].size; |
701 | 860 } |
861 } | |
885 | 862 |
569 | 863 resync: |
701 | 864 if(avi->stream_index >= 0){ |
865 AVStream *st= s->streams[ avi->stream_index ]; | |
866 AVIStream *ast= st->priv_data; | |
4555 | 867 int size, err; |
885 | 868 |
6338 | 869 if(get_subtitle_pkt(s, st, pkt)) |
870 return 0; | |
871 | |
988 | 872 if(ast->sample_size <= 1) // minorityreport.AVI block_align=1024 sample_size=1 IMA-ADPCM |
701 | 873 size= INT_MAX; |
885 | 874 else if(ast->sample_size < 32) |
5835
a92c2f3c87e8
Avoid creating tiny (possibly only 64 bytes large) audio packets resulting in
reimar
parents:
5633
diff
changeset
|
875 // arbitrary multiplier to avoid tiny packets for raw PCM data |
a92c2f3c87e8
Avoid creating tiny (possibly only 64 bytes large) audio packets resulting in
reimar
parents:
5633
diff
changeset
|
876 size= 1024*ast->sample_size; |
701 | 877 else |
878 size= ast->sample_size; | |
879 | |
880 if(size > ast->remaining) | |
881 size= ast->remaining; | |
3984 | 882 avi->last_pkt_pos= url_ftell(pb); |
4555 | 883 err= av_get_packet(pb, pkt, size); |
884 if(err<0) | |
885 return err; | |
885 | 886 |
3157
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
887 if(ast->has_pal && pkt->data && pkt->size<(unsigned)INT_MAX/2){ |
4555 | 888 void *ptr= av_realloc(pkt->data, pkt->size + 4*256 + FF_INPUT_BUFFER_PADDING_SIZE); |
889 if(ptr){ | |
3157
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
890 ast->has_pal=0; |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
891 pkt->size += 4*256; |
4555 | 892 pkt->data= ptr; |
3157
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
893 memcpy(pkt->data + pkt->size - 4*256, ast->pal, 4*256); |
4555 | 894 }else |
895 av_log(s, AV_LOG_ERROR, "Failed to append palette\n"); | |
3157
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
896 } |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
897 |
4210
ec95366371ba
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
4203
diff
changeset
|
898 if (CONFIG_DV_DEMUXER && avi->dv_demux) { |
701 | 899 dstr = pkt->destruct; |
900 size = dv_produce_packet(avi->dv_demux, pkt, | |
901 pkt->data, pkt->size); | |
902 pkt->destruct = dstr; | |
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
903 pkt->flags |= AV_PKT_FLAG_KEY; |
6269
b5afd13d8352
avidec : Free packet if dv_produce_packet fails.
jai_menon
parents:
6267
diff
changeset
|
904 if (size < 0) |
b5afd13d8352
avidec : Free packet if dv_produce_packet fails.
jai_menon
parents:
6267
diff
changeset
|
905 av_free_packet(pkt); |
6338 | 906 } else if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE |
907 && !st->codec->codec_tag && read_gab2_sub(st, pkt)) { | |
908 ast->frame_offset++; | |
909 avi->stream_index = -1; | |
910 ast->remaining = 0; | |
911 goto resync; | |
701 | 912 } else { |
3538 | 913 /* XXX: How to handle B-frames in AVI? */ |
701 | 914 pkt->dts = ast->frame_offset; |
915 // pkt->dts += ast->start; | |
916 if(ast->sample_size) | |
917 pkt->dts /= ast->sample_size; | |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
918 //av_log(s, AV_LOG_DEBUG, "dts:%"PRId64" offset:%"PRId64" %d/%d smpl_siz:%d base:%d st:%d size:%d\n", pkt->dts, ast->frame_offset, ast->scale, ast->rate, ast->sample_size, AV_TIME_BASE, avi->stream_index, size); |
701 | 919 pkt->stream_index = avi->stream_index; |
920 | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
921 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { |
1758 | 922 AVIndexEntry *e; |
923 int index; | |
1757
9d217a18aa49
dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents:
1721
diff
changeset
|
924 assert(st->index_entries); |
701 | 925 |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
926 index= av_index_search_timestamp(st, ast->frame_offset, 0); |
1758 | 927 e= &st->index_entries[index]; |
885 | 928 |
1758 | 929 if(index >= 0 && e->timestamp == ast->frame_offset){ |
930 if (e->flags & AVINDEX_KEYFRAME) | |
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
931 pkt->flags |= AV_PKT_FLAG_KEY; |
1758 | 932 } |
701 | 933 } else { |
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
934 pkt->flags |= AV_PKT_FLAG_KEY; |
701 | 935 } |
6204
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
936 ast->frame_offset += get_duration(ast, pkt->size); |
701 | 937 } |
938 ast->remaining -= size; | |
939 if(!ast->remaining){ | |
940 avi->stream_index= -1; | |
941 ast->packet_size= 0; | |
942 } | |
943 | |
944 return size; | |
945 } | |
946 | |
569 | 947 memset(d, -1, sizeof(int)*8); |
948 for(i=sync=url_ftell(pb); !url_feof(pb); i++) { | |
82 | 949 int j; |
950 | |
951 for(j=0; j<7; j++) | |
952 d[j]= d[j+1]; | |
953 d[7]= get_byte(pb); | |
885 | 954 |
82 | 955 size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24); |
885 | 956 |
3983 | 957 n= get_stream_idx(d+2); |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
958 //av_log(s, AV_LOG_DEBUG, "%X %X %X %X %X %X %X %X %"PRId64" %d %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n); |
4552
da2be12b7b4b
Handle chunks with the MSB in size set correctly that is unsigned.
michael
parents:
4550
diff
changeset
|
959 if(i + (uint64_t)size > avi->fsize || d[0]<0) |
519 | 960 continue; |
885 | 961 |
82 | 962 //parse ix## |
519 | 963 if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams) |
887 | 964 //parse JUNK |
2384 | 965 ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K') |
966 ||(d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')){ | |
82 | 967 url_fskip(pb, size); |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
968 //av_log(s, AV_LOG_DEBUG, "SKIP\n"); |
569 | 969 goto resync; |
82 | 970 } |
510 | 971 |
5243 | 972 //parse stray LIST |
973 if(d[0] == 'L' && d[1] == 'I' && d[2] == 'S' && d[3] == 'T'){ | |
974 url_fskip(pb, 4); | |
975 goto resync; | |
976 } | |
977 | |
3983 | 978 n= get_stream_idx(d); |
885 | 979 |
3984 | 980 if(!((i-avi->last_pkt_pos)&1) && get_stream_idx(d+1) < s->nb_streams) |
981 continue; | |
982 | |
5146
b0706c2efb78
Do not read index chunks as audio/video data; closes issue 1336.
diego
parents:
5131
diff
changeset
|
983 //detect ##ix chunk and skip |
b0706c2efb78
Do not read index chunks as audio/video data; closes issue 1336.
diego
parents:
5131
diff
changeset
|
984 if(d[2] == 'i' && d[3] == 'x' && n < s->nb_streams){ |
b0706c2efb78
Do not read index chunks as audio/video data; closes issue 1336.
diego
parents:
5131
diff
changeset
|
985 url_fskip(pb, size); |
b0706c2efb78
Do not read index chunks as audio/video data; closes issue 1336.
diego
parents:
5131
diff
changeset
|
986 goto resync; |
b0706c2efb78
Do not read index chunks as audio/video data; closes issue 1336.
diego
parents:
5131
diff
changeset
|
987 } |
b0706c2efb78
Do not read index chunks as audio/video data; closes issue 1336.
diego
parents:
5131
diff
changeset
|
988 |
82 | 989 //parse ##dc/##wb |
705 | 990 if(n < s->nb_streams){ |
3185 | 991 AVStream *st; |
992 AVIStream *ast; | |
993 st = s->streams[n]; | |
994 ast = st->priv_data; | |
3183 | 995 |
3184
de03f6b32914
1000l to myself, dereferencing uninitalized pointer.
michael
parents:
3183
diff
changeset
|
996 if(s->nb_streams>=2){ |
de03f6b32914
1000l to myself, dereferencing uninitalized pointer.
michael
parents:
3183
diff
changeset
|
997 AVStream *st1 = s->streams[1]; |
de03f6b32914
1000l to myself, dereferencing uninitalized pointer.
michael
parents:
3183
diff
changeset
|
998 AVIStream *ast1= st1->priv_data; |
3185 | 999 //workaround for broken small-file-bug402.avi |
1000 if( d[2] == 'w' && d[3] == 'b' | |
1001 && n==0 | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
1002 && st ->codec->codec_type == AVMEDIA_TYPE_VIDEO |
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5835
diff
changeset
|
1003 && st1->codec->codec_type == AVMEDIA_TYPE_AUDIO |
3185 | 1004 && ast->prefix == 'd'*256+'c' |
1005 && (d[2]*256+d[3] == ast1->prefix || !ast1->prefix_count) | |
1006 ){ | |
1007 n=1; | |
1008 st = st1; | |
1009 ast = ast1; | |
3538 | 1010 av_log(s, AV_LOG_WARNING, "Invalid stream + prefix combination, assuming audio.\n"); |
3185 | 1011 } |
3184
de03f6b32914
1000l to myself, dereferencing uninitalized pointer.
michael
parents:
3183
diff
changeset
|
1012 } |
3183 | 1013 |
1014 | |
3185 | 1015 if( (st->discard >= AVDISCARD_DEFAULT && size==0) |
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
1016 /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & AV_PKT_FLAG_KEY))*/ //FIXME needs a little reordering |
3185 | 1017 || st->discard >= AVDISCARD_ALL){ |
6204
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
1018 ast->frame_offset += get_duration(ast, size); |
650 | 1019 url_fskip(pb, size); |
1020 goto resync; | |
3185 | 1021 } |
519 | 1022 |
3185 | 1023 if (d[2] == 'p' && d[3] == 'c' && size<=4*256+4) { |
3157
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
1024 int k = get_byte(pb); |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
1025 int last = (k + get_byte(pb) - 1) & 0xFF; |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
1026 |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
1027 get_le16(pb); //flags |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
1028 |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
1029 for (; k <= last; k++) |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
1030 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
|
1031 ast->has_pal= 1; |
27c5bc69a1f9
One non functional AVPalette chunk less, one heap overflow less.
michael
parents:
3105
diff
changeset
|
1032 goto resync; |
3185 | 1033 } else if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) || |
1034 d[2]*256+d[3] == ast->prefix /*|| | |
1035 (d[2] == 'd' && d[3] == 'c') || | |
1036 (d[2] == 'w' && d[3] == 'b')*/) { | |
519 | 1037 |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
1038 //av_log(s, AV_LOG_DEBUG, "OK\n"); |
3185 | 1039 if(d[2]*256+d[3] == ast->prefix) |
1040 ast->prefix_count++; | |
1041 else{ | |
1042 ast->prefix= d[2]*256+d[3]; | |
1043 ast->prefix_count= 0; | |
1044 } | |
519 | 1045 |
3185 | 1046 avi->stream_index= n; |
1047 ast->packet_size= size + 8; | |
1048 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
|
1049 |
5327
a8e26981c104
Fix infinite loop with size==0 && sample_size!=0 in non interleaved avis.
michael
parents:
5326
diff
changeset
|
1050 if(size || !ast->sample_size){ |
3185 | 1051 uint64_t pos= url_ftell(pb) - 8; |
1052 if(!st->index_entries || !st->nb_index_entries || st->index_entries[st->nb_index_entries - 1].pos < pos){ | |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
1053 av_add_index_entry(st, pos, ast->frame_offset, size, 0, AVINDEX_KEYFRAME); |
3185 | 1054 } |
1757
9d217a18aa49
dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents:
1721
diff
changeset
|
1055 } |
3185 | 1056 goto resync; |
1757
9d217a18aa49
dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents:
1721
diff
changeset
|
1057 } |
82 | 1058 } |
1059 } | |
519 | 1060 |
4541
a65e3b37f87e
AVI demuxer: return AVERROR_EOF upon detection of end of file.
pross
parents:
4516
diff
changeset
|
1061 return AVERROR_EOF; |
0 | 1062 } |
1063 | |
3538 | 1064 /* XXX: We make the implicit supposition that the positions are sorted |
1065 for each stream. */ | |
311 | 1066 static int avi_read_idx1(AVFormatContext *s, int size) |
1067 { | |
701 | 1068 AVIContext *avi = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
1069 ByteIOContext *pb = s->pb; |
311 | 1070 int nb_index_entries, i; |
1071 AVStream *st; | |
1072 AVIStream *ast; | |
1073 unsigned int index, tag, flags, pos, len; | |
701 | 1074 unsigned last_pos= -1; |
885 | 1075 |
311 | 1076 nb_index_entries = size / 16; |
1077 if (nb_index_entries <= 0) | |
1078 return -1; | |
1079 | |
3538 | 1080 /* Read the entries and sort them in each stream component. */ |
311 | 1081 for(i = 0; i < nb_index_entries; i++) { |
1082 tag = get_le32(pb); | |
1083 flags = get_le32(pb); | |
1084 pos = get_le32(pb); | |
1085 len = get_le32(pb); | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1086 #if defined(DEBUG_SEEK) |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
1087 av_log(s, AV_LOG_DEBUG, "%d: tag=0x%x flags=0x%x pos=0x%x len=%d/", |
311 | 1088 i, tag, flags, pos, len); |
1089 #endif | |
701 | 1090 if(i==0 && pos > avi->movi_list) |
1091 avi->movi_list= 0; //FIXME better check | |
980 | 1092 pos += avi->movi_list; |
701 | 1093 |
311 | 1094 index = ((tag & 0xff) - '0') * 10; |
1095 index += ((tag >> 8) & 0xff) - '0'; | |
1096 if (index >= s->nb_streams) | |
1097 continue; | |
1098 st = s->streams[index]; | |
1099 ast = st->priv_data; | |
885 | 1100 |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1101 #if defined(DEBUG_SEEK) |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
1102 av_log(s, AV_LOG_DEBUG, "%d cum_len=%"PRId64"\n", len, ast->cum_len); |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1103 #endif |
4554 | 1104 if(url_feof(pb)) |
1105 return -1; | |
1106 | |
705 | 1107 if(last_pos == pos) |
1108 avi->non_interleaved= 1; | |
5327
a8e26981c104
Fix infinite loop with size==0 && sample_size!=0 in non interleaved avis.
michael
parents:
5326
diff
changeset
|
1109 else if(len || !ast->sample_size) |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
1110 av_add_index_entry(st, pos, ast->cum_len, len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0); |
6204
fbc809c24e5b
Factorize get_duration() out of 4 places of the avi demuxer.
michael
parents:
6202
diff
changeset
|
1111 ast->cum_len += get_duration(ast, len); |
701 | 1112 last_pos= pos; |
311 | 1113 } |
1114 return 0; | |
1115 } | |
1116 | |
701 | 1117 static int guess_ni_flag(AVFormatContext *s){ |
1118 int i; | |
1119 int64_t last_start=0; | |
1120 int64_t first_end= INT64_MAX; | |
4957 | 1121 int64_t oldpos= url_ftell(s->pb); |
885 | 1122 |
701 | 1123 for(i=0; i<s->nb_streams; i++){ |
1124 AVStream *st = s->streams[i]; | |
1125 int n= st->nb_index_entries; | |
4957 | 1126 unsigned int size; |
701 | 1127 |
1128 if(n <= 0) | |
1129 continue; | |
1130 | |
4957 | 1131 if(n >= 2){ |
1132 int64_t pos= st->index_entries[0].pos; | |
1133 url_fseek(s->pb, pos + 4, SEEK_SET); | |
1134 size= get_le32(s->pb); | |
1135 if(pos + size > st->index_entries[1].pos) | |
1136 last_start= INT64_MAX; | |
1137 } | |
1138 | |
701 | 1139 if(st->index_entries[0].pos > last_start) |
1140 last_start= st->index_entries[0].pos; | |
1141 if(st->index_entries[n-1].pos < first_end) | |
1142 first_end= st->index_entries[n-1].pos; | |
1143 } | |
4957 | 1144 url_fseek(s->pb, oldpos, SEEK_SET); |
701 | 1145 return last_start > first_end; |
1146 } | |
1147 | |
311 | 1148 static int avi_load_index(AVFormatContext *s) |
1149 { | |
1150 AVIContext *avi = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
1151 ByteIOContext *pb = s->pb; |
311 | 1152 uint32_t tag, size; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3908
diff
changeset
|
1153 int64_t pos= url_ftell(pb); |
5149
4a53fcd622ea
Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents:
5146
diff
changeset
|
1154 int ret = -1; |
885 | 1155 |
5149
4a53fcd622ea
Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents:
5146
diff
changeset
|
1156 if (url_fseek(pb, avi->movi_end, SEEK_SET) < 0) |
4a53fcd622ea
Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents:
5146
diff
changeset
|
1157 goto the_end; // maybe truncated file |
311 | 1158 #ifdef DEBUG_SEEK |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
1159 printf("movi_end=0x%"PRIx64"\n", avi->movi_end); |
311 | 1160 #endif |
1161 for(;;) { | |
1162 if (url_feof(pb)) | |
1163 break; | |
1164 tag = get_le32(pb); | |
1165 size = get_le32(pb); | |
1166 #ifdef DEBUG_SEEK | |
1167 printf("tag=%c%c%c%c size=0x%x\n", | |
1168 tag & 0xff, | |
1169 (tag >> 8) & 0xff, | |
1170 (tag >> 16) & 0xff, | |
1171 (tag >> 24) & 0xff, | |
1172 size); | |
1173 #endif | |
1174 switch(tag) { | |
1175 case MKTAG('i', 'd', 'x', '1'): | |
1176 if (avi_read_idx1(s, size) < 0) | |
1177 goto skip; | |
5149
4a53fcd622ea
Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents:
5146
diff
changeset
|
1178 ret = 0; |
311 | 1179 goto the_end; |
1180 break; | |
1181 default: | |
1182 skip: | |
1183 size += (size & 1); | |
5149
4a53fcd622ea
Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents:
5146
diff
changeset
|
1184 if (url_fseek(pb, size, SEEK_CUR) < 0) |
4a53fcd622ea
Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents:
5146
diff
changeset
|
1185 goto the_end; // something is wrong here |
311 | 1186 break; |
1187 } | |
1188 } | |
1189 the_end: | |
343 | 1190 url_fseek(pb, pos, SEEK_SET); |
5149
4a53fcd622ea
Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents:
5146
diff
changeset
|
1191 return ret; |
311 | 1192 } |
1193 | |
6338 | 1194 static void seek_subtitle(AVStream *st, AVStream *st2, int64_t timestamp) |
1195 { | |
1196 AVIStream *ast2 = st2->priv_data; | |
1197 int64_t ts2 = av_rescale_q(timestamp, st->time_base, st2->time_base); | |
1198 av_free_packet(&ast2->sub_pkt); | |
1199 if (avformat_seek_file(ast2->sub_ctx, 0, INT64_MIN, ts2, ts2, 0) >= 0 || | |
1200 avformat_seek_file(ast2->sub_ctx, 0, ts2, ts2, INT64_MAX, 0) >= 0) | |
1201 av_read_packet(ast2->sub_ctx, &ast2->sub_pkt); | |
1202 } | |
1203 | |
558 | 1204 static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) |
311 | 1205 { |
1206 AVIContext *avi = s->priv_data; | |
1207 AVStream *st; | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1208 int i, index; |
311 | 1209 int64_t pos; |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
1210 AVIStream *ast; |
311 | 1211 |
1212 if (!avi->index_loaded) { | |
1213 /* we only load the index on demand */ | |
1214 avi_load_index(s); | |
1215 avi->index_loaded = 1; | |
1216 } | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1217 assert(stream_index>= 0); |
311 | 1218 |
1219 st = s->streams[stream_index]; | |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
1220 ast= st->priv_data; |
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
1221 index= av_index_search_timestamp(st, timestamp * FFMAX(ast->sample_size, 1), flags); |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1222 if(index<0) |
311 | 1223 return -1; |
885 | 1224 |
311 | 1225 /* find the position */ |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1226 pos = st->index_entries[index].pos; |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
1227 timestamp = st->index_entries[index].timestamp / FFMAX(ast->sample_size, 1); |
311 | 1228 |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
1229 // av_log(s, AV_LOG_DEBUG, "XX %"PRId64" %d %"PRId64"\n", timestamp, index, st->index_entries[index].timestamp); |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1230 |
4210
ec95366371ba
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
4203
diff
changeset
|
1231 if (CONFIG_DV_DEMUXER && avi->dv_demux) { |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1232 /* One and only one real stream for DV in AVI, and it has video */ |
3365 | 1233 /* offsets. Calling with other stream indexes should have failed */ |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1234 /* 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
|
1235 assert(stream_index == 0); |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1236 |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1237 /* Feed the DV video stream version of the timestamp to the */ |
3538 | 1238 /* DV demux so it can synthesize correct timestamps. */ |
1629
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1239 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
|
1240 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
1241 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
|
1242 avi->stream_index= -1; |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1243 return 0; |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1244 } |
aedce96c28ff
* Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents:
1527
diff
changeset
|
1245 |
311 | 1246 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
|
1247 AVStream *st2 = s->streams[i]; |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1248 AVIStream *ast2 = st2->priv_data; |
701 | 1249 |
1250 ast2->packet_size= | |
1251 ast2->remaining= 0; | |
1252 | |
6338 | 1253 if (ast2->sub_ctx) { |
1254 seek_subtitle(st, st2, timestamp); | |
1255 continue; | |
1256 } | |
1257 | |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1258 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
|
1259 continue; |
885 | 1260 |
988 | 1261 // assert(st2->codec->block_align); |
3610
71ce7d228291
change assert test due to the new reducing of time_base in av_set_pts_info, fix #561
bcoudurier
parents:
3538
diff
changeset
|
1262 assert((int64_t)st2->time_base.num*ast2->rate == (int64_t)st2->time_base.den*ast2->scale); |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1263 index = av_index_search_timestamp( |
885 | 1264 st2, |
5326
4e1e9ab777a1
Support non interleaved avi files that have 0<size<sample_size.
michael
parents:
5243
diff
changeset
|
1265 av_rescale_q(timestamp, st->time_base, st2->time_base) * FFMAX(ast2->sample_size, 1), |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1266 flags | AVSEEK_FLAG_BACKWARD); |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1267 if(index<0) |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1268 index=0; |
885 | 1269 |
701 | 1270 if(!avi->non_interleaved){ |
1271 while(index>0 && st2->index_entries[index].pos > pos) | |
1272 index--; | |
1273 while(index+1 < st2->nb_index_entries && st2->index_entries[index].pos < pos) | |
1274 index++; | |
1275 } | |
1276 | |
4515
1d9ace1dec78
Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents:
4353
diff
changeset
|
1277 // av_log(s, AV_LOG_DEBUG, "%"PRId64" %d %"PRId64"\n", timestamp, index, st2->index_entries[index].timestamp); |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1278 /* extract the current frame number */ |
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1279 ast2->frame_offset = st2->index_entries[index].timestamp; |
311 | 1280 } |
700
a5e6e0e61e24
use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents:
673
diff
changeset
|
1281 |
311 | 1282 /* do the seek */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2584
diff
changeset
|
1283 url_fseek(s->pb, pos, SEEK_SET); |
701 | 1284 avi->stream_index= -1; |
311 | 1285 return 0; |
1286 } | |
1287 | |
0 | 1288 static int avi_read_close(AVFormatContext *s) |
1289 { | |
110 | 1290 int i; |
1291 AVIContext *avi = s->priv_data; | |
1292 | |
1293 for(i=0;i<s->nb_streams;i++) { | |
1294 AVStream *st = s->streams[i]; | |
6338 | 1295 AVIStream *ast = st->priv_data; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
1296 av_free(st->codec->palctrl); |
6338 | 1297 if (ast->sub_ctx) { |
6340 | 1298 av_freep(&ast->sub_ctx->pb); |
6338 | 1299 av_close_input_stream(ast->sub_ctx); |
1300 } | |
1301 av_free(ast->sub_buffer); | |
1302 av_free_packet(&ast->sub_pkt); | |
110 | 1303 } |
1304 | |
262
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
1305 if (avi->dv_demux) |
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
1306 av_free(avi->dv_demux); |
f174d9c00bce
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
227
diff
changeset
|
1307 |
0 | 1308 return 0; |
1309 } | |
1310 | |
1311 static int avi_probe(AVProbeData *p) | |
1312 { | |
2578 | 1313 int i; |
1314 | |
0 | 1315 /* check file header */ |
2578 | 1316 for(i=0; avi_headers[i][0]; i++) |
1317 if(!memcmp(p->buf , avi_headers[i] , 4) && | |
1318 !memcmp(p->buf+8, avi_headers[i]+4, 4)) | |
1319 return AVPROBE_SCORE_MAX; | |
1320 | |
1321 return 0; | |
0 | 1322 } |
1323 | |
1169 | 1324 AVInputFormat avi_demuxer = { |
0 | 1325 "avi", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3384
diff
changeset
|
1326 NULL_IF_CONFIG_SMALL("AVI format"), |
0 | 1327 sizeof(AVIContext), |
1328 avi_probe, | |
1329 avi_read_header, | |
1330 avi_read_packet, | |
1331 avi_read_close, | |
311 | 1332 avi_read_seek, |
5633 | 1333 .metadata_conv = ff_avi_metadata_conv, |
0 | 1334 }; |