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