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