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