Mercurial > libavformat.hg
annotate mov.c @ 1335:2cbaaf63ce18 libavformat
add lpcm fourcc
author | bcoudurier |
---|---|
date | Thu, 28 Sep 2006 17:54:59 +0000 |
parents | 5825a7bc0d96 |
children | 06a5d191774d |
rev | line source |
---|---|
0 | 1 /* |
2 * MOV decoder. | |
3 * Copyright (c) 2001 Fabrice Bellard. | |
4 * | |
5 * This library is free software; you can redistribute it and/or | |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
9 * | |
10 * This library is distributed in the hope that it will be useful, | |
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 * Lesser General Public License for more details. | |
14 * | |
15 * You should have received a copy of the GNU Lesser General Public | |
16 * License along with this library; if not, write to the Free Software | |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
890
diff
changeset
|
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 18 */ |
395
c1ed10f3b052
cleanup frame_rate code, this may also fix some large file bugs
michael
parents:
383
diff
changeset
|
19 |
c1ed10f3b052
cleanup frame_rate code, this may also fix some large file bugs
michael
parents:
383
diff
changeset
|
20 #include <limits.h> |
885 | 21 |
1072 | 22 //#define DEBUG |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
23 |
0 | 24 #include "avformat.h" |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
25 #include "riff.h" |
1216
fec0a3d5408f
move common code from mov.c and movenc.c to isom.c
bcoudurier
parents:
1215
diff
changeset
|
26 #include "isom.h" |
1268 | 27 #include "dv.h" |
0 | 28 |
29 #ifdef CONFIG_ZLIB | |
30 #include <zlib.h> | |
31 #endif | |
32 | |
33 /* | |
34 * First version by Francois Revol revol@free.fr | |
885 | 35 * Seek function by Gael Chardon gael.dev@4now.net |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
36 * |
0 | 37 * Features and limitations: |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
38 * - reads most of the QT files I have (at least the structure), |
0 | 39 * the exceptions are .mov with zlib compressed headers ('cmov' section). It shouldn't be hard to implement. |
40 * FIXED, Francois Revol, 07/17/2002 | |
41 * - ffmpeg has nearly none of the usual QuickTime codecs, | |
42 * although I succesfully dumped raw and mp3 audio tracks off .mov files. | |
43 * Sample QuickTime files with mp3 audio can be found at: http://www.3ivx.com/showcase.html | |
44 * - .mp4 parsing is still hazardous, although the format really is QuickTime with some minor changes | |
45 * (to make .mov parser crash maybe ?), despite what they say in the MPEG FAQ at | |
46 * http://mpeg.telecomitalialab.com/faq.htm | |
47 * - the code is quite ugly... maybe I won't do it recursive next time :-) | |
491 | 48 * - 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
|
49 * |
0 | 50 * Funny I didn't know about http://sourceforge.net/projects/qt-ffmpeg/ |
51 * when coding this :) (it's a writer anyway) | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
52 * |
0 | 53 * Reference documents: |
54 * http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt | |
55 * Apple: | |
491 | 56 * 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
|
57 * http://developer.apple.com/documentation/QuickTime/QTFF/qtff.pdf |
0 | 58 * QuickTime is a trademark of Apple (AFAIK :)) |
59 */ | |
60 | |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
61 #include "qtpalette.h" |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
62 |
491 | 63 |
928 | 64 #undef NDEBUG |
65 #include <assert.h> | |
66 | |
0 | 67 static const CodecTag mov_video_tags[] = { |
68 /* { CODEC_ID_, MKTAG('c', 'v', 'i', 'd') }, *//* Cinepak */ | |
69 /* { CODEC_ID_H263, MKTAG('r', 'a', 'w', ' ') }, *//* Uncompressed RGB */ | |
70 /* { CODEC_ID_H263, MKTAG('Y', 'u', 'v', '2') }, *//* Uncompressed YUV422 */ | |
101
0865b0aaa2af
QT AVID 4CCs patch by ("Sebastien Bechet" <s dot bechet at av7 dot net>) (not tested)
mmu_man
parents:
85
diff
changeset
|
71 /* { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, *//* YUV with alpha-channel (AVID Uncompressed) */ |
0 | 72 /* Graphics */ |
73 /* Animation */ | |
74 /* Apple video */ | |
75 /* Kodak Photo CD */ | |
76 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */ | |
77 { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ | |
78 { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */ | |
1071 | 79 { CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */ |
101
0865b0aaa2af
QT AVID 4CCs patch by ("Sebastien Bechet" <s dot bechet at av7 dot net>) (not tested)
mmu_man
parents:
85
diff
changeset
|
80 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */ |
0865b0aaa2af
QT AVID 4CCs patch by ("Sebastien Bechet" <s dot bechet at av7 dot net>) (not tested)
mmu_man
parents:
85
diff
changeset
|
81 /* { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channel (AVID ABVB/Truevision NuVista) */ |
0 | 82 /* { CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, *//* embedded gif files as frames (usually one "click to play movie" frame) */ |
83 /* Sorenson video */ | |
84 { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, /* Sorenson Video v1 */ | |
85 { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, /* Sorenson Video v1 */ | |
86 { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', 'i') }, /* Sorenson Video v1 (from QT specs)*/ | |
129 | 87 { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */ |
0 | 88 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, |
89 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */ | |
289 | 90 { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, |
697
c7e1501cc306
Add 3IV2 4CC by "Rob Coenen" <rob AT massive-interactive DOT nl>
mmu_man
parents:
695
diff
changeset
|
91 { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, /* experimental: 3IVX files before ivx D4 4.5.1 */ |
0 | 92 /* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */ |
93 { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */ | |
133 | 94 { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */ |
0 | 95 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */ |
96 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */ | |
124 | 97 { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */ |
266
8bb470d85249
New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents:
258
diff
changeset
|
98 { CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') }, /* Apple Video (RPZA) */ |
8bb470d85249
New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents:
258
diff
changeset
|
99 { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */ |
301 | 100 { CODEC_ID_8BPS, MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */ |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
101 { CODEC_ID_SMC, MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */ |
358
d18a2b1fc182
initial commit for Quicktime Animation (RLE) video decoder; bit depths
melanson
parents:
308
diff
changeset
|
102 { CODEC_ID_QTRLE, MKTAG('r', 'l', 'e', ' ') }, /* Apple Animation (RLE) */ |
533
59da52e5f5a5
support for Sierra Online audio files and Apple QuickDraw codec,
melanson
parents:
506
diff
changeset
|
103 { CODEC_ID_QDRAW, MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */ |
615 | 104 { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */ |
805 | 105 { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 produced by Sony HD camera */ |
998
ea685f7f9ba7
referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
997
diff
changeset
|
106 { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* HDV produced by FCP */ |
ea685f7f9ba7
referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
997
diff
changeset
|
107 { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */ |
ea685f7f9ba7
referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
997
diff
changeset
|
108 { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */ |
ea685f7f9ba7
referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
997
diff
changeset
|
109 { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX NTSC 525/60 30mb/s produced by FCP */ |
ea685f7f9ba7
referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
997
diff
changeset
|
110 { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG2 IMX PAL 625/50 30mb/s produced by FCP */ |
959
b0a6f09d8d38
mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
michael
parents:
956
diff
changeset
|
111 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL produced by FCP */ |
998
ea685f7f9ba7
referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
997
diff
changeset
|
112 //{ CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD 50i produced by FCP */ |
ea685f7f9ba7
referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
997
diff
changeset
|
113 //{ CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '6') }, /* DVCPRO HD 60i produced by FCP */ |
ea685f7f9ba7
referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
997
diff
changeset
|
114 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL produced by FCP */ |
ea685f7f9ba7
referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
997
diff
changeset
|
115 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC produced by FCP */ |
1062 | 116 { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, /* AVID DV */ |
998
ea685f7f9ba7
referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
997
diff
changeset
|
117 //{ CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */ |
1086 | 118 { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
119 { CODEC_ID_NONE, 0 }, |
0 | 120 }; |
121 | |
122 static const CodecTag mov_audio_tags[] = { | |
964
583f564da55b
add 'in32' fourcc support patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
963
diff
changeset
|
123 { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') }, |
959
b0a6f09d8d38
mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
michael
parents:
956
diff
changeset
|
124 { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') }, |
1248 | 125 { CODEC_ID_PCM_S16BE, MKTAG('N', 'O', 'N', 'E') }, /* uncompressed */ |
0 | 126 { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */ |
118 | 127 { CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') }, /* 8 bits unsigned */ |
0 | 128 { CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, /* */ |
129 { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, /* */ | |
130 { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */ | |
131 { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, /* IMA-4 ADPCM */ | |
1157 | 132 { CODEC_ID_ADPCM_MS, MKTAG('m', 's', 0x00, 0x02) }, /* MS ADPCM */ |
0 | 133 { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, /* Macintosh Audio Compression and Expansion 3:1 */ |
134 { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */ | |
135 | |
1168 | 136 { CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') }, /* MPEG layer 3 */ /* sample files at http://www.3ivx.com/showcase.html use this tag */ |
0 | 137 { CODEC_ID_MP2, 0x6D730055 }, /* MPEG layer 3 */ |
138 { CODEC_ID_MP2, 0x5500736D }, /* MPEG layer 3 *//* XXX: check endianness */ | |
139 /* { CODEC_ID_OGG_VORBIS, MKTAG('O', 'g', 'g', 'S') }, *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */ | |
140 /* MP4 tags */ | |
655
7cba02909808
AAC fix by Thomas Raivio <tjraivio AT cc DOT hut DOT fi>
mmu_man
parents:
654
diff
changeset
|
141 { CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') }, /* MPEG-4 AAC */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
142 /* The standard for mpeg4 audio is still not normalised AFAIK anyway */ |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
143 { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */ |
258
59c2e84817a1
AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents:
191
diff
changeset
|
144 { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */ |
289 | 145 { CODEC_ID_AC3, MKTAG('m', 's', 0x20, 0x00) }, /* Dolby AC-3 */ |
691
28af25a9a897
first pass at ALAC decoder from David Hammerton; while David's original
melanson
parents:
690
diff
changeset
|
146 { CODEC_ID_ALAC,MKTAG('a', 'l', 'a', 'c') }, /* Apple Lossless */ |
865 | 147 { CODEC_ID_QDM2,MKTAG('Q', 'D', 'M', '2') }, /* QDM2 */ |
1268 | 148 { CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') }, |
149 { CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') }, | |
1335 | 150 { CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
151 { CODEC_ID_NONE, 0 }, |
0 | 152 }; |
153 | |
154 /* the QuickTime file format is quite convoluted... | |
155 * it has lots of index tables, each indexing something in another one... | |
156 * Here we just use what is needed to read the chunks | |
157 */ | |
158 | |
159 typedef struct MOV_sample_to_chunk_tbl { | |
160 long first; | |
161 long count; | |
162 long id; | |
163 } MOV_sample_to_chunk_tbl; | |
164 | |
118 | 165 typedef struct { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
166 uint32_t type; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
167 int64_t offset; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
168 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
|
169 } MOV_atom_t; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
170 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
171 typedef struct { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
172 int seed; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
173 int flags; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
174 int size; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
175 void* clrs; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
176 } MOV_ctab_t; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
177 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
178 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
|
179 offset_t offset; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
180 int64_t size; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
181 } 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
|
182 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
183 typedef struct { |
118 | 184 uint8_t version; |
185 uint32_t flags; // 24bit | |
186 | |
187 /* 0x03 ESDescrTag */ | |
188 uint16_t es_id; | |
887 | 189 #define MP4ODescrTag 0x01 |
190 #define MP4IODescrTag 0x02 | |
191 #define MP4ESDescrTag 0x03 | |
192 #define MP4DecConfigDescrTag 0x04 | |
193 #define MP4DecSpecificDescrTag 0x05 | |
194 #define MP4SLConfigDescrTag 0x06 | |
195 #define MP4ContentIdDescrTag 0x07 | |
196 #define MP4SupplContentIdDescrTag 0x08 | |
197 #define MP4IPIPtrDescrTag 0x09 | |
198 #define MP4IPMPPtrDescrTag 0x0A | |
199 #define MP4IPMPDescrTag 0x0B | |
200 #define MP4RegistrationDescrTag 0x0D | |
201 #define MP4ESIDIncDescrTag 0x0E | |
202 #define MP4ESIDRefDescrTag 0x0F | |
203 #define MP4FileIODescrTag 0x10 | |
204 #define MP4FileODescrTag 0x11 | |
205 #define MP4ExtProfileLevelDescrTag 0x13 | |
206 #define MP4ExtDescrTagsStart 0x80 | |
207 #define MP4ExtDescrTagsEnd 0xFE | |
118 | 208 uint8_t stream_priority; |
209 | |
210 /* 0x04 DecConfigDescrTag */ | |
211 uint8_t object_type_id; | |
212 uint8_t stream_type; | |
213 /* XXX: really streamType is | |
214 * only 6bit, followed by: | |
215 * 1bit upStream | |
216 * 1bit reserved | |
217 */ | |
218 uint32_t buffer_size_db; // 24 | |
219 uint32_t max_bitrate; | |
220 uint32_t avg_bitrate; | |
221 | |
222 /* 0x05 DecSpecificDescrTag */ | |
223 uint8_t decoder_cfg_len; | |
224 uint8_t *decoder_cfg; | |
225 | |
226 /* 0x06 SLConfigDescrTag */ | |
227 uint8_t sl_config_len; | |
228 uint8_t *sl_config; | |
229 } MOV_esds_t; | |
230 | |
121 | 231 struct MOVParseTableEntry; |
232 | |
0 | 233 typedef struct MOVStreamContext { |
234 int ffindex; /* the ffmpeg stream id */ | |
235 long next_chunk; | |
236 long chunk_count; | |
65 | 237 int64_t *chunk_offsets; |
670 | 238 int stts_count; |
239 Time2Sample *stts_data; | |
671 | 240 int ctts_count; |
241 Time2Sample *ctts_data; | |
670 | 242 int edit_count; /* number of 'edit' (elst atom) */ |
0 | 243 long sample_to_chunk_sz; |
244 MOV_sample_to_chunk_tbl *sample_to_chunk; | |
671 | 245 int sample_to_ctime_index; |
246 int sample_to_ctime_sample; | |
0 | 247 long sample_size; |
248 long sample_count; | |
249 long *sample_sizes; | |
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
|
250 long keyframe_count; |
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
|
251 long *keyframes; |
118 | 252 int time_scale; |
928 | 253 int time_rate; |
0 | 254 long current_sample; |
118 | 255 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
|
256 AVRational sample_size_v1; |
1268 | 257 int dv_audio_container; |
0 | 258 } MOVStreamContext; |
259 | |
260 typedef struct MOVContext { | |
261 int mp4; /* set to 1 as soon as we are sure that the file is an .mp4 file (even some header parsing depends on this) */ | |
262 AVFormatContext *fc; | |
118 | 263 int time_scale; |
1027 | 264 int64_t duration; /* duration of the longest track */ |
0 | 265 int found_moov; /* when both 'moov' and 'mdat' sections has been found */ |
266 int found_mdat; /* we suppose we have enough data to read the file */ | |
65 | 267 int64_t mdat_size; |
268 int64_t mdat_offset; | |
0 | 269 int total_streams; |
270 /* some streams listed here aren't presented to the ffmpeg API, since they aren't either video nor audio | |
271 * but we need the info to be able to skip data from those streams in the 'mdat' section | |
272 */ | |
273 MOVStreamContext *streams[MAX_STREAMS]; | |
118 | 274 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
275 int ctab_size; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
276 MOV_ctab_t **ctab; /* color tables */ |
121 | 277 const struct MOVParseTableEntry *parse_table; /* could be eventually used to change the table */ |
278 /* 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
|
279 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
280 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
|
281 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
|
282 int mdat_count; |
1268 | 283 DVDemuxContext *dv_demux; |
284 AVFormatContext *dv_fctx; | |
0 | 285 } MOVContext; |
286 | |
287 | |
288 /* XXX: it's the first time I make a recursive parser I think... sorry if it's ugly :P */ | |
289 | |
290 /* those functions parse an atom */ | |
291 /* return code: | |
292 1: found what I wanted, exit | |
293 0: continue to parse next atom | |
294 -1: error occured, exit | |
295 */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
296 typedef int (*mov_parse_function)(MOVContext *ctx, ByteIOContext *pb, MOV_atom_t atom); |
0 | 297 |
298 /* links atom IDs to parse functions */ | |
299 typedef struct MOVParseTableEntry { | |
65 | 300 uint32_t type; |
0 | 301 mov_parse_function func; |
302 } MOVParseTableEntry; | |
303 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
304 static int mov_read_leaf(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
305 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
306 if (atom.size>1) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
307 url_fskip(pb, atom.size); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
308 /* url_seek(pb, atom_offset+atom.size, SEEK_SET); */ |
0 | 309 return 0; |
310 } | |
311 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
312 static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 313 { |
121 | 314 int64_t total_size = 0; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
315 MOV_atom_t a; |
0 | 316 int i; |
317 int err = 0; | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
318 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
319 a.offset = atom.offset; |
0 | 320 |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
321 if (atom.size < 0) |
887 | 322 atom.size = 0x7fffffffffffffffLL; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
323 while(((total_size + 8) < atom.size) && !url_feof(pb) && !err) { |
887 | 324 a.size = atom.size; |
325 a.type=0L; | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
326 if(atom.size >= 8) { |
887 | 327 a.size = get_be32(pb); |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
328 a.type = get_le32(pb); |
0 | 329 } |
887 | 330 total_size += 8; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
331 a.offset += 8; |
1010 | 332 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
|
333 if (a.size == 1) { /* 64 bit extended size */ |
887 | 334 a.size = get_be64(pb) - 8; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
335 a.offset += 8; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
336 total_size += 8; |
0 | 337 } |
887 | 338 if (a.size == 0) { |
339 a.size = atom.size - total_size; | |
340 if (a.size <= 8) | |
118 | 341 break; |
887 | 342 } |
343 for (i = 0; c->parse_table[i].type != 0L | |
344 && c->parse_table[i].type != a.type; i++) | |
345 /* empty */; | |
118 | 346 |
887 | 347 a.size -= 8; |
885 | 348 |
639 | 349 if(a.size < 0) |
350 break; | |
885 | 351 |
887 | 352 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
|
353 url_fskip(pb, a.size); |
887 | 354 } else { |
1060 | 355 offset_t start_pos = url_ftell(pb); |
356 int64_t left; | |
887 | 357 err = (c->parse_table[i].func)(c, pb, a); |
1060 | 358 left = a.size - url_ftell(pb) + start_pos; |
359 if (left > 0) /* skip garbage at atom end */ | |
360 url_fskip(pb, left); | |
887 | 361 } |
0 | 362 |
887 | 363 a.offset += a.size; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
364 total_size += a.size; |
0 | 365 } |
366 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
367 if (!err && total_size < atom.size && atom.size < 0x7ffff) { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
368 url_fskip(pb, atom.size - total_size); |
118 | 369 } |
370 | |
0 | 371 return err; |
372 } | |
373 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
374 static int mov_read_ctab(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 375 { |
639 | 376 #if 1 |
377 url_fskip(pb, atom.size); // for now | |
378 #else | |
379 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
|
380 unsigned int len; |
095009fc2f35
kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
677
diff
changeset
|
381 MOV_ctab_t *t; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
382 c->ctab = av_realloc(c->ctab, ++c->ctab_size); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
383 t = c->ctab[c->ctab_size]; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
384 t->seed = get_be32(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
385 t->flags = get_be16(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
386 t->size = get_be16(pb) + 1; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
387 len = 2 * t->size * 4; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
388 if (len > 0) { |
887 | 389 t->clrs = av_malloc(len); // 16bit A R G B |
390 if (t->clrs) | |
391 get_buffer(pb, t->clrs, len); | |
0 | 392 } |
639 | 393 #endif |
118 | 394 |
0 | 395 return 0; |
396 } | |
397 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
398 static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 399 { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
400 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
0 | 401 int len = 0; |
65 | 402 uint32_t type; |
403 uint32_t ctype; | |
121 | 404 |
0 | 405 get_byte(pb); /* version */ |
406 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
407 | |
408 /* component type */ | |
409 ctype = get_le32(pb); | |
410 type = get_le32(pb); /* component subtype */ | |
411 | |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
412 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
|
413 dprintf("stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]); |
965
d3b4919dd5ec
simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
964
diff
changeset
|
414 if(ctype == MKTAG('m', 'h', 'l', 'r')) /* MOV */ |
0 | 415 c->mp4 = 0; |
965
d3b4919dd5ec
simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
964
diff
changeset
|
416 else if(ctype == 0) |
0 | 417 c->mp4 = 1; |
965
d3b4919dd5ec
simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents:
964
diff
changeset
|
418 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
|
419 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
|
420 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
|
421 st->codec->codec_type = CODEC_TYPE_AUDIO; |
0 | 422 get_be32(pb); /* component manufacture */ |
423 get_be32(pb); /* component flags */ | |
424 get_be32(pb); /* component flags mask */ | |
425 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
426 if(atom.size <= 24) |
0 | 427 return 0; /* nothing left to read */ |
428 /* XXX: MP4 uses a C string, not a pascal one */ | |
429 /* component name */ | |
430 | |
431 if(c->mp4) { | |
432 /* .mp4: C string */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
433 while(get_byte(pb) && (++len < (atom.size - 24))); |
0 | 434 } else { |
435 /* .mov: PASCAL string */ | |
436 len = get_byte(pb); | |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
437 url_fskip(pb, len); |
0 | 438 } |
118 | 439 |
489
aeb69a5f3756
The atom 'skip' should be handled by 'mov_read_leaf()', not by
michael
parents:
438
diff
changeset
|
440 url_fskip(pb, atom.size - (url_ftell(pb) - atom.offset)); |
0 | 441 return 0; |
442 } | |
443 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
444 static int mov_mp4_read_descr_len(ByteIOContext *pb) |
0 | 445 { |
118 | 446 int len = 0; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
447 int count = 4; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
448 while (count--) { |
118 | 449 int c = get_byte(pb); |
887 | 450 len = (len << 7) | (c & 0x7f); |
451 if (!(c & 0x80)) | |
452 break; | |
0 | 453 } |
454 return len; | |
455 } | |
456 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
457 static int mov_mp4_read_descr(ByteIOContext *pb, int *tag) |
0 | 458 { |
459 int len; | |
460 *tag = get_byte(pb); | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
461 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
|
462 dprintf("MPEG4 description: tag=0x%02x len=%d\n", *tag, len); |
0 | 463 return len; |
464 } | |
465 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
466 static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
118 | 467 { |
468 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
469 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; | |
470 int tag, len; | |
121 | 471 |
118 | 472 /* Well, broken but suffisant for some MP4 streams */ |
473 get_be32(pb); /* version + flags */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
474 len = mov_mp4_read_descr(pb, &tag); |
118 | 475 if (tag == MP4ESDescrTag) { |
887 | 476 get_be16(pb); /* ID */ |
477 get_byte(pb); /* priority */ | |
118 | 478 } else |
887 | 479 get_be16(pb); /* ID */ |
118 | 480 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
481 len = mov_mp4_read_descr(pb, &tag); |
118 | 482 if (tag == MP4DecConfigDescrTag) { |
887 | 483 sc->esds.object_type_id = get_byte(pb); |
484 sc->esds.stream_type = get_byte(pb); | |
485 sc->esds.buffer_size_db = get_be24(pb); | |
486 sc->esds.max_bitrate = get_be32(pb); | |
487 sc->esds.avg_bitrate = get_be32(pb); | |
118 | 488 |
943
4e7a66723f1d
mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
928
diff
changeset
|
489 st->codec->codec_id= codec_get_id(ff_mov_obj_type, sc->esds.object_type_id); |
1215 | 490 dprintf("esds object type id %d\n", sc->esds.object_type_id); |
887 | 491 len = mov_mp4_read_descr(pb, &tag); |
492 if (tag == MP4DecSpecificDescrTag) { | |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
493 dprintf("Specific MPEG4 header len=%d\n", len); |
887 | 494 st->codec->extradata = (uint8_t*) av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); |
495 if (st->codec->extradata) { | |
496 get_buffer(pb, st->codec->extradata, len); | |
497 st->codec->extradata_size = len; | |
1039 | 498 /* from mplayer */ |
499 if ((*(uint8_t *)st->codec->extradata >> 3) == 29) { | |
500 st->codec->codec_id = CODEC_ID_MP3ON4; | |
501 } | |
887 | 502 } |
503 } | |
118 | 504 } |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
505 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
506 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
507 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
508 /* this atom contains actual media data */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
509 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
|
510 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
511 if(atom.size == 0) /* wrong one (MP4) */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
512 return 0; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
513 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
|
514 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
|
515 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
|
516 c->mdat_count++; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
517 c->found_mdat=1; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
518 c->mdat_offset = atom.offset; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
519 c->mdat_size = atom.size; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
520 if(c->found_moov) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
521 return 1; /* found both, just go */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
522 url_fskip(pb, atom.size); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
523 return 0; /* now go for moov */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
524 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
525 |
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
|
526 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
|
527 { |
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
|
528 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
|
529 |
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
|
530 /* from mplayer */ |
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
|
531 switch (type) { |
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
|
532 case MKTAG('i', 's', 'o', 'm'): |
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
|
533 case MKTAG('m', 'p', '4', '1'): |
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
|
534 case MKTAG('m', 'p', '4', '2'): |
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
|
535 case MKTAG('3', 'g', 'p', '1'): |
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
|
536 case MKTAG('3', 'g', 'p', '2'): |
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
|
537 case MKTAG('3', 'g', '2', 'a'): |
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
|
538 case MKTAG('3', 'g', 'p', '3'): |
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
|
539 case MKTAG('3', 'g', 'p', '4'): |
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
|
540 case MKTAG('3', 'g', 'p', '5'): |
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
|
541 case MKTAG('m', 'm', 'p', '4'): /* Mobile MP4 */ |
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
|
542 case MKTAG('M', '4', 'A', ' '): /* Apple iTunes AAC-LC Audio */ |
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
|
543 case MKTAG('M', '4', 'P', ' '): /* Apple iTunes AAC-LC Protected Audio */ |
997
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
544 case MKTAG('m', 'j', 'p', '2'): /* Motion Jpeg 2000 */ |
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
|
545 c->mp4 = 1; |
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
|
546 case MKTAG('q', 't', ' ', ' '): |
997
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
547 default: |
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
|
548 av_log(c->fc, AV_LOG_DEBUG, "ISO: File Type Major Brand: %.4s\n",(char *)&type); |
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
|
549 } |
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
|
550 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
|
551 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
|
552 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
|
553 } |
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
|
554 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
555 /* this atom should contain all header atoms */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
556 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
|
557 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
558 int err; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
559 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
560 err = mov_read_default(c, pb, atom); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
561 /* 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
|
562 /* 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
|
563 c->found_moov=1; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
564 if(c->found_mdat) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
565 return 1; /* found both, just go */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
566 return 0; /* now go for mdat */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
567 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
568 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
569 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
570 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
|
571 { |
1023 | 572 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
573 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; | |
574 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
|
575 int lang; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
576 |
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
|
577 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
|
578 return 1; /* unsupported */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
579 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
580 get_byte(pb); get_byte(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
581 get_byte(pb); /* flags */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
582 |
1023 | 583 if (version == 1) { |
584 get_be64(pb); | |
585 get_be64(pb); | |
586 } else { | |
587 get_be32(pb); /* creation time */ | |
588 get_be32(pb); /* modification time */ | |
589 } | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
590 |
1023 | 591 sc->time_scale = get_be32(pb); |
592 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
|
593 |
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
|
594 lang = get_be16(pb); /* language */ |
1023 | 595 ff_mov_lang_to_iso639(lang, st->language); |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
596 get_be16(pb); /* quality */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
597 |
118 | 598 return 0; |
599 } | |
600 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
601 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
|
602 { |
1022 | 603 int version = get_byte(pb); /* version */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
604 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
605 |
1022 | 606 if (version == 1) { |
607 get_be64(pb); | |
608 get_be64(pb); | |
609 } else { | |
610 get_be32(pb); /* creation time */ | |
611 get_be32(pb); /* modification time */ | |
612 } | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
613 c->time_scale = get_be32(pb); /* time scale */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
614 #ifdef DEBUG |
491 | 615 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
|
616 #endif |
1022 | 617 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
|
618 get_be32(pb); /* preferred scale */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
619 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
620 get_be16(pb); /* preferred volume */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
621 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
622 url_fskip(pb, 10); /* reserved */ |
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 url_fskip(pb, 36); /* display matrix */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
625 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
626 get_be32(pb); /* preview time */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
627 get_be32(pb); /* preview duration */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
628 get_be32(pb); /* poster time */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
629 get_be32(pb); /* selection time */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
630 get_be32(pb); /* selection duration */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
631 get_be32(pb); /* current time */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
632 get_be32(pb); /* next track ID */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
633 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
634 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
635 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
636 |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
637 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
|
638 { |
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
639 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
640 |
639 | 641 if((uint64_t)atom.size > (1<<30)) |
642 return -1; | |
885 | 643 |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
644 // 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
|
645 // 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
|
646 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
|
647 st->codec->extradata_size = 0x5a + atom.size; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
648 st->codec->extradata = (uint8_t*) 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
|
649 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
650 if (st->codec->extradata) { |
887 | 651 strcpy(st->codec->extradata, "SVQ3"); // fake |
652 get_buffer(pb, st->codec->extradata + 0x5a, atom.size); | |
1010 | 653 dprintf("Reading SMI %"PRId64" %s\n", atom.size, (char*)st->codec->extradata + 0x5a); |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
654 } else |
887 | 655 url_fskip(pb, atom.size); |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
656 |
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
657 return 0; |
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
658 } |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
659 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
660 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
|
661 { |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
662 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
|
663 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
|
664 |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
665 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
|
666 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
|
667 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
|
668 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
|
669 break; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
670 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
|
671 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
|
672 break; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
673 default: |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
674 break; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
675 } |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
676 } |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
677 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
|
678 } |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
679 |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
680 static int mov_read_alac(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
|
681 { |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
682 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
|
683 |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
684 // currently ALAC decoder expect full atom header - so let's fake it |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
685 // this should be fixed and just ALAC header should be passed |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
686 |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
687 av_free(st->codec->extradata); |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
688 st->codec->extradata_size = 36; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
689 st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
690 |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
691 if (st->codec->extradata) { |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
692 strcpy(st->codec->extradata + 4, "alac"); // fake |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
693 get_buffer(pb, st->codec->extradata + 8, 36 - 8); |
1008 | 694 dprintf("Reading alac %d %s\n", st->codec->extradata_size, (char*)st->codec->extradata); |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
695 } else |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
696 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
|
697 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
|
698 } |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
699 |
865 | 700 static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
701 { | |
702 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
703 | |
704 if((uint64_t)atom.size > (1<<30)) | |
705 return -1; | |
885 | 706 |
947
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
707 if (st->codec->codec_id == CODEC_ID_QDM2) { |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
708 // 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
|
709 av_free(st->codec->extradata); |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
710 st->codec->extradata_size = atom.size; |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
711 st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
865 | 712 |
947
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
713 if (st->codec->extradata) { |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
714 get_buffer(pb, st->codec->extradata, atom.size); |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
715 } else |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
716 url_fskip(pb, atom.size); |
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
717 } 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
|
718 mov_read_default(c, pb, atom); |
1060 | 719 } else |
887 | 720 url_fskip(pb, atom.size); |
865 | 721 return 0; |
722 } | |
723 | |
997
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
724 static int mov_read_jp2h(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
725 { |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
726 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
727 |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
728 if((uint64_t)atom.size > (1<<30)) |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
729 return -1; |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
730 |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
731 av_free(st->codec->extradata); |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
732 |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
733 st->codec->extradata_size = atom.size + 8; |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
734 st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
735 |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
736 /* pass all jp2h atom to codec */ |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
737 if (st->codec->extradata) { |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
738 strcpy(st->codec->extradata + 4, "jp2h"); |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
739 get_buffer(pb, st->codec->extradata + 8, atom.size); |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
740 } else |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
741 url_fskip(pb, atom.size); |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
742 return 0; |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
743 } |
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
744 |
615 | 745 static int mov_read_avcC(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
746 { | |
747 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
748 | |
639 | 749 if((uint64_t)atom.size > (1<<30)) |
750 return -1; | |
751 | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
752 av_free(st->codec->extradata); |
615 | 753 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
754 st->codec->extradata_size = atom.size; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
755 st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
615 | 756 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
757 if (st->codec->extradata) { |
887 | 758 get_buffer(pb, st->codec->extradata, atom.size); |
615 | 759 } else |
887 | 760 url_fskip(pb, atom.size); |
615 | 761 |
762 return 0; | |
763 } | |
764 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
765 static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 766 { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
767 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
768 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
639 | 769 unsigned int i, entries; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
770 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
771 get_byte(pb); /* version */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
772 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
773 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
774 entries = get_be32(pb); |
885 | 775 |
639 | 776 if(entries >= UINT_MAX/sizeof(int64_t)) |
777 return -1; | |
885 | 778 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
779 sc->chunk_count = entries; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
780 sc->chunk_offsets = (int64_t*) av_malloc(entries * sizeof(int64_t)); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
781 if (!sc->chunk_offsets) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
782 return -1; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
783 if (atom.type == MKTAG('s', 't', 'c', 'o')) { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
784 for(i=0; i<entries; i++) { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
785 sc->chunk_offsets[i] = get_be32(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
786 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
787 } else if (atom.type == MKTAG('c', 'o', '6', '4')) { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
788 for(i=0; i<entries; i++) { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
789 sc->chunk_offsets[i] = get_be64(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
790 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
791 } else |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
792 return -1; |
885 | 793 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
794 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
795 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
796 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
797 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
|
798 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
799 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
|
800 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
801 int entries, frames_per_sample; |
65 | 802 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
|
803 uint8_t codec_name[32]; |
121 | 804 |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
805 /* for palette traversal */ |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
806 int color_depth; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
807 int color_start; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
808 int color_count; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
809 int color_end; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
810 int color_index; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
811 int color_dec; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
812 int color_greyscale; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
813 unsigned char *color_table; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
814 int j; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
815 unsigned char r, g, b; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
816 |
0 | 817 get_byte(pb); /* version */ |
818 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
819 | |
820 entries = get_be32(pb); | |
821 | |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
822 while(entries--) { //Parsing Sample description table |
121 | 823 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
|
824 MOV_atom_t a = { 0, 0, 0 }; |
947
929f84cc63c3
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents:
943
diff
changeset
|
825 offset_t start_pos = url_ftell(pb); |
887 | 826 int size = get_be32(pb); /* size */ |
0 | 827 format = get_le32(pb); /* data format */ |
118 | 828 |
0 | 829 get_be32(pb); /* reserved */ |
830 get_be16(pb); /* reserved */ | |
831 get_be16(pb); /* index */ | |
832 | |
1156 | 833 if (st->codec->codec_tag) { |
834 /* multiple fourcc, just skip for now */ | |
835 url_fskip(pb, size - (url_ftell(pb) - start_pos)); | |
836 continue; | |
837 } | |
838 | |
887 | 839 st->codec->codec_tag = format; |
1032 | 840 id = codec_get_id(mov_audio_tags, format); |
841 if (id > 0) { | |
842 st->codec->codec_type = CODEC_TYPE_AUDIO; | |
1067
3d7fae1dfda4
skip null fourcc, fix ep2_mystery_m640_dummy.mov
bcoudurier
parents:
1063
diff
changeset
|
843 } else if (format && format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */ |
1032 | 844 id = codec_get_id(mov_video_tags, format); |
845 if (id <= 0) | |
846 id = codec_get_id(codec_bmp_tags, format); | |
847 if (id > 0) | |
848 st->codec->codec_type = CODEC_TYPE_VIDEO; | |
849 } | |
850 | |
1067
3d7fae1dfda4
skip null fourcc, fix ep2_mystery_m640_dummy.mov
bcoudurier
parents:
1063
diff
changeset
|
851 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
|
852 size, |
3d7fae1dfda4
skip null fourcc, fix ep2_mystery_m640_dummy.mov
bcoudurier
parents:
1063
diff
changeset
|
853 (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
|
854 st->codec->codec_type); |
3d7fae1dfda4
skip null fourcc, fix ep2_mystery_m640_dummy.mov
bcoudurier
parents:
1063
diff
changeset
|
855 |
887 | 856 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
|
857 st->codec->codec_id = id; |
0 | 858 get_be16(pb); /* version */ |
859 get_be16(pb); /* revision level */ | |
860 get_be32(pb); /* vendor */ | |
861 get_be32(pb); /* temporal quality */ | |
862 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
|
863 |
f0de744f87f9
set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay
bcoudurier
parents:
1062
diff
changeset
|
864 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
|
865 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
|
866 |
0 | 867 get_be32(pb); /* horiz resolution */ |
868 get_be32(pb); /* vert resolution */ | |
869 get_be32(pb); /* data size, always 0 */ | |
118 | 870 frames_per_sample = get_be16(pb); /* frames per samples */ |
0 | 871 #ifdef DEBUG |
887 | 872 av_log(NULL, AV_LOG_DEBUG, "frames/samples = %d\n", frames_per_sample); |
0 | 873 #endif |
1011 | 874 get_buffer(pb, codec_name, 32); /* codec name, pascal string (FIXME: true for mp4?) */ |
875 if (codec_name[0] <= 31) { | |
876 memcpy(st->codec->codec_name, &codec_name[1],codec_name[0]); | |
877 st->codec->codec_name[codec_name[0]] = 0; | |
878 } | |
0 | 879 |
887 | 880 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
|
881 st->codec->color_table_id = get_be16(pb); /* colortable id */ |
118 | 882 |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
883 /* 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
|
884 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
|
885 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
|
886 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
887 /* if the depth is 2, 4, or 8 bpp, file is palettized */ |
885 | 888 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
|
889 (color_depth == 8)) { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
890 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
891 if (color_greyscale) { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
892 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
893 /* compute the greyscale palette */ |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
894 color_count = 1 << color_depth; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
895 color_index = 255; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
896 color_dec = 256 / (color_count - 1); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
897 for (j = 0; j < color_count; j++) { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
898 r = g = b = color_index; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
899 c->palette_control.palette[j] = |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
900 (r << 16) | (g << 8) | (b); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
901 color_index -= color_dec; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
902 if (color_index < 0) |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
903 color_index = 0; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
904 } |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
905 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
906 } 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
|
907 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
908 /* 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
|
909 color_count = 1 << color_depth; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
910 if (color_depth == 2) |
431 | 911 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
|
912 else if (color_depth == 4) |
431 | 913 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
|
914 else |
431 | 915 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
|
916 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
917 for (j = 0; j < color_count; j++) { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
918 r = color_table[j * 4 + 0]; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
919 g = color_table[j * 4 + 1]; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
920 b = color_table[j * 4 + 2]; |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
921 c->palette_control.palette[j] = |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
922 (r << 16) | (g << 8) | (b); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
923 } |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
924 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
925 } else { |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
926 |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
927 /* load the palette from the file */ |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
928 color_start = get_be32(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
929 color_count = get_be16(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
930 color_end = get_be16(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
931 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
|
932 /* 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
|
933 * 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
|
934 * up front */ |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
935 get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
936 get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
937 r = get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
938 get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
939 g = get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
940 get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
941 b = get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
942 get_byte(pb); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
943 c->palette_control.palette[j] = |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
944 (r << 16) | (g << 8) | (b); |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
945 } |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
946 } |
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
947 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
805
diff
changeset
|
948 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
|
949 st->codec->palctrl->palette_changed = 1; |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
950 } 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
|
951 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
|
952 } 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
|
953 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
|
954 uint16_t version = get_be16(pb); |
302
6949df67922d
added palette support to the QT demuxer; registered SMC video decoder
melanson
parents:
301
diff
changeset
|
955 |
1032 | 956 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
|
957 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
|
958 get_be32(pb); /* vendor */ |
118 | 959 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
960 st->codec->channels = get_be16(pb); /* channel count */ |
1215 | 961 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
|
962 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
|
963 /* 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
|
964 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
965 /* 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
|
966 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
|
967 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
|
968 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
969 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
|
970 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
971 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
|
972 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
|
973 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
|
974 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
|
975 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
|
976 break; |
1029 | 977 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
|
978 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
|
979 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
|
980 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
|
981 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
|
982 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
|
983 break; |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
984 default: |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
985 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
|
986 } |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
987 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
988 bits_per_sample = av_get_bits_per_sample(st->codec->codec_id); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
989 if (bits_per_sample) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
990 st->codec->bits_per_sample = bits_per_sample; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
991 sc->sample_size = (bits_per_sample >> 3) * st->codec->channels; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
992 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
993 |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
994 //Read QT version 1 fields. In version 0 theese dont exist |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
995 dprintf("version =%d mp4=%d\n",version,c->mp4); |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
996 if(version==1) { |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
997 sc->sample_size_v1.den = get_be32(pb); /* samples per packet */ |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
998 get_be32(pb); /* bytes per packet */ |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
999 sc->sample_size_v1.num = get_be32(pb); /* bytes per frame */ |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
1000 get_be32(pb); /* bytes per sample */ |
994 | 1001 } else if(version==2) { |
1002 get_be32(pb); /* sizeof struct only */ | |
1003 st->codec->sample_rate = av_int2dbl(get_be64(pb)); /* float 64 */ | |
1004 st->codec->channels = get_be32(pb); | |
1005 get_be32(pb); /* always 0x7F000000 */ | |
1006 get_be32(pb); /* bits per channel if sound is uncompressed */ | |
1007 get_be32(pb); /* lcpm format specific flag */ | |
1008 get_be32(pb); /* bytes per audio packet if constant */ | |
1009 get_be32(pb); /* lpcm frames per audio packet if constant */ | |
147 | 1010 } |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
1011 } else { |
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
1012 /* 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
|
1013 url_fskip(pb, size - (url_ftell(pb) - start_pos)); |
0 | 1014 } |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
1015 /* 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
|
1016 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
|
1017 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
|
1018 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
|
1019 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
|
1020 url_fskip(pb, a.size); |
0 | 1021 } |
885 | 1022 |
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
|
1023 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
|
1024 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
|
1025 } |
1039 | 1026 |
1271
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
1027 /* special codec parameters handling */ |
1039 | 1028 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
|
1029 #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
|
1030 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
|
1031 #endif |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
1032 #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
|
1033 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
|
1034 #endif |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
1035 #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
|
1036 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
|
1037 #endif |
8c80d41a11cc
dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
bcoudurier
parents:
1270
diff
changeset
|
1038 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
|
1039 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
|
1040 break; |
1033
a757a0a3824f
let faad init parameters properly, fix many SBR samples
bcoudurier
parents:
1032
diff
changeset
|
1041 #ifdef CONFIG_FAAD |
1039 | 1042 case CODEC_ID_AAC: |
1043 #endif | |
1040
3c523d59d55c
let vorbis decoder init too, fix mi2_vorbis51.mp4
bcoudurier
parents:
1039
diff
changeset
|
1044 #ifdef CONFIG_VORBIS_DECODER |
3c523d59d55c
let vorbis decoder init too, fix mi2_vorbis51.mp4
bcoudurier
parents:
1039
diff
changeset
|
1045 case CODEC_ID_VORBIS: |
3c523d59d55c
let vorbis decoder init too, fix mi2_vorbis51.mp4
bcoudurier
parents:
1039
diff
changeset
|
1046 #endif |
1039 | 1047 case CODEC_ID_MP3ON4: |
1048 st->codec->sample_rate= 0; /* let decoder init parameters properly */ | |
1049 break; | |
1269 | 1050 #ifdef CONFIG_DV_DEMUXER |
1268 | 1051 case CODEC_ID_DVAUDIO: |
1052 c->dv_fctx = av_alloc_format_context(); | |
1053 c->dv_demux = dv_init_demux(c->dv_fctx); | |
1054 if (!c->dv_demux) { | |
1055 av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n"); | |
1056 return -1; | |
1057 } | |
1058 sc->dv_audio_container = 1; | |
1059 st->codec->codec_id = CODEC_ID_PCM_S16LE; | |
1060 break; | |
1269 | 1061 #endif |
1272
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
1062 /* no ifdef since parameters are always those */ |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
1063 case CODEC_ID_AMR_WB: |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
1064 st->codec->sample_rate= 16000; |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
1065 st->codec->channels= 1; /* really needed */ |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
1066 break; |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
1067 case CODEC_ID_AMR_NB: |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
1068 st->codec->sample_rate= 8000; |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
1069 st->codec->channels= 1; /* really needed */ |
943d9957b96a
move amr parameters adjusting like other codecs
bcoudurier
parents:
1271
diff
changeset
|
1070 break; |
1299 | 1071 case CODEC_ID_MP2: |
1072 st->need_parsing = 1; | |
1073 break; | |
1039 | 1074 default: |
1075 break; | |
1033
a757a0a3824f
let faad init parameters properly, fix many SBR samples
bcoudurier
parents:
1032
diff
changeset
|
1076 } |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1077 |
0 | 1078 return 0; |
1079 } | |
1080 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1081 static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 1082 { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1083 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1084 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
639 | 1085 unsigned int i, entries; |
0 | 1086 |
1087 get_byte(pb); /* version */ | |
1088 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
1089 | |
1090 entries = get_be32(pb); | |
885 | 1091 |
639 | 1092 if(entries >= UINT_MAX / sizeof(MOV_sample_to_chunk_tbl)) |
1093 return -1; | |
885 | 1094 |
0 | 1095 #ifdef DEBUG |
491 | 1096 av_log(NULL, AV_LOG_DEBUG, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1, entries); |
0 | 1097 #endif |
1098 sc->sample_to_chunk_sz = entries; | |
121 | 1099 sc->sample_to_chunk = (MOV_sample_to_chunk_tbl*) av_malloc(entries * sizeof(MOV_sample_to_chunk_tbl)); |
1100 if (!sc->sample_to_chunk) | |
1101 return -1; | |
0 | 1102 for(i=0; i<entries; i++) { |
1103 sc->sample_to_chunk[i].first = get_be32(pb); | |
1104 sc->sample_to_chunk[i].count = get_be32(pb); | |
1105 sc->sample_to_chunk[i].id = get_be32(pb); | |
1106 } | |
1107 return 0; | |
1108 } | |
1109 | |
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
|
1110 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
|
1111 { |
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
|
1112 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
|
1113 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
639 | 1114 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
|
1115 |
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
|
1116 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
|
1117 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
|
1118 |
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
|
1119 entries = get_be32(pb); |
885 | 1120 |
639 | 1121 if(entries >= UINT_MAX / sizeof(long)) |
1122 return -1; | |
885 | 1123 |
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
|
1124 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
|
1125 #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
|
1126 av_log(NULL, AV_LOG_DEBUG, "keyframe_count = %ld\n", sc->keyframe_count); |
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
|
1127 #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
|
1128 sc->keyframes = (long*) av_malloc(entries * sizeof(long)); |
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
|
1129 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
|
1130 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
|
1131 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
|
1132 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
|
1133 #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
|
1134 /* 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
|
1135 #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
|
1136 } |
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
|
1137 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
|
1138 } |
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
|
1139 |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1140 static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 1141 { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1142 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1143 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
|
1144 unsigned int i, entries, sample_size; |
121 | 1145 |
0 | 1146 get_byte(pb); /* version */ |
1147 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
118 | 1148 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1149 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
|
1150 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
|
1151 sc->sample_size = sample_size; |
0 | 1152 entries = get_be32(pb); |
639 | 1153 if(entries >= UINT_MAX / sizeof(long)) |
1154 return -1; | |
1155 | |
0 | 1156 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
|
1157 if (sample_size) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1158 return 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1159 |
0 | 1160 #ifdef DEBUG |
491 | 1161 av_log(NULL, AV_LOG_DEBUG, "sample_size = %ld sample_count = %ld\n", sc->sample_size, sc->sample_count); |
0 | 1162 #endif |
121 | 1163 sc->sample_sizes = (long*) av_malloc(entries * sizeof(long)); |
1164 if (!sc->sample_sizes) | |
1165 return -1; | |
0 | 1166 for(i=0; i<entries; i++) { |
1167 sc->sample_sizes[i] = get_be32(pb); | |
1168 #ifdef DEBUG | |
653
c61da0556426
Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents:
652
diff
changeset
|
1169 av_log(NULL, AV_LOG_DEBUG, "sample_sizes[]=%ld\n", sc->sample_sizes[i]); |
0 | 1170 #endif |
1171 } | |
1172 return 0; | |
1173 } | |
1174 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1175 static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 1176 { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1177 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
928 | 1178 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
639 | 1179 unsigned int i, entries; |
395
c1ed10f3b052
cleanup frame_rate code, this may also fix some large file bugs
michael
parents:
383
diff
changeset
|
1180 int64_t duration=0; |
c1ed10f3b052
cleanup frame_rate code, this may also fix some large file bugs
michael
parents:
383
diff
changeset
|
1181 int64_t total_sample_count=0; |
121 | 1182 |
0 | 1183 get_byte(pb); /* version */ |
1184 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
1185 entries = get_be32(pb); | |
670 | 1186 if(entries >= UINT_MAX / sizeof(Time2Sample)) |
639 | 1187 return -1; |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
1188 |
928 | 1189 sc->stts_count = entries; |
1190 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
|
1191 |
0 | 1192 #ifdef DEBUG |
491 | 1193 av_log(NULL, AV_LOG_DEBUG, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1, entries); |
0 | 1194 #endif |
928 | 1195 |
1196 sc->time_rate=0; | |
1197 | |
0 | 1198 for(i=0; i<entries; i++) { |
670 | 1199 int sample_duration; |
1200 int sample_count; | |
0 | 1201 |
134
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
1202 sample_count=get_be32(pb); |
0 | 1203 sample_duration = get_be32(pb); |
928 | 1204 sc->stts_data[i].count= sample_count; |
1205 sc->stts_data[i].duration= sample_duration; | |
1206 | |
1207 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
|
1208 |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1209 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
|
1210 |
1027 | 1211 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
|
1212 total_sample_count+=sample_count; |
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
1213 } |
5cda954c6e9a
AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
133
diff
changeset
|
1214 |
794
040cf31abb4b
another chapter in the neverending mov demuxer cleanup
michael
parents:
775
diff
changeset
|
1215 st->nb_frames= total_sample_count; |
040cf31abb4b
another chapter in the neverending mov demuxer cleanup
michael
parents:
775
diff
changeset
|
1216 if(duration) |
040cf31abb4b
another chapter in the neverending mov demuxer cleanup
michael
parents:
775
diff
changeset
|
1217 st->duration= duration; |
0 | 1218 return 0; |
1219 } | |
1220 | |
671 | 1221 static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
1222 { | |
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
|
1223 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
|
1224 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; |
671 | 1225 unsigned int i, entries; |
1226 | |
1227 get_byte(pb); /* version */ | |
1228 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
1229 entries = get_be32(pb); | |
1230 if(entries >= UINT_MAX / sizeof(Time2Sample)) | |
1231 return -1; | |
1232 | |
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
|
1233 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
|
1234 sc->ctts_data = av_malloc(entries * sizeof(Time2Sample)); |
671 | 1235 |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1236 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
|
1237 |
671 | 1238 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
|
1239 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
|
1240 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
|
1241 |
1042
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1242 if (duration < 0) { |
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1243 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
|
1244 sc->ctts_count = 0; |
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1245 url_fskip(pb, 8 * (entries - i - 1)); |
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1246 break; |
d641f2cdb692
ignore wrong negative cts values created by quicktime
bcoudurier
parents:
1040
diff
changeset
|
1247 } |
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
|
1248 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
|
1249 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
|
1250 |
d5b8ab2409f7
some mov files have invalid pts so we need to consider these pts too in calculating the timabase
michael
parents:
999
diff
changeset
|
1251 sc->time_rate= ff_gcd(sc->time_rate, duration); |
671 | 1252 } |
1253 return 0; | |
1254 } | |
1255 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1256 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
|
1257 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1258 AVStream *st; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1259 MOVStreamContext *sc; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1260 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1261 st = av_new_stream(c->fc, c->fc->nb_streams); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1262 if (!st) return -2; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1263 sc = (MOVStreamContext*) av_mallocz(sizeof(MOVStreamContext)); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1264 if (!sc) { |
887 | 1265 av_free(st); |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1266 return -1; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1267 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1268 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1269 st->priv_data = sc; |
1118 | 1270 st->codec->codec_type = CODEC_TYPE_DATA; |
191 | 1271 st->start_time = 0; /* XXX: check */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1272 c->streams[c->fc->nb_streams-1] = sc; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1273 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1274 return mov_read_default(c, pb, atom); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1275 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1276 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1277 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
|
1278 { |
1023 | 1279 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
1280 int version = get_byte(pb); | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1281 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1282 get_byte(pb); get_byte(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1283 get_byte(pb); /* flags */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1284 /* |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1285 MOV_TRACK_ENABLED 0x0001 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1286 MOV_TRACK_IN_MOVIE 0x0002 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1287 MOV_TRACK_IN_PREVIEW 0x0004 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1288 MOV_TRACK_IN_POSTER 0x0008 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1289 */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1290 |
1022 | 1291 if (version == 1) { |
1292 get_be64(pb); | |
1293 get_be64(pb); | |
1294 } else { | |
1295 get_be32(pb); /* creation time */ | |
1296 get_be32(pb); /* modification time */ | |
1297 } | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1298 st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1299 get_be32(pb); /* reserved */ |
191 | 1300 st->start_time = 0; /* check */ |
1022 | 1301 (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
|
1302 get_be32(pb); /* reserved */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1303 get_be32(pb); /* reserved */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1304 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1305 get_be16(pb); /* layer */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1306 get_be16(pb); /* alternate group */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1307 get_be16(pb); /* volume */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1308 get_be16(pb); /* reserved */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1309 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1310 url_fskip(pb, 36); /* display matrix */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1311 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1312 /* those are fixed-point */ |
1113 | 1313 get_be32(pb); /* track width */ |
1314 get_be32(pb); /* track height */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1315 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1316 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1317 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1318 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1319 /* 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
|
1320 /* 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
|
1321 /* http://graphics.tudelft.nl/~wouter/publications/soundtests/ */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1322 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
|
1323 { |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1324 int err; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1325 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1326 if (atom.size < 8) |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1327 return 0; /* continue */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1328 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
|
1329 url_fskip(pb, atom.size - 4); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1330 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1331 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1332 atom.type = get_le32(pb); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1333 atom.offset += 8; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1334 atom.size -= 8; |
131 | 1335 if (atom.type != MKTAG('m', 'd', 'a', 't')) { |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1336 url_fskip(pb, atom.size); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1337 return 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1338 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1339 err = mov_read_mdat(c, pb, atom); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1340 return err; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1341 } |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1342 |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1343 |
0 | 1344 #ifdef CONFIG_ZLIB |
65 | 1345 static int null_read_packet(void *opaque, uint8_t *buf, int buf_size) |
0 | 1346 { |
1347 return -1; | |
1348 } | |
1349 | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1350 static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) |
0 | 1351 { |
1352 ByteIOContext ctx; | |
121 | 1353 uint8_t *cmov_data; |
1354 uint8_t *moov_data; /* uncompressed data */ | |
0 | 1355 long cmov_len, moov_len; |
1356 int ret; | |
121 | 1357 |
0 | 1358 get_be32(pb); /* dcom atom */ |
1359 if (get_le32(pb) != MKTAG( 'd', 'c', 'o', 'm' )) | |
1360 return -1; | |
1361 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
|
1362 av_log(NULL, AV_LOG_ERROR, "unknown compression for cmov atom !"); |
0 | 1363 return -1; |
1364 } | |
1365 get_be32(pb); /* cmvd atom */ | |
1366 if (get_le32(pb) != MKTAG( 'c', 'm', 'v', 'd' )) | |
1367 return -1; | |
1368 moov_len = get_be32(pb); /* uncompressed size */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1369 cmov_len = atom.size - 6 * 4; |
118 | 1370 |
121 | 1371 cmov_data = (uint8_t *) av_malloc(cmov_len); |
0 | 1372 if (!cmov_data) |
1373 return -1; | |
121 | 1374 moov_data = (uint8_t *) av_malloc(moov_len); |
0 | 1375 if (!moov_data) { |
1376 av_free(cmov_data); | |
1377 return -1; | |
1378 } | |
1379 get_buffer(pb, cmov_data, cmov_len); | |
121 | 1380 if(uncompress (moov_data, (uLongf *) &moov_len, (const Bytef *)cmov_data, cmov_len) != Z_OK) |
0 | 1381 return -1; |
1382 if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, null_read_packet, NULL, NULL) != 0) | |
1383 return -1; | |
1384 ctx.buf_end = ctx.buffer + moov_len; | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1385 atom.type = MKTAG( 'm', 'o', 'o', 'v' ); |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1386 atom.offset = 0; |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1387 atom.size = moov_len; |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
1388 #ifdef DEBUG |
953 | 1389 // { 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
|
1390 #endif |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1391 ret = mov_read_default(c, &ctx, atom); |
0 | 1392 av_free(moov_data); |
1393 av_free(cmov_data); | |
132
9ca36221ae23
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents:
131
diff
changeset
|
1394 |
0 | 1395 return ret; |
1396 } | |
1397 #endif | |
1398 | |
491 | 1399 /* edit list atom */ |
1400 static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) | |
1401 { | |
1061 | 1402 int i, edit_count; |
491 | 1403 |
1061 | 1404 get_byte(pb); /* version */ |
1405 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ | |
1406 edit_count= c->streams[c->fc->nb_streams-1]->edit_count = get_be32(pb); /* entries */ | |
885 | 1407 |
1061 | 1408 for(i=0; i<edit_count; i++){ |
1409 get_be32(pb); /* Track duration */ | |
1410 get_be32(pb); /* Media time */ | |
1411 get_be32(pb); /* Media rate */ | |
1412 } | |
1413 dprintf("track[%i].edit_count = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->edit_count); | |
1414 return 0; | |
491 | 1415 } |
1416 | |
0 | 1417 static const MOVParseTableEntry mov_default_parse_table[] = { |
1418 /* mp4 atoms */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1419 { MKTAG( 'c', 'o', '6', '4' ), mov_read_stco }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1420 { MKTAG( 'c', 'p', 'r', 't' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1421 { MKTAG( 'c', 'r', 'h', 'd' ), mov_read_default }, |
671 | 1422 { 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
|
1423 { MKTAG( 'd', 'i', 'n', 'f' ), mov_read_default }, /* data information */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1424 { MKTAG( 'd', 'p', 'n', 'd' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1425 { MKTAG( 'd', 'r', 'e', 'f' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1426 { 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
|
1427 { 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
|
1428 { MKTAG( 'e', 'n', 'd', 'a' ), mov_read_enda }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1429 { MKTAG( 'f', 'r', 'e', 'e' ), mov_read_leaf }, |
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
|
1430 { MKTAG( 'f', 't', 'y', 'p' ), mov_read_ftyp }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1431 { MKTAG( 'h', 'd', 'l', 'r' ), mov_read_hdlr }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1432 { MKTAG( 'h', 'i', 'n', 't' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1433 { MKTAG( 'h', 'm', 'h', 'd' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1434 { MKTAG( 'i', 'o', 'd', 's' ), mov_read_leaf }, |
997
fb3380061c31
add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
994
diff
changeset
|
1435 { MKTAG( 'j', 'p', '2', 'h' ), mov_read_jp2h }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1436 { MKTAG( 'm', 'd', 'a', 't' ), mov_read_mdat }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1437 { MKTAG( 'm', 'd', 'h', 'd' ), mov_read_mdhd }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1438 { MKTAG( 'm', 'd', 'i', 'a' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1439 { MKTAG( 'm', 'i', 'n', 'f' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1440 { MKTAG( 'm', 'o', 'o', 'v' ), mov_read_moov }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1441 { MKTAG( 'm', 'p', '4', 'a' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1442 { MKTAG( 'm', 'p', '4', 's' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1443 { MKTAG( 'm', 'p', '4', 'v' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1444 { MKTAG( 'm', 'p', 'o', 'd' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1445 { MKTAG( 'm', 'v', 'h', 'd' ), mov_read_mvhd }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1446 { MKTAG( 'n', 'm', 'h', 'd' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1447 { MKTAG( 'o', 'd', 'h', 'd' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1448 { MKTAG( 's', 'd', 'h', 'd' ), mov_read_default }, |
489
aeb69a5f3756
The atom 'skip' should be handled by 'mov_read_leaf()', not by
michael
parents:
438
diff
changeset
|
1449 { MKTAG( 's', 'k', 'i', 'p' ), mov_read_leaf }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1450 { MKTAG( 's', 'm', 'h', 'd' ), mov_read_leaf }, /* sound media info header */ |
615 | 1451 { MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorenson extension ??? */ |
968
dbf4bc73c7c9
Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
967
diff
changeset
|
1452 { MKTAG( 'a', 'l', 'a', 'c' ), mov_read_alac }, /* alac specific atom */ |
885 | 1453 { MKTAG( 'a', 'v', 'c', 'C' ), mov_read_avcC }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1454 { MKTAG( 's', 't', 'b', 'l' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1455 { MKTAG( 's', 't', 'c', 'o' ), mov_read_stco }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1456 { MKTAG( 's', 't', 'd', 'p' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1457 { MKTAG( 's', 't', 's', 'c' ), mov_read_stsc }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1458 { MKTAG( 's', 't', 's', 'd' ), mov_read_stsd }, /* sample description */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1459 { MKTAG( 's', 't', 's', 'h' ), mov_read_default }, |
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
|
1460 { 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
|
1461 { MKTAG( 's', 't', 's', 'z' ), mov_read_stsz }, /* sample size */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1462 { MKTAG( 's', 't', 't', 's' ), mov_read_stts }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1463 { MKTAG( 't', 'k', 'h', 'd' ), mov_read_tkhd }, /* track header */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1464 { MKTAG( 't', 'r', 'a', 'k' ), mov_read_trak }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1465 { MKTAG( 't', 'r', 'e', 'f' ), mov_read_default }, /* not really */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1466 { MKTAG( 'u', 'd', 't', 'a' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1467 { MKTAG( 'u', 'r', 'l', ' ' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1468 { MKTAG( 'u', 'r', 'n', ' ' ), mov_read_leaf }, |
695
645c4432947b
uuid patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
691
diff
changeset
|
1469 { MKTAG( 'u', 'u', 'i', 'd' ), mov_read_leaf }, |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1470 { MKTAG( 'v', 'm', 'h', 'd' ), mov_read_leaf }, /* video media info header */ |
865 | 1471 { MKTAG( 'w', 'a', 'v', 'e' ), mov_read_wave }, |
0 | 1472 /* extra mp4 */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1473 { MKTAG( 'M', 'D', 'E', 'S' ), mov_read_leaf }, |
0 | 1474 /* QT atoms */ |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1475 { MKTAG( 'c', 'h', 'a', 'p' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1476 { MKTAG( 'c', 'l', 'i', 'p' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1477 { MKTAG( 'c', 'r', 'g', 'n' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1478 { MKTAG( 'c', 't', 'a', 'b' ), mov_read_ctab }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1479 { MKTAG( 'e', 's', 'd', 's' ), mov_read_esds }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1480 { MKTAG( 'k', 'm', 'a', 't' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1481 { MKTAG( 'm', 'a', 't', 't' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1482 { MKTAG( 'r', 'd', 'r', 'f' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1483 { MKTAG( 'r', 'm', 'd', 'a' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1484 { MKTAG( 'r', 'm', 'd', 'r' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1485 { MKTAG( 'r', 'm', 'r', 'a' ), mov_read_default }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1486 { MKTAG( 's', 'c', 'p', 't' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1487 { MKTAG( 's', 's', 'r', 'c' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1488 { MKTAG( 's', 'y', 'n', 'c' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1489 { MKTAG( 't', 'c', 'm', 'd' ), mov_read_leaf }, |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1490 { MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1491 //{ MKTAG( 'r', 'm', 'q', 'u' ), mov_read_leaf }, |
0 | 1492 #ifdef CONFIG_ZLIB |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1493 { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_cmov }, |
0 | 1494 #else |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1495 { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_leaf }, |
0 | 1496 #endif |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1497 { 0L, mov_read_leaf } |
0 | 1498 }; |
1499 | |
1500 static void mov_free_stream_context(MOVStreamContext *sc) | |
1501 { | |
1502 if(sc) { | |
885 | 1503 av_freep(&sc->ctts_data); |
671 | 1504 av_freep(&sc); |
0 | 1505 } |
1506 } | |
1507 | |
121 | 1508 /* XXX: is it sufficient ? */ |
0 | 1509 static int mov_probe(AVProbeData *p) |
1510 { | |
1511 unsigned int offset; | |
1512 uint32_t tag; | |
658 | 1513 int score = 0; |
0 | 1514 |
1515 /* check file header */ | |
1516 if (p->buf_size <= 12) | |
1517 return 0; | |
1518 offset = 0; | |
1519 for(;;) { | |
1520 /* ignore invalid offset */ | |
1521 if ((offset + 8) > (unsigned int)p->buf_size) | |
658 | 1522 return score; |
1165 | 1523 tag = LE_32(p->buf + offset + 4); |
0 | 1524 switch(tag) { |
658 | 1525 /* 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
|
1526 case MKTAG( 'j', 'P', ' ', ' ' ): /* jpeg 2000 signature */ |
0 | 1527 case MKTAG( 'm', 'o', 'o', 'v' ): |
24 | 1528 case MKTAG( 'm', 'd', 'a', 't' ): |
1529 case MKTAG( 'p', 'n', 'o', 't' ): /* detect movs with preview pics like ew.mov and april.mov */ | |
146 | 1530 case MKTAG( 'u', 'd', 't', 'a' ): /* Packet Video PVAuthor adds this and a lot of more junk */ |
0 | 1531 return AVPROBE_SCORE_MAX; |
658 | 1532 /* those are more common words, so rate then a bit less */ |
1533 case MKTAG( 'w', 'i', 'd', 'e' ): | |
1534 case MKTAG( 'f', 'r', 'e', 'e' ): | |
1535 case MKTAG( 'j', 'u', 'n', 'k' ): | |
1536 case MKTAG( 'p', 'i', 'c', 't' ): | |
1537 return AVPROBE_SCORE_MAX - 5; | |
0 | 1538 case MKTAG( 'f', 't', 'y', 'p' ): |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1539 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
|
1540 case MKTAG( 'u', 'u', 'i', 'd' ): |
1165 | 1541 offset = BE_32(p->buf+offset) + offset; |
658 | 1542 /* if we only find those cause probedata is too small at least rate them */ |
1543 score = AVPROBE_SCORE_MAX - 50; | |
0 | 1544 break; |
1545 default: | |
1546 /* unrecognized tag */ | |
658 | 1547 return score; |
0 | 1548 } |
1549 } | |
658 | 1550 return score; |
0 | 1551 } |
1552 | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1553 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
|
1554 { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1555 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
|
1556 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
|
1557 int64_t current_dts = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1558 int stts_index = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1559 int stsc_index = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1560 int stss_index = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1561 int i, j, k; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1562 |
1268 | 1563 if (sc->sample_sizes || st->codec->codec_type == CODEC_TYPE_VIDEO || sc->dv_audio_container) { |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1564 int keyframe, sample_size; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1565 int current_sample = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1566 int stts_sample = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1567 int distance = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1568 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1569 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
|
1570 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
|
1571 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
|
1572 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
|
1573 stsc_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1574 for (j = 0; j < sc->sample_to_chunk[stsc_index].count; j++) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1575 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
|
1576 if (keyframe) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1577 distance = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1578 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
|
1579 stss_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1580 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1581 sample_size = sc->sample_size > 0 ? sc->sample_size : sc->sample_sizes[current_sample]; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1582 dprintf("AVIndex stream %d, sample %d, offset %llx, dts %lld, size %d, distance %d, keyframe %d\n", |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1583 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
|
1584 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
|
1585 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
|
1586 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
|
1587 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
|
1588 distance++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1589 stts_sample++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1590 if (current_sample + 1 < sc->sample_count) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1591 current_sample++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1592 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
|
1593 stts_sample = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1594 stts_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1595 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1596 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1597 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1598 } else { /* read whole chunk */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1599 int chunk_samples, 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
|
1600 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1601 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
|
1602 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
|
1603 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
|
1604 stsc_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1605 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
|
1606 /* 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
|
1607 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
|
1608 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
|
1609 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
|
1610 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
|
1611 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
|
1612 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
|
1613 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
|
1614 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
|
1615 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1616 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
|
1617 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
|
1618 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
|
1619 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
|
1620 break; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1621 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1622 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1623 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1624 /* 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
|
1625 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
|
1626 for (j = 0; j < mov->mdat_count; j++) { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1627 dprintf("mdat %d, offset %llx, size %lld, current offset %llx\n", |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1628 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
|
1629 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
|
1630 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
|
1631 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1632 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
|
1633 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
|
1634 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
|
1635 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1636 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1637 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
|
1638 /* get chunk duration */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1639 chunk_duration = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1640 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
|
1641 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
|
1642 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
|
1643 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
|
1644 break; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1645 } else { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1646 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
|
1647 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
|
1648 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
|
1649 stts_index++; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1650 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1651 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1652 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1653 dprintf("AVIndex stream %d, chunk %d, offset %llx, dts %lld, size %d, duration %d\n", |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1654 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
|
1655 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
|
1656 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
|
1657 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1658 } |
1162 | 1659 /* adjust sample count to avindex entries */ |
1660 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
|
1661 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1662 |
0 | 1663 static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) |
1664 { | |
121 | 1665 MOVContext *mov = (MOVContext *) s->priv_data; |
0 | 1666 ByteIOContext *pb = &s->pb; |
1118 | 1667 int i, err; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1668 MOV_atom_t atom = { 0, 0, 0 }; |
0 | 1669 |
1670 mov->fc = s; | |
121 | 1671 mov->parse_table = mov_default_parse_table; |
956
18bb4485996c
useless code removal by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
955
diff
changeset
|
1672 |
0 | 1673 if(!url_is_streamed(pb)) /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ |
887 | 1674 atom.size = url_fsize(pb); |
0 | 1675 else |
887 | 1676 atom.size = 0x7FFFFFFFFFFFFFFFLL; |
0 | 1677 |
1678 /* check MOV header */ | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1679 err = mov_read_default(mov, pb, atom); |
133 | 1680 if (err<0 || (!mov->found_moov && !mov->found_mdat)) { |
887 | 1681 av_log(s, AV_LOG_ERROR, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%"PRId64"\n", |
1682 err, mov->found_moov, mov->found_mdat, url_ftell(pb)); | |
1683 return -1; | |
0 | 1684 } |
952
5fdcae83a82f
mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
949
diff
changeset
|
1685 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
|
1686 |
0 | 1687 /* some cleanup : make sure we are on the mdat atom */ |
1688 if(!url_is_streamed(pb) && (url_ftell(pb) != mov->mdat_offset)) | |
1689 url_fseek(pb, mov->mdat_offset, SEEK_SET); | |
1690 | |
1118 | 1691 mov->total_streams = s->nb_streams; |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1692 |
1118 | 1693 for(i=0; i<mov->total_streams; i++) { |
1694 MOVStreamContext *sc = mov->streams[i]; | |
928 | 1695 |
1118 | 1696 if(!sc->time_rate) |
1697 sc->time_rate=1; | |
1698 if(!sc->time_scale) | |
1699 sc->time_scale= mov->time_scale; | |
1700 av_set_pts_info(s->streams[i], 64, sc->time_rate, sc->time_scale); | |
928 | 1701 |
1118 | 1702 if(s->streams[i]->duration != AV_NOPTS_VALUE){ |
1703 assert(s->streams[i]->duration % sc->time_rate == 0); | |
1704 s->streams[i]->duration /= sc->time_rate; | |
955 | 1705 } |
1118 | 1706 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
|
1707 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
|
1708 } |
928 | 1709 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1710 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
|
1711 /* 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
|
1712 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
|
1713 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
|
1714 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
|
1715 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
|
1716 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
|
1717 } |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1718 av_freep(&mov->mdat_list); |
0 | 1719 return 0; |
1720 } | |
1721 | |
1722 static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) | |
1723 { | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1724 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
|
1725 MOVStreamContext *sc = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1726 AVIndexEntry *sample = 0; |
769 | 1727 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
|
1728 int i; |
0 | 1729 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1730 for (i = 0; i < mov->total_streams; i++) { |
887 | 1731 MOVStreamContext *msc = mov->streams[i]; |
769 | 1732 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1733 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
|
1734 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
|
1735 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
|
1736 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1737 dprintf("stream %d, sample %ld, dts %lld\n", i, msc->current_sample, dts); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1738 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
|
1739 sample = current_sample; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1740 best_dts = dts; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1741 sc = msc; |
769 | 1742 } |
0 | 1743 } |
1744 } | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1745 if (!sample) |
887 | 1746 return -1; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1747 /* 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
|
1748 sc->current_sample++; |
1162 | 1749 if (sample->pos >= url_fsize(&s->pb)) { |
1750 av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%llx: 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
|
1751 return -1; |
0 | 1752 } |
1270 | 1753 #ifdef CONFIG_DV_DEMUXER |
1268 | 1754 if (sc->dv_audio_container) { |
1755 dv_get_packet(mov->dv_demux, pkt); | |
1756 dprintf("dv audio pkt size %d\n", pkt->size); | |
1757 } else { | |
1270 | 1758 #endif |
1268 | 1759 url_fseek(&s->pb, sample->pos, SEEK_SET); |
1760 av_get_packet(&s->pb, pkt, sample->size); | |
1270 | 1761 #ifdef CONFIG_DV_DEMUXER |
1268 | 1762 if (mov->dv_demux) { |
1763 void *pkt_destruct_func = pkt->destruct; | |
1764 dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size); | |
1765 pkt->destruct = pkt_destruct_func; | |
1766 } | |
1767 } | |
1270 | 1768 #endif |
0 | 1769 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
|
1770 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
|
1771 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
|
1772 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
|
1773 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
|
1774 /* update ctts context */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1775 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
|
1776 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
|
1777 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
|
1778 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
|
1779 } |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1780 } else { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1781 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
|
1782 } |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1783 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
|
1784 pkt->pos = sample->pos; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1785 dprintf("stream %d, pts %lld, dts %lld, pos 0x%llx, duration %d\n", pkt->stream_index, pkt->pts, pkt->dts, pkt->pos, pkt->duration); |
0 | 1786 return 0; |
1787 } | |
1788 | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1789 static int mov_seek_stream(AVStream *st, int64_t timestamp, int flags) |
491 | 1790 { |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1791 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
|
1792 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
|
1793 int i; |
491 | 1794 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1795 sample = av_index_search_timestamp(st, timestamp, flags); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1796 dprintf("stream %d, timestamp %lld, sample %d\n", st->index, timestamp, sample); |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1797 if (sample < 0) /* not sure what to do */ |
491 | 1798 return -1; |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1799 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
|
1800 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
|
1801 /* adjust ctts index */ |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1802 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
|
1803 time_sample = 0; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1804 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
|
1805 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
|
1806 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
|
1807 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
|
1808 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
|
1809 break; |
491 | 1810 } |
1811 } | |
1812 } | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1813 return sample; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1814 } |
491 | 1815 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1816 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
|
1817 { |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1818 AVStream *st; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1819 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
|
1820 int sample; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1821 int i; |
491 | 1822 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1823 if (stream_index >= s->nb_streams) |
491 | 1824 return -1; |
1825 | |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1826 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
|
1827 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
|
1828 if (sample < 0) |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1829 return -1; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1830 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1831 /* 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
|
1832 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
|
1833 |
1161
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1834 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
|
1835 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
|
1836 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
|
1837 continue; |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1838 |
b340deaf925b
new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
bcoudurier
parents:
1157
diff
changeset
|
1839 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
|
1840 mov_seek_stream(st, timestamp, flags); |
885 | 1841 } |
491 | 1842 return 0; |
1843 } | |
1844 | |
0 | 1845 static int mov_read_close(AVFormatContext *s) |
1846 { | |
1847 int i; | |
121 | 1848 MOVContext *mov = (MOVContext *) s->priv_data; |
0 | 1849 for(i=0; i<mov->total_streams; i++) |
1850 mov_free_stream_context(mov->streams[i]); | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1851 /* free color tabs */ |
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1852 for(i=0; i<mov->ctab_size; i++) |
887 | 1853 av_freep(&mov->ctab[i]); |
1268 | 1854 if(mov->dv_demux){ |
1855 for(i=0; i<mov->dv_fctx->nb_streams; i++){ | |
1856 av_freep(&mov->dv_fctx->streams[i]->codec); | |
1857 av_freep(&mov->dv_fctx->streams[i]); | |
1858 } | |
1859 av_freep(&mov->dv_fctx); | |
1860 av_freep(&mov->dv_demux); | |
1861 } | |
130
f607ed6aa365
* support for AAC audio (esds decoding - using extradata)
kabi
parents:
129
diff
changeset
|
1862 av_freep(&mov->ctab); |
0 | 1863 return 0; |
1864 } | |
1865 | |
1169 | 1866 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
|
1867 "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
|
1868 "QuickTime/MPEG4/Motion JPEG 2000 format", |
0 | 1869 sizeof(MOVContext), |
1870 mov_probe, | |
1871 mov_read_header, | |
1872 mov_read_packet, | |
1873 mov_read_close, | |
491 | 1874 mov_read_seek, |
0 | 1875 }; |