Mercurial > libavformat.hg
annotate mov.c @ 1843:9cd8cb3275f6 libavformat
use common tables for mov muxer and demuxer
author | bcoudurier |
---|---|
date | Sat, 03 Mar 2007 14:55:11 +0000 |
parents | 1ba0db9d6cbc |
children |
rev | line source |
---|---|
0 | 1 /* |
1415
3b00fb8ef8e4
replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents:
1410
diff
changeset
|
2 * MOV 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:
1353
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1353
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1353
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:
1353
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:
1353
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:
1353
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:
890
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 20 */ |
395
c1ed10f3b052
cleanup frame_rate code, this may also fix some large file bugs
michael
parents:
383
diff
changeset
|
21 |
c1ed10f3b052
cleanup frame_rate code, this may also fix some large file bugs
michael
parents:
383
diff
changeset
|
22 #include <limits.h> |
885 | 23 |
1072 | 24 //#define DEBUG |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
25 |
0 | 26 #include "avformat.h" |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
27 #include "riff.h" |
1216
fec0a3d5408f
move common code from mov.c and movenc.c to isom.c
bcoudurier
parents:
1215
diff
changeset
|
28 #include "isom.h" |
1268 | 29 #include "dv.h" |
0 | 30 |
31 #ifdef CONFIG_ZLIB | |
32 #include <zlib.h> | |
33 #endif | |
34 | |
35 /* | |
36 * First version by Francois Revol revol@free.fr | |
885 | 37 * Seek function by Gael Chardon gael.dev@4now.net |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
38 * |
0 | 39 * Features and limitations: |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
40 * - reads most of the QT files I have (at least the structure), |
0 | 41 * the exceptions are .mov with zlib compressed headers ('cmov' section). It shouldn't be hard to implement. |
42 * FIXED, Francois Revol, 07/17/2002 | |
43 * - ffmpeg has nearly none of the usual QuickTime codecs, | |
44 * although I succesfully dumped raw and mp3 audio tracks off .mov files. | |
45 * Sample QuickTime files with mp3 audio can be found at: http://www.3ivx.com/showcase.html | |
46 * - .mp4 parsing is still hazardous, although the format really is QuickTime with some minor changes | |
47 * (to make .mov parser crash maybe ?), despite what they say in the MPEG FAQ at | |
48 * http://mpeg.telecomitalialab.com/faq.htm | |
49 * - the code is quite ugly... maybe I won't do it recursive next time :-) | |
491 | 50 * - seek is not supported with files that contain edit list |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
51 * |
0 | 52 * Funny I didn't know about http://sourceforge.net/projects/qt-ffmpeg/ |
53 * when coding this :) (it's a writer anyway) | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
54 * |
0 | 55 * Reference documents: |
56 * http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt | |
57 * Apple: | |
491 | 58 * http://developer.apple.com/documentation/QuickTime/QTFF/ |
506
74ad3aa6749c
2000/00/00 to 2001/03/01 QT fileformat documentation patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents:
500
diff
changeset
|
59 * http://developer.apple.com/documentation/QuickTime/QTFF/qtff.pdf |
0 | 60 * QuickTime is a trademark of Apple (AFAIK :)) |
61 */ | |
62 | |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
63 #include "qtpalette.h" |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
64 |
491 | 65 |
928 | 66 #undef NDEBUG |
67 #include <assert.h> | |
68 | |
0 | 69 /* the QuickTime file format is quite convoluted... |
70 * it has lots of index tables, each indexing something in another one... | |
71 * Here we just use what is needed to read the chunks | |
72 */ | |
73 | |
74 typedef struct MOV_sample_to_chunk_tbl { | |
75 long first; | |
76 long count; | |
77 long id; | |
78 } MOV_sample_to_chunk_tbl; | |
79 | |
118 | 80 typedef struct { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
81 uint32_t type; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
82 int64_t offset; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
83 int64_t size; /* total size (excluding the size and type fields) */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
84 } MOV_atom_t; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
85 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
86 typedef struct { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
87 int seed; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
88 int flags; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
89 int size; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
90 void* clrs; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
91 } MOV_ctab_t; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
92 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
93 typedef struct MOV_mdat_atom_s { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
94 offset_t offset; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
95 int64_t size; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
96 } MOV_mdat_atom_t; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
97 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
98 typedef struct { |
118 | 99 uint8_t version; |
100 uint32_t flags; // 24bit | |
101 | |
102 /* 0x03 ESDescrTag */ | |
103 uint16_t es_id; | |
887 | 104 #define MP4ODescrTag 0x01 |
105 #define MP4IODescrTag 0x02 | |
106 #define MP4ESDescrTag 0x03 | |
107 #define MP4DecConfigDescrTag 0x04 | |
108 #define MP4DecSpecificDescrTag 0x05 | |
109 #define MP4SLConfigDescrTag 0x06 | |
110 #define MP4ContentIdDescrTag 0x07 | |
111 #define MP4SupplContentIdDescrTag 0x08 | |
112 #define MP4IPIPtrDescrTag 0x09 | |
113 #define MP4IPMPPtrDescrTag 0x0A | |
114 #define MP4IPMPDescrTag 0x0B | |
115 #define MP4RegistrationDescrTag 0x0D | |
116 #define MP4ESIDIncDescrTag 0x0E | |
117 #define MP4ESIDRefDescrTag 0x0F | |
118 #define MP4FileIODescrTag 0x10 | |
119 #define MP4FileODescrTag 0x11 | |
120 #define MP4ExtProfileLevelDescrTag 0x13 | |
121 #define MP4ExtDescrTagsStart 0x80 | |
122 #define MP4ExtDescrTagsEnd 0xFE | |
118 | 123 uint8_t stream_priority; |
124 | |
125 /* 0x04 DecConfigDescrTag */ | |
126 uint8_t object_type_id; | |
127 uint8_t stream_type; | |
128 /* XXX: really streamType is | |
129 * only 6bit, followed by: | |
130 * 1bit upStream | |
131 * 1bit reserved | |
132 */ | |
133 uint32_t buffer_size_db; // 24 | |
134 uint32_t max_bitrate; | |
135 uint32_t avg_bitrate; | |
136 | |
137 /* 0x05 DecSpecificDescrTag */ | |
138 uint8_t decoder_cfg_len; | |
139 uint8_t *decoder_cfg; | |
140 | |
141 /* 0x06 SLConfigDescrTag */ | |
142 uint8_t sl_config_len; | |
143 uint8_t *sl_config; | |
144 } MOV_esds_t; | |
145 | |
121 | 146 struct MOVParseTableEntry; |
147 | |
0 | 148 typedef struct MOVStreamContext { |
149 int ffindex; /* the ffmpeg stream id */ | |
150 long next_chunk; | |
1728 | 151 unsigned int chunk_count; |
65 | 152 int64_t *chunk_offsets; |
1728 | 153 unsigned int stts_count; |
670 | 154 Time2Sample *stts_data; |
1728 | 155 unsigned int ctts_count; |
671 | 156 Time2Sample *ctts_data; |
1728 | 157 unsigned int edit_count; /* number of 'edit' (elst atom) */ |
158 unsigned int sample_to_chunk_sz; | |
0 | 159 MOV_sample_to_chunk_tbl *sample_to_chunk; |
671 | 160 int sample_to_ctime_index; |
161 int sample_to_ctime_sample; | |
1728 | 162 unsigned int sample_size; |
163 unsigned int sample_count; | |
0 | 164 long *sample_sizes; |
1728 | 165 unsigned int keyframe_count; |
383
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
166 long *keyframes; |
118 | 167 int time_scale; |
928 | 168 int time_rate; |
0 | 169 long current_sample; |
118 | 170 MOV_esds_t esds; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
171 AVRational sample_size_v1; |
1268 | 172 int dv_audio_container; |
0 | 173 } MOVStreamContext; |
174 | |
175 typedef struct MOVContext { | |
176 AVFormatContext *fc; | |
118 | 177 int time_scale; |
1027 | 178 int64_t duration; /* duration of the longest track */ |
0 | 179 int found_moov; /* when both 'moov' and 'mdat' sections has been found */ |
180 int found_mdat; /* we suppose we have enough data to read the file */ | |
65 | 181 int64_t mdat_offset; |
0 | 182 int total_streams; |
183 MOVStreamContext *streams[MAX_STREAMS]; | |
118 | 184 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
185 int ctab_size; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
186 MOV_ctab_t **ctab; /* color tables */ |
121 | 187 const struct MOVParseTableEntry *parse_table; /* could be eventually used to change the table */ |
188 /* NOTE: for recursion save to/ restore from local variable! */ | |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
189 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
190 AVPaletteControl palette_control; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
191 MOV_mdat_atom_t *mdat_list; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
192 int mdat_count; |
1268 | 193 DVDemuxContext *dv_demux; |
194 AVFormatContext *dv_fctx; | |
1446
a353426e83e5
reintroduce isom field and read version 1 audio stsd only if file is not isom, fix testclip_wrong_version_1_audio_stsd.mp4
bcoudurier
parents:
1443
diff
changeset
|
195 int isom; /* 1 if file is ISO Media (mp4/3gp) */ |
0 | 196 } MOVContext; |
197 | |
198 | |
199 /* XXX: it's the first time I make a recursive parser I think... sorry if it's ugly :P */ | |
200 | |
201 /* those functions parse an atom */ | |
202 /* return code: | |
203 1: found what I wanted, exit | |
204 0: continue to parse next atom | |
205 -1: error occured, exit | |
206 */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
207 typedef int (*mov_parse_function)(MOVContext *ctx, ByteIOContext *pb, MOV_atom_t atom); |
0 | 208 |
209 /* links atom IDs to parse functions */ | |
210 typedef struct MOVParseTableEntry { | |
65 | 211 uint32_t type; |
0 | 212 mov_parse_function func; |
213 } MOVParseTableEntry; | |
214 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
215 static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 216 { |
121 | 217 int64_t total_size = 0; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
218 MOV_atom_t a; |
0 | 219 int i; |
220 int err = 0; | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
221 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
222 a.offset = atom.offset; |
0 | 223 |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
224 if (atom.size < 0) |
887 | 225 atom.size = 0x7fffffffffffffffLL; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
226 while(((total_size + 8) < atom.size) && !url_feof(pb) && !err) { |
887 | 227 a.size = atom.size; |
228 a.type=0L; | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
229 if(atom.size >= 8) { |
887 | 230 a.size = get_be32(pb); |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
231 a.type = get_le32(pb); |
0 | 232 } |
887 | 233 total_size += 8; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
234 a.offset += 8; |
1010 | 235 dprintf("type: %08x %.4s sz: %"PRIx64" %"PRIx64" %"PRIx64"\n", a.type, (char*)&a.type, a.size, atom.size, total_size); |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
236 if (a.size == 1) { /* 64 bit extended size */ |
887 | 237 a.size = get_be64(pb) - 8; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
238 a.offset += 8; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
239 total_size += 8; |
0 | 240 } |
887 | 241 if (a.size == 0) { |
242 a.size = atom.size - total_size; | |
243 if (a.size <= 8) | |
118 | 244 break; |
887 | 245 } |
246 for (i = 0; c->parse_table[i].type != 0L | |
247 && c->parse_table[i].type != a.type; i++) | |
248 /* empty */; | |
118 | 249 |
887 | 250 a.size -= 8; |
885 | 251 |
639 | 252 if(a.size < 0) |
253 break; | |
885 | 254 |
887 | 255 if (c->parse_table[i].type == 0) { /* skip leaf atoms data */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
256 url_fskip(pb, a.size); |
887 | 257 } else { |
1060 | 258 offset_t start_pos = url_ftell(pb); |
259 int64_t left; | |
887 | 260 err = (c->parse_table[i].func)(c, pb, a); |
1060 | 261 left = a.size - url_ftell(pb) + start_pos; |
262 if (left > 0) /* skip garbage at atom end */ | |
263 url_fskip(pb, left); | |
887 | 264 } |
0 | 265 |
887 | 266 a.offset += a.size; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
267 total_size += a.size; |
0 | 268 } |
269 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
270 if (!err && total_size < atom.size && atom.size < 0x7ffff) { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
271 url_fskip(pb, atom.size - total_size); |
118 | 272 } |
273 | |
0 | 274 return err; |
275 } | |
276 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
277 static int mov_read_ctab(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 278 { |
639 | 279 #if 1 |
280 url_fskip(pb, atom.size); // for now | |
281 #else | |
282 VERY VERY BROKEN, NEVER execute this, needs rewrite | |
683
095009fc2f35
kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
677
diff
changeset
|
283 unsigned int len; |
095009fc2f35
kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
677
diff
changeset
|
284 MOV_ctab_t *t; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
285 c->ctab = av_realloc(c->ctab, ++c->ctab_size); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
286 t = c->ctab[c->ctab_size]; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
287 t->seed = get_be32(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
288 t->flags = get_be16(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
289 t->size = get_be16(pb) + 1; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
290 len = 2 * t->size * 4; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
291 if (len > 0) { |
887 | 292 t->clrs = av_malloc(len); // 16bit A R G B |
293 if (t->clrs) | |
294 get_buffer(pb, t->clrs, len); | |
0 | 295 } |
639 | 296 #endif |
118 | 297 |
0 | 298 return 0; |
299 } | |
300 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
301 static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 302 { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
303 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
65 | 304 uint32_t type; |
305 uint32_t ctype; | |
121 | 306 |
0 | 307 get_byte(pb); /* version */ |
308 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
309 | |
310 /* component type */ | |
311 ctype = get_le32(pb); | |
312 type = get_le32(pb); /* component subtype */ | |
313 | |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
314 dprintf("ctype= %c%c%c%c (0x%08lx)\n", *((char *)&ctype), ((char *)&ctype)[1], ((char *)&ctype)[2], ((char *)&ctype)[3], (long) ctype); |
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
315 dprintf("stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]); |
1446
a353426e83e5
reintroduce isom field and read version 1 audio stsd only if file is not isom, fix testclip_wrong_version_1_audio_stsd.mp4
bcoudurier
parents:
1443
diff
changeset
|
316 if(!ctype) |
a353426e83e5
reintroduce isom field and read version 1 audio stsd only if file is not isom, fix testclip_wrong_version_1_audio_stsd.mp4
bcoudurier
parents:
1443
diff
changeset
|
317 c->isom = 1; |
965
d3b4919dd5ec
simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
964
diff
changeset
|
318 if(type == MKTAG('v', 'i', 'd', 'e')) |
d3b4919dd5ec
simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
964
diff
changeset
|
319 st->codec->codec_type = CODEC_TYPE_VIDEO; |
d3b4919dd5ec
simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
964
diff
changeset
|
320 else if(type == MKTAG('s', 'o', 'u', 'n')) |
d3b4919dd5ec
simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
964
diff
changeset
|
321 st->codec->codec_type = CODEC_TYPE_AUDIO; |
1471
ad18f1010f47
support m1a hdlr mpeg elementary audio handler, fix Po-Slow_Death_64K.mov
bcoudurier
parents:
1448
diff
changeset
|
322 else if(type == MKTAG('m', '1', 'a', ' ')) |
ad18f1010f47
support m1a hdlr mpeg elementary audio handler, fix Po-Slow_Death_64K.mov
bcoudurier
parents:
1448
diff
changeset
|
323 st->codec->codec_id = CODEC_ID_MP2; |
1495
04909cf98da7
partial support for vobsub in mp4, used by nero, unsupported-embedded-subs-2.mp4
bcoudurier
parents:
1471
diff
changeset
|
324 else if(type == MKTAG('s', 'u', 'b', 'p')) { |
04909cf98da7
partial support for vobsub in mp4, used by nero, unsupported-embedded-subs-2.mp4
bcoudurier
parents:
1471
diff
changeset
|
325 st->codec->codec_type = CODEC_TYPE_SUBTITLE; |
04909cf98da7
partial support for vobsub in mp4, used by nero, unsupported-embedded-subs-2.mp4
bcoudurier
parents:
1471
diff
changeset
|
326 st->codec->codec_id = CODEC_ID_DVD_SUBTITLE; |
04909cf98da7
partial support for vobsub in mp4, used by nero, unsupported-embedded-subs-2.mp4
bcoudurier
parents:
1471
diff
changeset
|
327 } |
0 | 328 get_be32(pb); /* component manufacture */ |
329 get_be32(pb); /* component flags */ | |
330 get_be32(pb); /* component flags mask */ | |
331 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
332 if(atom.size <= 24) |
0 | 333 return 0; /* nothing left to read */ |
118 | 334 |
489
aeb69a5f3756
The atom 'skip' should be handled by 'mov_read_leaf()', not by
michael
parents:
438
diff
changeset
|
335 url_fskip(pb, atom.size - (url_ftell(pb) - atom.offset)); |
0 | 336 return 0; |
337 } | |
338 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
339 static int mov_mp4_read_descr_len(ByteIOContext *pb) |
0 | 340 { |
118 | 341 int len = 0; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
342 int count = 4; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
343 while (count--) { |
118 | 344 int c = get_byte(pb); |
887 | 345 len = (len << 7) | (c & 0x7f); |
346 if (!(c & 0x80)) | |
347 break; | |
0 | 348 } |
349 return len; | |
350 } | |
351 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
352 static int mov_mp4_read_descr(ByteIOContext *pb, int *tag) |
0 | 353 { |
354 int len; | |
355 *tag = get_byte(pb); | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
356 len = mov_mp4_read_descr_len(pb); |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
357 dprintf("MPEG4 description: tag=0x%02x len=%d\n", *tag, len); |
0 | 358 return len; |
359 } | |
360 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
361 static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
118 | 362 { |
363 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
364 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; | |
365 int tag, len; | |
121 | 366 |
118 | 367 /* Well, broken but suffisant for some MP4 streams */ |
368 get_be32(pb); /* version + flags */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
369 len = mov_mp4_read_descr(pb, &tag); |
118 | 370 if (tag == MP4ESDescrTag) { |
887 | 371 get_be16(pb); /* ID */ |
372 get_byte(pb); /* priority */ | |
118 | 373 } else |
887 | 374 get_be16(pb); /* ID */ |
118 | 375 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
376 len = mov_mp4_read_descr(pb, &tag); |
118 | 377 if (tag == MP4DecConfigDescrTag) { |
887 | 378 sc->esds.object_type_id = get_byte(pb); |
379 sc->esds.stream_type = get_byte(pb); | |
380 sc->esds.buffer_size_db = get_be24(pb); | |
381 sc->esds.max_bitrate = get_be32(pb); | |
382 sc->esds.avg_bitrate = get_be32(pb); | |
118 | 383 |
943
4e7a66723f1d
mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
928
diff
changeset
|
384 st->codec->codec_id= codec_get_id(ff_mov_obj_type, sc->esds.object_type_id); |
1215 | 385 dprintf("esds object type id %d\n", sc->esds.object_type_id); |
887 | 386 len = mov_mp4_read_descr(pb, &tag); |
387 if (tag == MP4DecSpecificDescrTag) { | |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
388 dprintf("Specific MPEG4 header len=%d\n", len); |
1338 | 389 st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); |
887 | 390 if (st->codec->extradata) { |
391 get_buffer(pb, st->codec->extradata, len); | |
392 st->codec->extradata_size = len; | |
1039 | 393 /* from mplayer */ |
1353 | 394 if ((*st->codec->extradata >> 3) == 29) { |
1039 | 395 st->codec->codec_id = CODEC_ID_MP3ON4; |
396 } | |
887 | 397 } |
398 } | |
118 | 399 } |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
400 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
401 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
402 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
403 /* this atom contains actual media data */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
404 static int mov_read_mdat(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
405 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
406 if(atom.size == 0) /* wrong one (MP4) */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
407 return 0; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
408 c->mdat_list = av_realloc(c->mdat_list, (c->mdat_count + 1) * sizeof(*c->mdat_list)); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
409 c->mdat_list[c->mdat_count].offset = atom.offset; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
410 c->mdat_list[c->mdat_count].size = atom.size; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
411 c->mdat_count++; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
412 c->found_mdat=1; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
413 c->mdat_offset = atom.offset; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
414 if(c->found_moov) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
415 return 1; /* found both, just go */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
416 url_fskip(pb, atom.size); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
417 return 0; /* now go for moov */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
418 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
419 |
963
5783108b1478
add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
959
diff
changeset
|
420 static int mov_read_ftyp(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
5783108b1478
add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
959
diff
changeset
|
421 { |
5783108b1478
add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
959
diff
changeset
|
422 uint32_t type = get_le32(pb); |
5783108b1478
add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
959
diff
changeset
|
423 |
1446
a353426e83e5
reintroduce isom field and read version 1 audio stsd only if file is not isom, fix testclip_wrong_version_1_audio_stsd.mp4
bcoudurier
parents:
1443
diff
changeset
|
424 if (type != MKTAG('q','t',' ',' ')) |
a353426e83e5
reintroduce isom field and read version 1 audio stsd only if file is not isom, fix testclip_wrong_version_1_audio_stsd.mp4
bcoudurier
parents:
1443
diff
changeset
|
425 c->isom = 1; |
1440 | 426 av_log(c->fc, AV_LOG_DEBUG, "ISO: File Type Major Brand: %.4s\n",(char *)&type); |
963
5783108b1478
add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
959
diff
changeset
|
427 get_be32(pb); /* minor version */ |
5783108b1478
add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
959
diff
changeset
|
428 url_fskip(pb, atom.size - 8); |
5783108b1478
add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
959
diff
changeset
|
429 return 0; |
5783108b1478
add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
959
diff
changeset
|
430 } |
5783108b1478
add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
959
diff
changeset
|
431 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
432 /* this atom should contain all header atoms */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
433 static int mov_read_moov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
434 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
435 int err; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
436 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
437 err = mov_read_default(c, pb, atom); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
438 /* we parsed the 'moov' atom, we can terminate the parsing as soon as we find the 'mdat' */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
439 /* so we don't parse the whole file if over a network */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
440 c->found_moov=1; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
441 if(c->found_mdat) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
442 return 1; /* found both, just go */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
443 return 0; /* now go for mdat */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
444 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
445 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
446 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
447 static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
448 { |
1023 | 449 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
450 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; | |
451 int version = get_byte(pb); | |
889
22b044eeeaed
fix parsing version 1 mdhd atom (64 bit) as suggested by b-o-n-d AT gmx DOT net (unstested); added code to map language codes to stream->language[]
mmu_man
parents:
887
diff
changeset
|
452 int lang; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
453 |
889
22b044eeeaed
fix parsing version 1 mdhd atom (64 bit) as suggested by b-o-n-d AT gmx DOT net (unstested); added code to map language codes to stream->language[]
mmu_man
parents:
887
diff
changeset
|
454 if (version > 1) |
22b044eeeaed
fix parsing version 1 mdhd atom (64 bit) as suggested by b-o-n-d AT gmx DOT net (unstested); added code to map language codes to stream->language[]
mmu_man
parents:
887
diff
changeset
|
455 return 1; /* unsupported */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
456 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
457 get_byte(pb); get_byte(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
458 get_byte(pb); /* flags */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
459 |
1023 | 460 if (version == 1) { |
461 get_be64(pb); | |
462 get_be64(pb); | |
463 } else { | |
464 get_be32(pb); /* creation time */ | |
465 get_be32(pb); /* modification time */ | |
466 } | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
467 |
1023 | 468 sc->time_scale = get_be32(pb); |
469 st->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
470 |
889
22b044eeeaed
fix parsing version 1 mdhd atom (64 bit) as suggested by b-o-n-d AT gmx DOT net (unstested); added code to map language codes to stream->language[]
mmu_man
parents:
887
diff
changeset
|
471 lang = get_be16(pb); /* language */ |
1023 | 472 ff_mov_lang_to_iso639(lang, st->language); |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
473 get_be16(pb); /* quality */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
474 |
118 | 475 return 0; |
476 } | |
477 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
478 static int mov_read_mvhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
479 { |
1022 | 480 int version = get_byte(pb); /* version */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
481 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
482 |
1022 | 483 if (version == 1) { |
484 get_be64(pb); | |
485 get_be64(pb); | |
486 } else { | |
487 get_be32(pb); /* creation time */ | |
488 get_be32(pb); /* modification time */ | |
489 } | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
490 c->time_scale = get_be32(pb); /* time scale */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
491 #ifdef DEBUG |
491 | 492 av_log(NULL, AV_LOG_DEBUG, "time scale = %i\n", c->time_scale); |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
493 #endif |
1022 | 494 c->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
495 get_be32(pb); /* preferred scale */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
496 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
497 get_be16(pb); /* preferred volume */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
498 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
499 url_fskip(pb, 10); /* reserved */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
500 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
501 url_fskip(pb, 36); /* display matrix */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
502 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
503 get_be32(pb); /* preview time */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
504 get_be32(pb); /* preview duration */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
505 get_be32(pb); /* poster time */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
506 get_be32(pb); /* selection time */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
507 get_be32(pb); /* selection duration */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
508 get_be32(pb); /* current time */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
509 get_be32(pb); /* next track ID */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
510 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
511 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
512 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
513 |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
514 static int mov_read_smi(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
515 { |
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
516 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
517 |
639 | 518 if((uint64_t)atom.size > (1<<30)) |
519 return -1; | |
885 | 520 |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
521 // currently SVQ3 decoder expect full STSD header - so let's fake it |
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
522 // this should be fixed and just SMI header should be passed |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
523 av_free(st->codec->extradata); |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
524 st->codec->extradata_size = 0x5a + atom.size; |
1338 | 525 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
526 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
527 if (st->codec->extradata) { |
1731 | 528 memcpy(st->codec->extradata, "SVQ3", 4); // fake |
1353 | 529 get_buffer(pb, st->codec->extradata + 0x5a, atom.size); |
530 dprintf("Reading SMI %"PRId64" %s\n", atom.size, st->codec->extradata + 0x5a); | |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
531 } else |
887 | 532 url_fskip(pb, atom.size); |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
533 |
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
534 return 0; |
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
535 } |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
536 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
537 static int mov_read_enda(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
538 { |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
539 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
540 int little_endian = get_be16(pb); |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
541 |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
542 if (little_endian) { |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
543 switch (st->codec->codec_id) { |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
544 case CODEC_ID_PCM_S24BE: |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
545 st->codec->codec_id = CODEC_ID_PCM_S24LE; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
546 break; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
547 case CODEC_ID_PCM_S32BE: |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
548 st->codec->codec_id = CODEC_ID_PCM_S32LE; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
549 break; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
550 default: |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
551 break; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
552 } |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
553 } |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
554 return 0; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
555 } |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
556 |
1834 | 557 /* FIXME modify qdm2/svq3/h264 decoders to take full atom as extradata */ |
558 static int mov_read_extradata(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) | |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
559 { |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
560 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
1834 | 561 if((uint64_t)atom.size > (1<<30)) |
562 return -1; | |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
563 av_free(st->codec->extradata); |
1834 | 564 st->codec->extradata_size = atom.size + 8; |
1338 | 565 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
566 if (st->codec->extradata) { |
1834 | 567 AV_WL32(st->codec->extradata + 4, atom.type); |
568 get_buffer(pb, st->codec->extradata + 8, atom.size); | |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
569 } else |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
570 url_fskip(pb, atom.size); |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
571 return 0; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
572 } |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
573 |
865 | 574 static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
575 { | |
576 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
577 | |
578 if((uint64_t)atom.size > (1<<30)) | |
579 return -1; | |
885 | 580 |
947
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
581 if (st->codec->codec_id == CODEC_ID_QDM2) { |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
582 // pass all frma atom to codec, needed at least for QDM2 |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
583 av_free(st->codec->extradata); |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
584 st->codec->extradata_size = atom.size; |
1338 | 585 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
865 | 586 |
947
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
587 if (st->codec->extradata) { |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
588 get_buffer(pb, st->codec->extradata, atom.size); |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
589 } else |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
590 url_fskip(pb, atom.size); |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
591 } else if (atom.size > 8) { /* to read frma, esds atoms */ |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
592 mov_read_default(c, pb, atom); |
1060 | 593 } else |
887 | 594 url_fskip(pb, atom.size); |
865 | 595 return 0; |
596 } | |
597 | |
615 | 598 static int mov_read_avcC(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
599 { | |
600 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
601 | |
639 | 602 if((uint64_t)atom.size > (1<<30)) |
603 return -1; | |
604 | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
605 av_free(st->codec->extradata); |
615 | 606 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
607 st->codec->extradata_size = atom.size; |
1338 | 608 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
615 | 609 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
610 if (st->codec->extradata) { |
887 | 611 get_buffer(pb, st->codec->extradata, atom.size); |
615 | 612 } else |
887 | 613 url_fskip(pb, atom.size); |
615 | 614 |
615 return 0; | |
616 } | |
617 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
618 static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 619 { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
620 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
621 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
639 | 622 unsigned int i, entries; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
623 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
624 get_byte(pb); /* version */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
625 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
626 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
627 entries = get_be32(pb); |
885 | 628 |
639 | 629 if(entries >= UINT_MAX/sizeof(int64_t)) |
630 return -1; | |
885 | 631 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
632 sc->chunk_count = entries; |
1338 | 633 sc->chunk_offsets = av_malloc(entries * sizeof(int64_t)); |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
634 if (!sc->chunk_offsets) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
635 return -1; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
636 if (atom.type == MKTAG('s', 't', 'c', 'o')) { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
637 for(i=0; i<entries; i++) { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
638 sc->chunk_offsets[i] = get_be32(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
639 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
640 } else if (atom.type == MKTAG('c', 'o', '6', '4')) { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
641 for(i=0; i<entries; i++) { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
642 sc->chunk_offsets[i] = get_be64(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
643 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
644 } else |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
645 return -1; |
885 | 646 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
647 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
648 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
649 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
650 static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
651 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
652 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
849
44b415886cbf
sample_rate value is not always correct (is there anything in quicktime which is?) so try to guess it from time_scale
michael
parents:
822
diff
changeset
|
653 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
654 int entries, frames_per_sample; |
65 | 655 uint32_t format; |
657
5b9575f5b6e8
mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents:
655
diff
changeset
|
656 uint8_t codec_name[32]; |
121 | 657 |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
658 /* for palette traversal */ |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
659 int color_depth; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
660 int color_start; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
661 int color_count; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
662 int color_end; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
663 int color_index; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
664 int color_dec; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
665 int color_greyscale; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
666 unsigned char *color_table; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
667 int j; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
668 unsigned char r, g, b; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
669 |
0 | 670 get_byte(pb); /* version */ |
671 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
672 | |
673 entries = get_be32(pb); | |
674 | |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
675 while(entries--) { //Parsing Sample description table |
121 | 676 enum CodecID id; |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
677 MOV_atom_t a = { 0, 0, 0 }; |
947
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
678 offset_t start_pos = url_ftell(pb); |
887 | 679 int size = get_be32(pb); /* size */ |
0 | 680 format = get_le32(pb); /* data format */ |
118 | 681 |
0 | 682 get_be32(pb); /* reserved */ |
683 get_be16(pb); /* reserved */ | |
684 get_be16(pb); /* index */ | |
685 | |
1156 | 686 if (st->codec->codec_tag) { |
687 /* multiple fourcc, just skip for now */ | |
688 url_fskip(pb, size - (url_ftell(pb) - start_pos)); | |
689 continue; | |
690 } | |
691 | |
887 | 692 st->codec->codec_tag = format; |
1843 | 693 id = codec_get_id(codec_movaudio_tags, format); |
1448
e8dc38807927
do not overwrite codec type if already known, fix conflict between 'raw ' fourcc used for audio and video, ae002_wordup.mov
bcoudurier
parents:
1447
diff
changeset
|
694 if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) { |
1032 | 695 st->codec->codec_type = CODEC_TYPE_AUDIO; |
1448
e8dc38807927
do not overwrite codec type if already known, fix conflict between 'raw ' fourcc used for audio and video, ae002_wordup.mov
bcoudurier
parents:
1447
diff
changeset
|
696 } else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */ |
e8dc38807927
do not overwrite codec type if already known, fix conflict between 'raw ' fourcc used for audio and video, ae002_wordup.mov
bcoudurier
parents:
1447
diff
changeset
|
697 format && format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */ |
1843 | 698 id = codec_get_id(codec_movvideo_tags, format); |
1032 | 699 if (id <= 0) |
700 id = codec_get_id(codec_bmp_tags, format); | |
701 if (id > 0) | |
702 st->codec->codec_type = CODEC_TYPE_VIDEO; | |
703 } | |
704 | |
1067
3d7fae1dfda4
skip null fourcc, fix ep2_mystery_m640_dummy.mov
bcoudurier
parents:
1063
diff
changeset
|
705 dprintf("size=%d 4CC= %c%c%c%c codec_type=%d\n", |
3d7fae1dfda4
skip null fourcc, fix ep2_mystery_m640_dummy.mov
bcoudurier
parents:
1063
diff
changeset
|
706 size, |
3d7fae1dfda4
skip null fourcc, fix ep2_mystery_m640_dummy.mov
bcoudurier
parents:
1063
diff
changeset
|
707 (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, (format >> 24) & 0xff, |
3d7fae1dfda4
skip null fourcc, fix ep2_mystery_m640_dummy.mov
bcoudurier
parents:
1063
diff
changeset
|
708 st->codec->codec_type); |
3d7fae1dfda4
skip null fourcc, fix ep2_mystery_m640_dummy.mov
bcoudurier
parents:
1063
diff
changeset
|
709 |
887 | 710 if(st->codec->codec_type==CODEC_TYPE_VIDEO) { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
711 st->codec->codec_id = id; |
0 | 712 get_be16(pb); /* version */ |
713 get_be16(pb); /* revision level */ | |
714 get_be32(pb); /* vendor */ | |
715 get_be32(pb); /* temporal quality */ | |
716 get_be32(pb); /* spacial quality */ | |
1063
f0de744f87f9
set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay
bcoudurier
parents:
1062
diff
changeset
|
717 |
f0de744f87f9
set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay
bcoudurier
parents:
1062
diff
changeset
|
718 st->codec->width = get_be16(pb); /* width */ |
f0de744f87f9
set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay
bcoudurier
parents:
1062
diff
changeset
|
719 st->codec->height = get_be16(pb); /* height */ |
f0de744f87f9
set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay
bcoudurier
parents:
1062
diff
changeset
|
720 |
0 | 721 get_be32(pb); /* horiz resolution */ |
722 get_be32(pb); /* vert resolution */ | |
723 get_be32(pb); /* data size, always 0 */ | |
118 | 724 frames_per_sample = get_be16(pb); /* frames per samples */ |
0 | 725 #ifdef DEBUG |
887 | 726 av_log(NULL, AV_LOG_DEBUG, "frames/samples = %d\n", frames_per_sample); |
0 | 727 #endif |
1011 | 728 get_buffer(pb, codec_name, 32); /* codec name, pascal string (FIXME: true for mp4?) */ |
729 if (codec_name[0] <= 31) { | |
730 memcpy(st->codec->codec_name, &codec_name[1],codec_name[0]); | |
731 st->codec->codec_name[codec_name[0]] = 0; | |
732 } | |
0 | 733 |
887 | 734 st->codec->bits_per_sample = get_be16(pb); /* depth */ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
735 st->codec->color_table_id = get_be16(pb); /* colortable id */ |
118 | 736 |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
737 /* figure out the palette situation */ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
738 color_depth = st->codec->bits_per_sample & 0x1F; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
739 color_greyscale = st->codec->bits_per_sample & 0x20; |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
740 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
741 /* if the depth is 2, 4, or 8 bpp, file is palettized */ |
885 | 742 if ((color_depth == 2) || (color_depth == 4) || |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
743 (color_depth == 8)) { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
744 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
745 if (color_greyscale) { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
746 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
747 /* compute the greyscale palette */ |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
748 color_count = 1 << color_depth; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
749 color_index = 255; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
750 color_dec = 256 / (color_count - 1); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
751 for (j = 0; j < color_count; j++) { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
752 r = g = b = color_index; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
753 c->palette_control.palette[j] = |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
754 (r << 16) | (g << 8) | (b); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
755 color_index -= color_dec; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
756 if (color_index < 0) |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
757 color_index = 0; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
758 } |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
759 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
760 } else if (st->codec->color_table_id & 0x08) { |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
761 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
762 /* if flag bit 3 is set, use the default palette */ |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
763 color_count = 1 << color_depth; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
764 if (color_depth == 2) |
431 | 765 color_table = ff_qt_default_palette_4; |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
766 else if (color_depth == 4) |
431 | 767 color_table = ff_qt_default_palette_16; |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
768 else |
431 | 769 color_table = ff_qt_default_palette_256; |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
770 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
771 for (j = 0; j < color_count; j++) { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
772 r = color_table[j * 4 + 0]; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
773 g = color_table[j * 4 + 1]; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
774 b = color_table[j * 4 + 2]; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
775 c->palette_control.palette[j] = |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
776 (r << 16) | (g << 8) | (b); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
777 } |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
778 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
779 } else { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
780 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
781 /* load the palette from the file */ |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
782 color_start = get_be32(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
783 color_count = get_be16(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
784 color_end = get_be16(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
785 for (j = color_start; j <= color_end; j++) { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
786 /* each R, G, or B component is 16 bits; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
787 * only use the top 8 bits; skip alpha bytes |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
788 * up front */ |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
789 get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
790 get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
791 r = get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
792 get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
793 g = get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
794 get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
795 b = get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
796 get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
797 c->palette_control.palette[j] = |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
798 (r << 16) | (g << 8) | (b); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
799 } |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
800 } |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
801 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
802 st->codec->palctrl = &c->palette_control; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
803 st->codec->palctrl->palette_changed = 1; |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
804 } else |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
805 st->codec->palctrl = NULL; |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
806 } else if(st->codec->codec_type==CODEC_TYPE_AUDIO) { |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
807 int bits_per_sample; |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
808 uint16_t version = get_be16(pb); |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
809 |
1032 | 810 st->codec->codec_id = id; |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
811 get_be16(pb); /* revision level */ |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
812 get_be32(pb); /* vendor */ |
118 | 813 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
814 st->codec->channels = get_be16(pb); /* channel count */ |
1215 | 815 dprintf("audio channels %d\n", st->codec->channels); |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
816 st->codec->bits_per_sample = get_be16(pb); /* sample size */ |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
817 /* do we need to force to 16 for AMR ? */ |
690
fec605ce7d4a
mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents:
683
diff
changeset
|
818 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
819 /* handle specific s8 codec */ |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
820 get_be16(pb); /* compression id = 0*/ |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
821 get_be16(pb); /* packet size = 0 */ |
849
44b415886cbf
sample_rate value is not always correct (is there anything in quicktime which is?) so try to guess it from time_scale
michael
parents:
822
diff
changeset
|
822 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
823 st->codec->sample_rate = ((get_be32(pb) >> 16)); |
690
fec605ce7d4a
mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents:
683
diff
changeset
|
824 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
825 switch (st->codec->codec_id) { |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
826 case CODEC_ID_PCM_S8: |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
827 case CODEC_ID_PCM_U8: |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
828 if (st->codec->bits_per_sample == 16) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
829 st->codec->codec_id = CODEC_ID_PCM_S16BE; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
830 break; |
1029 | 831 case CODEC_ID_PCM_S16LE: |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
832 case CODEC_ID_PCM_S16BE: |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
833 if (st->codec->bits_per_sample == 8) |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
834 st->codec->codec_id = CODEC_ID_PCM_S8; |
1334
5825a7bc0d96
change codec id if sample size field is set to 24 in stsd, fix Sony-mx5p.mov
bcoudurier
parents:
1299
diff
changeset
|
835 else if (st->codec->bits_per_sample == 24) |
5825a7bc0d96
change codec id if sample size field is set to 24 in stsd, fix Sony-mx5p.mov
bcoudurier
parents:
1299
diff
changeset
|
836 st->codec->codec_id = CODEC_ID_PCM_S24BE; |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
837 break; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
838 default: |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
839 break; |
428
5ac07c7b4874
correctly identify AAC audio in mov/mp4/etc. files. patch by ("Thomas Raivio" <tjraivio at cc dot hut dot fi>)
michael
parents:
401
diff
changeset
|
840 } |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
841 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
842 //Read QT version 1 fields. In version 0 theese dont exist |
1446
a353426e83e5
reintroduce isom field and read version 1 audio stsd only if file is not isom, fix testclip_wrong_version_1_audio_stsd.mp4
bcoudurier
parents:
1443
diff
changeset
|
843 dprintf("version =%d, isom =%d\n",version,c->isom); |
a353426e83e5
reintroduce isom field and read version 1 audio stsd only if file is not isom, fix testclip_wrong_version_1_audio_stsd.mp4
bcoudurier
parents:
1443
diff
changeset
|
844 if(!c->isom) { |
1447 | 845 if(version==1) { |
846 sc->sample_size_v1.den = get_be32(pb); /* samples per packet */ | |
847 get_be32(pb); /* bytes per packet */ | |
848 sc->sample_size_v1.num = get_be32(pb); /* bytes per frame */ | |
849 get_be32(pb); /* bytes per sample */ | |
850 } else if(version==2) { | |
851 get_be32(pb); /* sizeof struct only */ | |
852 st->codec->sample_rate = av_int2dbl(get_be64(pb)); /* float 64 */ | |
853 st->codec->channels = get_be32(pb); | |
854 get_be32(pb); /* always 0x7F000000 */ | |
855 get_be32(pb); /* bits per channel if sound is uncompressed */ | |
856 get_be32(pb); /* lcpm format specific flag */ | |
857 get_be32(pb); /* bytes per audio packet if constant */ | |
858 get_be32(pb); /* lpcm frames per audio packet if constant */ | |
859 } | |
1446
a353426e83e5
reintroduce isom field and read version 1 audio stsd only if file is not isom, fix testclip_wrong_version_1_audio_stsd.mp4
bcoudurier
parents:
1443
diff
changeset
|
860 } |
1336
06a5d191774d
move sample size adjusting code after audio stsd v2 parsing to let v2 set correct channel number, fix Sony-hdv2.mov
bcoudurier
parents:
1335
diff
changeset
|
861 |
06a5d191774d
move sample size adjusting code after audio stsd v2 parsing to let v2 set correct channel number, fix Sony-hdv2.mov
bcoudurier
parents:
1335
diff
changeset
|
862 bits_per_sample = av_get_bits_per_sample(st->codec->codec_id); |
06a5d191774d
move sample size adjusting code after audio stsd v2 parsing to let v2 set correct channel number, fix Sony-hdv2.mov
bcoudurier
parents:
1335
diff
changeset
|
863 if (bits_per_sample) { |
06a5d191774d
move sample size adjusting code after audio stsd v2 parsing to let v2 set correct channel number, fix Sony-hdv2.mov
bcoudurier
parents:
1335
diff
changeset
|
864 st->codec->bits_per_sample = bits_per_sample; |
06a5d191774d
move sample size adjusting code after audio stsd v2 parsing to let v2 set correct channel number, fix Sony-hdv2.mov
bcoudurier
parents:
1335
diff
changeset
|
865 sc->sample_size = (bits_per_sample >> 3) * st->codec->channels; |
06a5d191774d
move sample size adjusting code after audio stsd v2 parsing to let v2 set correct channel number, fix Sony-hdv2.mov
bcoudurier
parents:
1335
diff
changeset
|
866 } |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
867 } else { |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
868 /* other codec type, just skip (rtp, mp4s, tmcd ...) */ |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
869 url_fskip(pb, size - (url_ftell(pb) - start_pos)); |
0 | 870 } |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
871 /* this will read extra atoms at the end (wave, alac, damr, avcC, SMI ...) */ |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
872 a.size = size - (url_ftell(pb) - start_pos); |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
873 if (a.size > 8) |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
874 mov_read_default(c, pb, a); |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
875 else if (a.size > 0) |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
876 url_fskip(pb, a.size); |
0 | 877 } |
885 | 878 |
849
44b415886cbf
sample_rate value is not always correct (is there anything in quicktime which is?) so try to guess it from time_scale
michael
parents:
822
diff
changeset
|
879 if(st->codec->codec_type==CODEC_TYPE_AUDIO && st->codec->sample_rate==0 && sc->time_scale>1) { |
44b415886cbf
sample_rate value is not always correct (is there anything in quicktime which is?) so try to guess it from time_scale
michael
parents:
822
diff
changeset
|
880 st->codec->sample_rate= sc->time_scale; |
44b415886cbf
sample_rate value is not always correct (is there anything in quicktime which is?) so try to guess it from time_scale
michael
parents:
822
diff
changeset
|
881 } |
1039 | 882 |
1271
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
883 /* special codec parameters handling */ |
1039 | 884 switch (st->codec->codec_id) { |
1271
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
885 #ifdef CONFIG_H261_DECODER |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
886 case CODEC_ID_H261: |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
887 #endif |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
888 #ifdef CONFIG_H263_DECODER |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
889 case CODEC_ID_H263: |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
890 #endif |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
891 #ifdef CONFIG_MPEG4_DECODER |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
892 case CODEC_ID_MPEG4: |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
893 #endif |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
894 st->codec->width= 0; /* let decoder init width/height */ |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
895 st->codec->height= 0; |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
896 break; |
1621
2f3091d284f8
Rename variables: faad --> libfaad, faac --> libfaac, faadbin --> libfaadbin
diego
parents:
1495
diff
changeset
|
897 #ifdef CONFIG_LIBFAAD |
1039 | 898 case CODEC_ID_AAC: |
899 #endif | |
1040
3c523d59d55c
let vorbis decoder init too, fix mi2_vorbis51.mp4
bcoudurier
parents:
1039
diff
changeset
|
900 #ifdef CONFIG_VORBIS_DECODER |
3c523d59d55c
let vorbis decoder init too, fix mi2_vorbis51.mp4
bcoudurier
parents:
1039
diff
changeset
|
901 case CODEC_ID_VORBIS: |
3c523d59d55c
let vorbis decoder init too, fix mi2_vorbis51.mp4
bcoudurier
parents:
1039
diff
changeset
|
902 #endif |
1039 | 903 case CODEC_ID_MP3ON4: |
904 st->codec->sample_rate= 0; /* let decoder init parameters properly */ | |
905 break; | |
1269 | 906 #ifdef CONFIG_DV_DEMUXER |
1268 | 907 case CODEC_ID_DVAUDIO: |
908 c->dv_fctx = av_alloc_format_context(); | |
909 c->dv_demux = dv_init_demux(c->dv_fctx); | |
910 if (!c->dv_demux) { | |
911 av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n"); | |
912 return -1; | |
913 } | |
914 sc->dv_audio_container = 1; | |
915 st->codec->codec_id = CODEC_ID_PCM_S16LE; | |
916 break; | |
1269 | 917 #endif |
1272
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
918 /* no ifdef since parameters are always those */ |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
919 case CODEC_ID_AMR_WB: |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
920 st->codec->sample_rate= 16000; |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
921 st->codec->channels= 1; /* really needed */ |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
922 break; |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
923 case CODEC_ID_AMR_NB: |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
924 st->codec->sample_rate= 8000; |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
925 st->codec->channels= 1; /* really needed */ |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
926 break; |
1299 | 927 case CODEC_ID_MP2: |
1471
ad18f1010f47
support m1a hdlr mpeg elementary audio handler, fix Po-Slow_Death_64K.mov
bcoudurier
parents:
1448
diff
changeset
|
928 st->codec->codec_type = CODEC_TYPE_AUDIO; /* force type after stsd for m1a hdlr */ |
1299 | 929 st->need_parsing = 1; |
930 break; | |
1039 | 931 default: |
932 break; | |
1033
a757a0a3824f
let faad init parameters properly, fix many SBR samples
bcoudurier
parents:
1032
diff
changeset
|
933 } |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
934 |
0 | 935 return 0; |
936 } | |
937 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
938 static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 939 { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
940 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
941 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
639 | 942 unsigned int i, entries; |
0 | 943 |
944 get_byte(pb); /* version */ | |
945 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
946 | |
947 entries = get_be32(pb); | |
885 | 948 |
639 | 949 if(entries >= UINT_MAX / sizeof(MOV_sample_to_chunk_tbl)) |
950 return -1; | |
885 | 951 |
0 | 952 #ifdef DEBUG |
491 | 953 av_log(NULL, AV_LOG_DEBUG, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1, entries); |
0 | 954 #endif |
955 sc->sample_to_chunk_sz = entries; | |
1338 | 956 sc->sample_to_chunk = av_malloc(entries * sizeof(MOV_sample_to_chunk_tbl)); |
121 | 957 if (!sc->sample_to_chunk) |
958 return -1; | |
0 | 959 for(i=0; i<entries; i++) { |
960 sc->sample_to_chunk[i].first = get_be32(pb); | |
961 sc->sample_to_chunk[i].count = get_be32(pb); | |
962 sc->sample_to_chunk[i].id = get_be32(pb); | |
963 } | |
964 return 0; | |
965 } | |
966 | |
383
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
967 static int mov_read_stss(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
968 { |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
969 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
970 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
639 | 971 unsigned int i, entries; |
383
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
972 |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
973 get_byte(pb); /* version */ |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
974 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
975 |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
976 entries = get_be32(pb); |
885 | 977 |
639 | 978 if(entries >= UINT_MAX / sizeof(long)) |
979 return -1; | |
885 | 980 |
383
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
981 sc->keyframe_count = entries; |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
982 #ifdef DEBUG |
1734 | 983 av_log(NULL, AV_LOG_DEBUG, "keyframe_count = %d\n", sc->keyframe_count); |
383
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
984 #endif |
1338 | 985 sc->keyframes = av_malloc(entries * sizeof(long)); |
383
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
986 if (!sc->keyframes) |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
987 return -1; |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
988 for(i=0; i<entries; i++) { |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
989 sc->keyframes[i] = get_be32(pb); |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
990 #ifdef DEBUG |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
991 /* av_log(NULL, AV_LOG_DEBUG, "keyframes[]=%ld\n", sc->keyframes[i]); */ |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
992 #endif |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
993 } |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
994 return 0; |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
995 } |
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
996 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
997 static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 998 { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
999 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1000 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1001 unsigned int i, entries, sample_size; |
121 | 1002 |
0 | 1003 get_byte(pb); /* version */ |
1004 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
118 | 1005 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1006 sample_size = get_be32(pb); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1007 if (!sc->sample_size) /* do not overwrite value computed in stsd */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1008 sc->sample_size = sample_size; |
0 | 1009 entries = get_be32(pb); |
639 | 1010 if(entries >= UINT_MAX / sizeof(long)) |
1011 return -1; | |
1012 | |
0 | 1013 sc->sample_count = entries; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1014 if (sample_size) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1015 return 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1016 |
0 | 1017 #ifdef DEBUG |
1734 | 1018 av_log(NULL, AV_LOG_DEBUG, "sample_size = %d sample_count = %d\n", sc->sample_size, sc->sample_count); |
0 | 1019 #endif |
1338 | 1020 sc->sample_sizes = av_malloc(entries * sizeof(long)); |
121 | 1021 if (!sc->sample_sizes) |
1022 return -1; | |
0 | 1023 for(i=0; i<entries; i++) { |
1024 sc->sample_sizes[i] = get_be32(pb); | |
1025 #ifdef DEBUG | |
653
c61da0556426
Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents:
652
diff
changeset
|
1026 av_log(NULL, AV_LOG_DEBUG, "sample_sizes[]=%ld\n", sc->sample_sizes[i]); |
0 | 1027 #endif |
1028 } | |
1029 return 0; | |
1030 } | |
1031 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1032 static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 1033 { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1034 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
928 | 1035 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
639 | 1036 unsigned int i, entries; |
395
c1ed10f3b052
cleanup frame_rate code, this may also fix some large file bugs
michael
parents:
383
diff
changeset
|
1037 int64_t duration=0; |
c1ed10f3b052
cleanup frame_rate code, this may also fix some large file bugs
michael
parents:
383
diff
changeset
|
1038 int64_t total_sample_count=0; |
121 | 1039 |
0 | 1040 get_byte(pb); /* version */ |
1041 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
1042 entries = get_be32(pb); | |
670 | 1043 if(entries >= UINT_MAX / sizeof(Time2Sample)) |
639 | 1044 return -1; |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
1045 |
928 | 1046 sc->stts_count = entries; |
1047 sc->stts_data = av_malloc(entries * sizeof(Time2Sample)); | |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
1048 |
0 | 1049 #ifdef DEBUG |
491 | 1050 av_log(NULL, AV_LOG_DEBUG, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1, entries); |
0 | 1051 #endif |
928 | 1052 |
1053 sc->time_rate=0; | |
1054 | |
0 | 1055 for(i=0; i<entries; i++) { |
670 | 1056 int sample_duration; |
1057 int sample_count; | |
0 | 1058 |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
1059 sample_count=get_be32(pb); |
0 | 1060 sample_duration = get_be32(pb); |
928 | 1061 sc->stts_data[i].count= sample_count; |
1062 sc->stts_data[i].duration= sample_duration; | |
1063 | |
1064 sc->time_rate= ff_gcd(sc->time_rate, sample_duration); | |
794
040cf31abb4b
another chapter in the neverending mov demuxer cleanup
michael
parents:
775
diff
changeset
|
1065 |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1066 dprintf("sample_count=%d, sample_duration=%d\n",sample_count,sample_duration); |
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1067 |
1027 | 1068 duration+=(int64_t)sample_duration*sample_count; |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
1069 total_sample_count+=sample_count; |
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
1070 } |
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
1071 |
794
040cf31abb4b
another chapter in the neverending mov demuxer cleanup
michael
parents:
775
diff
changeset
|
1072 st->nb_frames= total_sample_count; |
040cf31abb4b
another chapter in the neverending mov demuxer cleanup
michael
parents:
775
diff
changeset
|
1073 if(duration) |
040cf31abb4b
another chapter in the neverending mov demuxer cleanup
michael
parents:
775
diff
changeset
|
1074 st->duration= duration; |
0 | 1075 return 0; |
1076 } | |
1077 | |
671 | 1078 static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
1079 { | |
1005
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1080 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1081 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
671 | 1082 unsigned int i, entries; |
1083 | |
1084 get_byte(pb); /* version */ | |
1085 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
1086 entries = get_be32(pb); | |
1087 if(entries >= UINT_MAX / sizeof(Time2Sample)) | |
1088 return -1; | |
1089 | |
1005
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1090 sc->ctts_count = entries; |
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1091 sc->ctts_data = av_malloc(entries * sizeof(Time2Sample)); |
671 | 1092 |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1093 dprintf("track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries); |
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1094 |
671 | 1095 for(i=0; i<entries; i++) { |
1005
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1096 int count =get_be32(pb); |
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1097 int duration =get_be32(pb); |
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1098 |
1042
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1099 if (duration < 0) { |
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1100 av_log(c->fc, AV_LOG_ERROR, "negative ctts, ignoring\n"); |
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1101 sc->ctts_count = 0; |
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1102 url_fskip(pb, 8 * (entries - i - 1)); |
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1103 break; |
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1104 } |
1005
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1105 sc->ctts_data[i].count = count; |
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1106 sc->ctts_data[i].duration= duration; |
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1107 |
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1108 sc->time_rate= ff_gcd(sc->time_rate, duration); |
671 | 1109 } |
1110 return 0; | |
1111 } | |
1112 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1113 static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1114 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1115 AVStream *st; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1116 MOVStreamContext *sc; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1117 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1118 st = av_new_stream(c->fc, c->fc->nb_streams); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1119 if (!st) return -2; |
1338 | 1120 sc = av_mallocz(sizeof(MOVStreamContext)); |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1121 if (!sc) { |
887 | 1122 av_free(st); |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1123 return -1; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1124 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1125 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1126 st->priv_data = sc; |
1118 | 1127 st->codec->codec_type = CODEC_TYPE_DATA; |
191 | 1128 st->start_time = 0; /* XXX: check */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1129 c->streams[c->fc->nb_streams-1] = sc; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1130 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1131 return mov_read_default(c, pb, atom); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1132 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1133 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1134 static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1135 { |
1023 | 1136 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
1137 int version = get_byte(pb); | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1138 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1139 get_byte(pb); get_byte(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1140 get_byte(pb); /* flags */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1141 /* |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1142 MOV_TRACK_ENABLED 0x0001 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1143 MOV_TRACK_IN_MOVIE 0x0002 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1144 MOV_TRACK_IN_PREVIEW 0x0004 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1145 MOV_TRACK_IN_POSTER 0x0008 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1146 */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1147 |
1022 | 1148 if (version == 1) { |
1149 get_be64(pb); | |
1150 get_be64(pb); | |
1151 } else { | |
1152 get_be32(pb); /* creation time */ | |
1153 get_be32(pb); /* modification time */ | |
1154 } | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1155 st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1156 get_be32(pb); /* reserved */ |
191 | 1157 st->start_time = 0; /* check */ |
1022 | 1158 (version == 1) ? get_be64(pb) : get_be32(pb); /* highlevel (considering edits) duration in movie timebase */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1159 get_be32(pb); /* reserved */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1160 get_be32(pb); /* reserved */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1161 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1162 get_be16(pb); /* layer */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1163 get_be16(pb); /* alternate group */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1164 get_be16(pb); /* volume */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1165 get_be16(pb); /* reserved */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1166 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1167 url_fskip(pb, 36); /* display matrix */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1168 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1169 /* those are fixed-point */ |
1113 | 1170 get_be32(pb); /* track width */ |
1171 get_be32(pb); /* track height */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1172 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1173 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1174 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1175 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1176 /* this atom should be null (from specs), but some buggy files put the 'moov' atom inside it... */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1177 /* like the files created with Adobe Premiere 5.0, for samples see */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1178 /* http://graphics.tudelft.nl/~wouter/publications/soundtests/ */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1179 static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1180 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1181 int err; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1182 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1183 if (atom.size < 8) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1184 return 0; /* continue */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1185 if (get_be32(pb) != 0) { /* 0 sized mdat atom... use the 'wide' atom size */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1186 url_fskip(pb, atom.size - 4); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1187 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1188 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1189 atom.type = get_le32(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1190 atom.offset += 8; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1191 atom.size -= 8; |
131 | 1192 if (atom.type != MKTAG('m', 'd', 'a', 't')) { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1193 url_fskip(pb, atom.size); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1194 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1195 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1196 err = mov_read_mdat(c, pb, atom); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1197 return err; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1198 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1199 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1200 static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 1201 { |
1404
53803884feb7
warn about zlib support needed if file has compressed moov atom
bcoudurier
parents:
1403
diff
changeset
|
1202 #ifdef CONFIG_ZLIB |
0 | 1203 ByteIOContext ctx; |
121 | 1204 uint8_t *cmov_data; |
1205 uint8_t *moov_data; /* uncompressed data */ | |
0 | 1206 long cmov_len, moov_len; |
1207 int ret; | |
121 | 1208 |
0 | 1209 get_be32(pb); /* dcom atom */ |
1210 if (get_le32(pb) != MKTAG( 'd', 'c', 'o', 'm' )) | |
1211 return -1; | |
1212 if (get_le32(pb) != MKTAG( 'z', 'l', 'i', 'b' )) { | |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1213 av_log(NULL, AV_LOG_ERROR, "unknown compression for cmov atom !"); |
0 | 1214 return -1; |
1215 } | |
1216 get_be32(pb); /* cmvd atom */ | |
1217 if (get_le32(pb) != MKTAG( 'c', 'm', 'v', 'd' )) | |
1218 return -1; | |
1219 moov_len = get_be32(pb); /* uncompressed size */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1220 cmov_len = atom.size - 6 * 4; |
118 | 1221 |
1338 | 1222 cmov_data = av_malloc(cmov_len); |
0 | 1223 if (!cmov_data) |
1224 return -1; | |
1338 | 1225 moov_data = av_malloc(moov_len); |
0 | 1226 if (!moov_data) { |
1227 av_free(cmov_data); | |
1228 return -1; | |
1229 } | |
1230 get_buffer(pb, cmov_data, cmov_len); | |
121 | 1231 if(uncompress (moov_data, (uLongf *) &moov_len, (const Bytef *)cmov_data, cmov_len) != Z_OK) |
0 | 1232 return -1; |
1403
1973528c6975
move memory reading ByteIOContext init from mov.c to avobuf.c
michael
parents:
1402
diff
changeset
|
1233 if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, NULL, NULL, NULL) != 0) |
0 | 1234 return -1; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1235 atom.type = MKTAG( 'm', 'o', 'o', 'v' ); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1236 atom.offset = 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1237 atom.size = moov_len; |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
1238 #ifdef DEBUG |
953 | 1239 // { int fd = open("/tmp/uncompheader.mov", O_WRONLY | O_CREAT); write(fd, moov_data, moov_len); close(fd); } |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
1240 #endif |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1241 ret = mov_read_default(c, &ctx, atom); |
0 | 1242 av_free(moov_data); |
1243 av_free(cmov_data); | |
1244 return ret; | |
1404
53803884feb7
warn about zlib support needed if file has compressed moov atom
bcoudurier
parents:
1403
diff
changeset
|
1245 #else |
53803884feb7
warn about zlib support needed if file has compressed moov atom
bcoudurier
parents:
1403
diff
changeset
|
1246 av_log(c->fc, AV_LOG_ERROR, "this file requires zlib support compiled in\n"); |
53803884feb7
warn about zlib support needed if file has compressed moov atom
bcoudurier
parents:
1403
diff
changeset
|
1247 return -1; |
53803884feb7
warn about zlib support needed if file has compressed moov atom
bcoudurier
parents:
1403
diff
changeset
|
1248 #endif |
0 | 1249 } |
1250 | |
491 | 1251 /* edit list atom */ |
1252 static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) | |
1253 { | |
1061 | 1254 int i, edit_count; |
491 | 1255 |
1061 | 1256 get_byte(pb); /* version */ |
1257 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
1258 edit_count= c->streams[c->fc->nb_streams-1]->edit_count = get_be32(pb); /* entries */ | |
885 | 1259 |
1061 | 1260 for(i=0; i<edit_count; i++){ |
1261 get_be32(pb); /* Track duration */ | |
1262 get_be32(pb); /* Media time */ | |
1263 get_be32(pb); /* Media rate */ | |
1264 } | |
1265 dprintf("track[%i].edit_count = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->edit_count); | |
1266 return 0; | |
491 | 1267 } |
1268 | |
0 | 1269 static const MOVParseTableEntry mov_default_parse_table[] = { |
1270 /* mp4 atoms */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1271 { MKTAG( 'c', 'o', '6', '4' ), mov_read_stco }, |
671 | 1272 { MKTAG( 'c', 't', 't', 's' ), mov_read_ctts }, /* composition time to sample */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1273 { MKTAG( 'e', 'd', 't', 's' ), mov_read_default }, |
500
4070a7d58d2c
mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents:
499
diff
changeset
|
1274 { MKTAG( 'e', 'l', 's', 't' ), mov_read_elst }, |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
1275 { MKTAG( 'e', 'n', 'd', 'a' ), mov_read_enda }, |
1835 | 1276 { MKTAG( 'f', 'i', 'e', 'l' ), mov_read_extradata }, |
963
5783108b1478
add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
959
diff
changeset
|
1277 { MKTAG( 'f', 't', 'y', 'p' ), mov_read_ftyp }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1278 { MKTAG( 'h', 'd', 'l', 'r' ), mov_read_hdlr }, |
1834 | 1279 { MKTAG( 'j', 'p', '2', 'h' ), mov_read_extradata }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1280 { MKTAG( 'm', 'd', 'a', 't' ), mov_read_mdat }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1281 { MKTAG( 'm', 'd', 'h', 'd' ), mov_read_mdhd }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1282 { MKTAG( 'm', 'd', 'i', 'a' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1283 { MKTAG( 'm', 'i', 'n', 'f' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1284 { MKTAG( 'm', 'o', 'o', 'v' ), mov_read_moov }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1285 { MKTAG( 'm', 'v', 'h', 'd' ), mov_read_mvhd }, |
615 | 1286 { MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorenson extension ??? */ |
1834 | 1287 { MKTAG( 'a', 'l', 'a', 'c' ), mov_read_extradata }, /* alac specific atom */ |
885 | 1288 { MKTAG( 'a', 'v', 'c', 'C' ), mov_read_avcC }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1289 { MKTAG( 's', 't', 'b', 'l' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1290 { MKTAG( 's', 't', 'c', 'o' ), mov_read_stco }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1291 { MKTAG( 's', 't', 's', 'c' ), mov_read_stsc }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1292 { MKTAG( 's', 't', 's', 'd' ), mov_read_stsd }, /* sample description */ |
383
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
1293 { MKTAG( 's', 't', 's', 's' ), mov_read_stss }, /* sync sample */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1294 { MKTAG( 's', 't', 's', 'z' ), mov_read_stsz }, /* sample size */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1295 { MKTAG( 's', 't', 't', 's' ), mov_read_stts }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1296 { MKTAG( 't', 'k', 'h', 'd' ), mov_read_tkhd }, /* track header */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1297 { MKTAG( 't', 'r', 'a', 'k' ), mov_read_trak }, |
865 | 1298 { MKTAG( 'w', 'a', 'v', 'e' ), mov_read_wave }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1299 { MKTAG( 'c', 't', 'a', 'b' ), mov_read_ctab }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1300 { MKTAG( 'e', 's', 'd', 's' ), mov_read_esds }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1301 { MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1302 { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_cmov }, |
1418
9720274e2621
remove mov_read_leaf and remove useless reading function table, mov_read_default will skip atom with no parsing function anyway
bcoudurier
parents:
1415
diff
changeset
|
1303 { 0L, NULL } |
0 | 1304 }; |
1305 | |
1306 static void mov_free_stream_context(MOVStreamContext *sc) | |
1307 { | |
1308 if(sc) { | |
885 | 1309 av_freep(&sc->ctts_data); |
671 | 1310 av_freep(&sc); |
0 | 1311 } |
1312 } | |
1313 | |
121 | 1314 /* XXX: is it sufficient ? */ |
0 | 1315 static int mov_probe(AVProbeData *p) |
1316 { | |
1317 unsigned int offset; | |
1318 uint32_t tag; | |
658 | 1319 int score = 0; |
0 | 1320 |
1321 /* check file header */ | |
1322 if (p->buf_size <= 12) | |
1323 return 0; | |
1324 offset = 0; | |
1325 for(;;) { | |
1326 /* ignore invalid offset */ | |
1327 if ((offset + 8) > (unsigned int)p->buf_size) | |
658 | 1328 return score; |
1673 | 1329 tag = AV_RL32(p->buf + offset + 4); |
0 | 1330 switch(tag) { |
658 | 1331 /* check for obvious tags */ |
997
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
1332 case MKTAG( 'j', 'P', ' ', ' ' ): /* jpeg 2000 signature */ |
0 | 1333 case MKTAG( 'm', 'o', 'o', 'v' ): |
24 | 1334 case MKTAG( 'm', 'd', 'a', 't' ): |
1335 case MKTAG( 'p', 'n', 'o', 't' ): /* detect movs with preview pics like ew.mov and april.mov */ | |
146 | 1336 case MKTAG( 'u', 'd', 't', 'a' ): /* Packet Video PVAuthor adds this and a lot of more junk */ |
0 | 1337 return AVPROBE_SCORE_MAX; |
658 | 1338 /* those are more common words, so rate then a bit less */ |
1339 case MKTAG( 'w', 'i', 'd', 'e' ): | |
1340 case MKTAG( 'f', 'r', 'e', 'e' ): | |
1341 case MKTAG( 'j', 'u', 'n', 'k' ): | |
1342 case MKTAG( 'p', 'i', 'c', 't' ): | |
1343 return AVPROBE_SCORE_MAX - 5; | |
0 | 1344 case MKTAG( 'f', 't', 'y', 'p' ): |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1345 case MKTAG( 's', 'k', 'i', 'p' ): |
712
31e58b79ed02
Patch for "uuid" atom followed after atom "ftyp" by "QuickTime <ffmpeg AT gmail DOT com>"
mmu_man
parents:
708
diff
changeset
|
1346 case MKTAG( 'u', 'u', 'i', 'd' ): |
1673 | 1347 offset = AV_RB32(p->buf+offset) + offset; |
658 | 1348 /* if we only find those cause probedata is too small at least rate them */ |
1349 score = AVPROBE_SCORE_MAX - 50; | |
0 | 1350 break; |
1351 default: | |
1352 /* unrecognized tag */ | |
658 | 1353 return score; |
0 | 1354 } |
1355 } | |
658 | 1356 return score; |
0 | 1357 } |
1358 | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1359 static void mov_build_index(MOVContext *mov, AVStream *st) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1360 { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1361 MOVStreamContext *sc = st->priv_data; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1362 offset_t current_offset; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1363 int64_t current_dts = 0; |
1733 | 1364 unsigned int stts_index = 0; |
1365 unsigned int stsc_index = 0; | |
1366 unsigned int stss_index = 0; | |
1367 unsigned int i, j, k; | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1368 |
1268 | 1369 if (sc->sample_sizes || st->codec->codec_type == CODEC_TYPE_VIDEO || sc->dv_audio_container) { |
1733 | 1370 unsigned int current_sample = 0; |
1371 unsigned int stts_sample = 0; | |
1372 unsigned int keyframe, sample_size; | |
1373 unsigned int distance = 0; | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1374 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1375 st->nb_frames = sc->sample_count; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1376 for (i = 0; i < sc->chunk_count; i++) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1377 current_offset = sc->chunk_offsets[i]; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1378 if (stsc_index + 1 < sc->sample_to_chunk_sz && i + 1 == sc->sample_to_chunk[stsc_index + 1].first) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1379 stsc_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1380 for (j = 0; j < sc->sample_to_chunk[stsc_index].count; j++) { |
1732
fc47ca451446
stop if current sample is higher than sample count
bcoudurier
parents:
1731
diff
changeset
|
1381 if (current_sample >= sc->sample_count) { |
fc47ca451446
stop if current sample is higher than sample count
bcoudurier
parents:
1731
diff
changeset
|
1382 av_log(mov->fc, AV_LOG_ERROR, "wrong sample count\n"); |
fc47ca451446
stop if current sample is higher than sample count
bcoudurier
parents:
1731
diff
changeset
|
1383 goto out; |
fc47ca451446
stop if current sample is higher than sample count
bcoudurier
parents:
1731
diff
changeset
|
1384 } |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1385 keyframe = !sc->keyframe_count || current_sample + 1 == sc->keyframes[stss_index]; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1386 if (keyframe) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1387 distance = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1388 if (stss_index + 1 < sc->keyframe_count) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1389 stss_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1390 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1391 sample_size = sc->sample_size > 0 ? sc->sample_size : sc->sample_sizes[current_sample]; |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1440
diff
changeset
|
1392 dprintf("AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", size %d, distance %d, keyframe %d\n", |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1393 st->index, current_sample, current_offset, current_dts, sample_size, distance, keyframe); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1394 av_add_index_entry(st, current_offset, current_dts, sample_size, distance, keyframe ? AVINDEX_KEYFRAME : 0); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1395 current_offset += sample_size; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1396 assert(sc->stts_data[stts_index].duration % sc->time_rate == 0); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1397 current_dts += sc->stts_data[stts_index].duration / sc->time_rate; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1398 distance++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1399 stts_sample++; |
1732
fc47ca451446
stop if current sample is higher than sample count
bcoudurier
parents:
1731
diff
changeset
|
1400 current_sample++; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1401 if (stts_index + 1 < sc->stts_count && stts_sample == sc->stts_data[stts_index].count) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1402 stts_sample = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1403 stts_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1404 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1405 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1406 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1407 } else { /* read whole chunk */ |
1733 | 1408 unsigned int chunk_samples, chunk_size, chunk_duration; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1409 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1410 for (i = 0; i < sc->chunk_count; i++) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1411 current_offset = sc->chunk_offsets[i]; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1412 if (stsc_index + 1 < sc->sample_to_chunk_sz && i + 1 == sc->sample_to_chunk[stsc_index + 1].first) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1413 stsc_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1414 chunk_samples = sc->sample_to_chunk[stsc_index].count; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1415 /* get chunk size */ |
1276
bc0b7f4637f0
fix mac3audio.mov, pcm_s8 and pcm_u8 can only have sample size of 1 and only if mono, dont rely on bits per sample which can be wrong
bcoudurier
parents:
1272
diff
changeset
|
1416 if (sc->sample_size > 1 || st->codec->codec_id == CODEC_ID_PCM_U8 || st->codec->codec_id == CODEC_ID_PCM_S8) |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1417 chunk_size = chunk_samples * sc->sample_size; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1418 else if (sc->sample_size_v1.den > 0 && (chunk_samples * sc->sample_size_v1.num % sc->sample_size_v1.den == 0)) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1419 chunk_size = chunk_samples * sc->sample_size_v1.num / sc->sample_size_v1.den; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1420 else { /* workaround to find nearest next chunk offset */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1421 chunk_size = INT_MAX; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1422 for (j = 0; j < mov->total_streams; j++) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1423 MOVStreamContext *msc = mov->streams[j]; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1424 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1425 for (k = msc->next_chunk; k < msc->chunk_count; k++) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1426 if (msc->chunk_offsets[k] > current_offset && msc->chunk_offsets[k] - current_offset < chunk_size) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1427 chunk_size = msc->chunk_offsets[k] - current_offset; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1428 msc->next_chunk = k; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1429 break; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1430 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1431 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1432 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1433 /* check for last chunk */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1434 if (chunk_size == INT_MAX) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1435 for (j = 0; j < mov->mdat_count; j++) { |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1440
diff
changeset
|
1436 dprintf("mdat %d, offset %"PRIx64", size %"PRId64", current offset %"PRIx64"\n", |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1437 j, mov->mdat_list[j].offset, mov->mdat_list[j].size, current_offset); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1438 if (mov->mdat_list[j].offset <= current_offset && mov->mdat_list[j].offset + mov->mdat_list[j].size > current_offset) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1439 chunk_size = mov->mdat_list[j].offset + mov->mdat_list[j].size - current_offset; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1440 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1441 assert(chunk_size != INT_MAX); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1442 for (j = 0; j < mov->total_streams; j++) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1443 mov->streams[j]->next_chunk = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1444 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1445 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1446 av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1447 /* get chunk duration */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1448 chunk_duration = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1449 while (chunk_samples > 0) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1450 if (chunk_samples < sc->stts_data[stts_index].count) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1451 chunk_duration += sc->stts_data[stts_index].duration * chunk_samples; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1452 sc->stts_data[stts_index].count -= chunk_samples; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1453 break; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1454 } else { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1455 chunk_duration += sc->stts_data[stts_index].duration * chunk_samples; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1456 chunk_samples -= sc->stts_data[stts_index].count; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1457 if (stts_index + 1 < sc->stts_count) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1458 stts_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1459 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1460 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1461 } |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1440
diff
changeset
|
1462 dprintf("AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", size %d, duration %d\n", |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1463 st->index, i, current_offset, current_dts, chunk_size, chunk_duration); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1464 assert(chunk_duration % sc->time_rate == 0); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1465 current_dts += chunk_duration / sc->time_rate; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1466 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1467 } |
1732
fc47ca451446
stop if current sample is higher than sample count
bcoudurier
parents:
1731
diff
changeset
|
1468 out: |
1162 | 1469 /* adjust sample count to avindex entries */ |
1470 sc->sample_count = st->nb_index_entries; | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1471 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1472 |
0 | 1473 static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) |
1474 { | |
121 | 1475 MOVContext *mov = (MOVContext *) s->priv_data; |
0 | 1476 ByteIOContext *pb = &s->pb; |
1118 | 1477 int i, err; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1478 MOV_atom_t atom = { 0, 0, 0 }; |
0 | 1479 |
1480 mov->fc = s; | |
121 | 1481 mov->parse_table = mov_default_parse_table; |
956
18bb4485996c
useless code removal by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
955
diff
changeset
|
1482 |
0 | 1483 if(!url_is_streamed(pb)) /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ |
887 | 1484 atom.size = url_fsize(pb); |
0 | 1485 else |
887 | 1486 atom.size = 0x7FFFFFFFFFFFFFFFLL; |
0 | 1487 |
1488 /* check MOV header */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1489 err = mov_read_default(mov, pb, atom); |
133 | 1490 if (err<0 || (!mov->found_moov && !mov->found_mdat)) { |
887 | 1491 av_log(s, AV_LOG_ERROR, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%"PRId64"\n", |
1492 err, mov->found_moov, mov->found_mdat, url_ftell(pb)); | |
1493 return -1; | |
0 | 1494 } |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1495 dprintf("on_parse_exit_offset=%d\n", (int) url_ftell(pb)); |
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1496 |
0 | 1497 /* some cleanup : make sure we are on the mdat atom */ |
1498 if(!url_is_streamed(pb) && (url_ftell(pb) != mov->mdat_offset)) | |
1499 url_fseek(pb, mov->mdat_offset, SEEK_SET); | |
1500 | |
1118 | 1501 mov->total_streams = s->nb_streams; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1502 |
1118 | 1503 for(i=0; i<mov->total_streams; i++) { |
1504 MOVStreamContext *sc = mov->streams[i]; | |
1727 | 1505 /* sanity checks */ |
1506 if(!sc->stts_count || !sc->chunk_count || !sc->sample_to_chunk_sz || | |
1507 (!sc->sample_size && !sc->sample_count)){ | |
1508 av_log(s, AV_LOG_ERROR, "missing mandatory atoms, broken header\n"); | |
1509 return -1; | |
1510 } | |
1118 | 1511 if(!sc->time_rate) |
1512 sc->time_rate=1; | |
1513 if(!sc->time_scale) | |
1514 sc->time_scale= mov->time_scale; | |
1515 av_set_pts_info(s->streams[i], 64, sc->time_rate, sc->time_scale); | |
928 | 1516 |
1118 | 1517 if(s->streams[i]->duration != AV_NOPTS_VALUE){ |
1518 assert(s->streams[i]->duration % sc->time_rate == 0); | |
1519 s->streams[i]->duration /= sc->time_rate; | |
955 | 1520 } |
1118 | 1521 sc->ffindex = i; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1522 mov_build_index(mov, s->streams[i]); |
1110
a188feae9a07
simplify, completely ignore streams not recognized, that fixes seeking for some files
bcoudurier
parents:
1093
diff
changeset
|
1523 } |
928 | 1524 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1525 for(i=0; i<mov->total_streams; i++) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1526 /* dont need those anymore */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1527 av_freep(&mov->streams[i]->chunk_offsets); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1528 av_freep(&mov->streams[i]->sample_to_chunk); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1529 av_freep(&mov->streams[i]->sample_sizes); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1530 av_freep(&mov->streams[i]->keyframes); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1531 av_freep(&mov->streams[i]->stts_data); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1532 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1533 av_freep(&mov->mdat_list); |
0 | 1534 return 0; |
1535 } | |
1536 | |
1537 static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) | |
1538 { | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1539 MOVContext *mov = s->priv_data; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1540 MOVStreamContext *sc = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1541 AVIndexEntry *sample = 0; |
769 | 1542 int64_t best_dts = INT64_MAX; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1543 int i; |
0 | 1544 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1545 for (i = 0; i < mov->total_streams; i++) { |
887 | 1546 MOVStreamContext *msc = mov->streams[i]; |
769 | 1547 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1548 if (s->streams[i]->discard != AVDISCARD_ALL && msc->current_sample < msc->sample_count) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1549 AVIndexEntry *current_sample = &s->streams[i]->index_entries[msc->current_sample]; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1550 int64_t dts = av_rescale(current_sample->timestamp * (int64_t)msc->time_rate, AV_TIME_BASE, msc->time_scale); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1551 |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1440
diff
changeset
|
1552 dprintf("stream %d, sample %ld, dts %"PRId64"\n", i, msc->current_sample, dts); |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1553 if (dts < best_dts) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1554 sample = current_sample; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1555 best_dts = dts; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1556 sc = msc; |
769 | 1557 } |
0 | 1558 } |
1559 } | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1560 if (!sample) |
887 | 1561 return -1; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1562 /* must be done just before reading, to avoid infinite loop on sample */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1563 sc->current_sample++; |
1162 | 1564 if (sample->pos >= url_fsize(&s->pb)) { |
1388
3172bf94c066
Use proper PRI?64 macros for %ll? format to fix printf format warnings:
rathann
parents:
1384
diff
changeset
|
1565 av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n", sc->ffindex, sample->pos); |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1566 return -1; |
0 | 1567 } |
1270 | 1568 #ifdef CONFIG_DV_DEMUXER |
1268 | 1569 if (sc->dv_audio_container) { |
1570 dv_get_packet(mov->dv_demux, pkt); | |
1571 dprintf("dv audio pkt size %d\n", pkt->size); | |
1572 } else { | |
1270 | 1573 #endif |
1268 | 1574 url_fseek(&s->pb, sample->pos, SEEK_SET); |
1575 av_get_packet(&s->pb, pkt, sample->size); | |
1270 | 1576 #ifdef CONFIG_DV_DEMUXER |
1268 | 1577 if (mov->dv_demux) { |
1578 void *pkt_destruct_func = pkt->destruct; | |
1579 dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size); | |
1580 pkt->destruct = pkt_destruct_func; | |
1581 } | |
1582 } | |
1270 | 1583 #endif |
0 | 1584 pkt->stream_index = sc->ffindex; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1585 pkt->dts = sample->timestamp; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1586 if (sc->ctts_data) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1587 assert(sc->ctts_data[sc->sample_to_ctime_index].duration % sc->time_rate == 0); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1588 pkt->pts = pkt->dts + sc->ctts_data[sc->sample_to_ctime_index].duration / sc->time_rate; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1589 /* update ctts context */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1590 sc->sample_to_ctime_sample++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1591 if (sc->sample_to_ctime_index < sc->ctts_count && sc->ctts_data[sc->sample_to_ctime_index].count == sc->sample_to_ctime_sample) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1592 sc->sample_to_ctime_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1593 sc->sample_to_ctime_sample = 0; |
383
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
1594 } |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1595 } else { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1596 pkt->pts = pkt->dts; |
383
1674ed5ca2f0
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
michael
parents:
370
diff
changeset
|
1597 } |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1598 pkt->flags |= sample->flags & AVINDEX_KEYFRAME ? PKT_FLAG_KEY : 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1599 pkt->pos = sample->pos; |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1440
diff
changeset
|
1600 dprintf("stream %d, pts %"PRId64", dts %"PRId64", pos 0x%"PRIx64", duration %d\n", pkt->stream_index, pkt->pts, pkt->dts, pkt->pos, pkt->duration); |
0 | 1601 return 0; |
1602 } | |
1603 | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1604 static int mov_seek_stream(AVStream *st, int64_t timestamp, int flags) |
491 | 1605 { |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1606 MOVStreamContext *sc = st->priv_data; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1607 int sample, time_sample; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1608 int i; |
491 | 1609 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1610 sample = av_index_search_timestamp(st, timestamp, flags); |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1440
diff
changeset
|
1611 dprintf("stream %d, timestamp %"PRId64", sample %d\n", st->index, timestamp, sample); |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1612 if (sample < 0) /* not sure what to do */ |
491 | 1613 return -1; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1614 sc->current_sample = sample; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1615 dprintf("stream %d, found sample %ld\n", st->index, sc->current_sample); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1616 /* adjust ctts index */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1617 if (sc->ctts_data) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1618 time_sample = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1619 for (i = 0; i < sc->ctts_count; i++) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1620 time_sample += sc->ctts_data[i].count; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1621 if (time_sample >= sc->current_sample) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1622 sc->sample_to_ctime_index = i; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1623 sc->sample_to_ctime_sample = time_sample - sc->current_sample; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1624 break; |
491 | 1625 } |
1626 } | |
1627 } | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1628 return sample; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1629 } |
491 | 1630 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1631 static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_time, int flags) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1632 { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1633 AVStream *st; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1634 int64_t seek_timestamp, timestamp; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1635 int sample; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1636 int i; |
491 | 1637 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1638 if (stream_index >= s->nb_streams) |
491 | 1639 return -1; |
1640 | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1641 st = s->streams[stream_index]; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1642 sample = mov_seek_stream(st, sample_time, flags); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1643 if (sample < 0) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1644 return -1; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1645 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1646 /* adjust seek timestamp to found sample timestamp */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1647 seek_timestamp = st->index_entries[sample].timestamp; |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1648 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1649 for (i = 0; i < s->nb_streams; i++) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1650 st = s->streams[i]; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1651 if (stream_index == i || st->discard == AVDISCARD_ALL) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1652 continue; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1653 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1654 timestamp = av_rescale_q(seek_timestamp, s->streams[stream_index]->time_base, st->time_base); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1655 mov_seek_stream(st, timestamp, flags); |
885 | 1656 } |
491 | 1657 return 0; |
1658 } | |
1659 | |
0 | 1660 static int mov_read_close(AVFormatContext *s) |
1661 { | |
1662 int i; | |
121 | 1663 MOVContext *mov = (MOVContext *) s->priv_data; |
0 | 1664 for(i=0; i<mov->total_streams; i++) |
1665 mov_free_stream_context(mov->streams[i]); | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1666 /* free color tabs */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1667 for(i=0; i<mov->ctab_size; i++) |
887 | 1668 av_freep(&mov->ctab[i]); |
1268 | 1669 if(mov->dv_demux){ |
1670 for(i=0; i<mov->dv_fctx->nb_streams; i++){ | |
1671 av_freep(&mov->dv_fctx->streams[i]->codec); | |
1672 av_freep(&mov->dv_fctx->streams[i]); | |
1673 } | |
1674 av_freep(&mov->dv_fctx); | |
1675 av_freep(&mov->dv_demux); | |
1676 } | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1677 av_freep(&mov->ctab); |
0 | 1678 return 0; |
1679 } | |
1680 | |
1169 | 1681 AVInputFormat mov_demuxer = { |
997
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
1682 "mov,mp4,m4a,3gp,3g2,mj2", |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
1683 "QuickTime/MPEG4/Motion JPEG 2000 format", |
0 | 1684 sizeof(MOVContext), |
1685 mov_probe, | |
1686 mov_read_header, | |
1687 mov_read_packet, | |
1688 mov_read_close, | |
491 | 1689 mov_read_seek, |
0 | 1690 }; |