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