annotate mov.c @ 971:43f85eba04c4 libavformat

CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
author michael
date Wed, 22 Feb 2006 23:46:20 +0000
parents dbf4bc73c7c9
children 41b4111a021e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2 * MOV decoder.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2001 Fabrice Bellard.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
21
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
22 //#define DEBUG
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
23
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25 #include "avi.h"
943
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
26 #include "mov.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28 #ifdef CONFIG_ZLIB
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29 #include <zlib.h>
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 * First version by Francois Revol revol@free.fr
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
34 * Seek function by Gael Chardon gael.dev@4now.net
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
35 *
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
36 * Features and limitations:
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
37 * - reads most of the QT files I have (at least the structure),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
38 * the exceptions are .mov with zlib compressed headers ('cmov' section). It shouldn't be hard to implement.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 * FIXED, Francois Revol, 07/17/2002
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 * - ffmpeg has nearly none of the usual QuickTime codecs,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
41 * although I succesfully dumped raw and mp3 audio tracks off .mov files.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42 * Sample QuickTime files with mp3 audio can be found at: http://www.3ivx.com/showcase.html
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 * - .mp4 parsing is still hazardous, although the format really is QuickTime with some minor changes
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 * (to make .mov parser crash maybe ?), despite what they say in the MPEG FAQ at
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45 * http://mpeg.telecomitalialab.com/faq.htm
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
46 * - the code is quite ugly... maybe I won't do it recursive next time :-)
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
47 * - 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
48 *
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49 * Funny I didn't know about http://sourceforge.net/projects/qt-ffmpeg/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50 * when coding this :) (it's a writer anyway)
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
51 *
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
52 * Reference documents:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 * http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 * Apple:
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
55 * 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
56 * http://developer.apple.com/documentation/QuickTime/QTFF/qtff.pdf
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 * QuickTime is a trademark of Apple (AFAIK :))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59
302
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
60 #include "qtpalette.h"
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
61
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
62
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
63 #undef NDEBUG
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
64 #include <assert.h>
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
65
954
7d778342142f mov split chunks removal patch by (Baptiste COUDURIER / baptiste.coudurier smartjog com>
michael
parents: 953
diff changeset
66 /* Allows seeking */
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
67 #define MOV_SEEK
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
68
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
69 /* Special handling for movies created with Minolta Dimaxe Xi*/
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
70 /* this fix should not interfere with other .mov files, but just in case*/
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
71 #define MOV_MINOLTA_FIX
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
72
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 /* some streams in QT (and in MP4 mostly) aren't either video nor audio */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 /* so we first list them as this, then clean up the list of streams we give back, */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 /* getting rid of these */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
76 #define CODEC_TYPE_MOV_OTHER (enum CodecType) 2
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77
943
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
78 /* http://gpac.sourceforge.net/tutorial/mediatypes.htm */
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
79 const CodecTag ff_mov_obj_type[] = {
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
80 { CODEC_ID_MPEG4 , 32 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
81 { CODEC_ID_H264 , 33 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
82 { CODEC_ID_AAC , 64 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
83 { CODEC_ID_MPEG2VIDEO, 96 }, /* MPEG2 Simple */
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
84 { CODEC_ID_MPEG2VIDEO, 97 }, /* MPEG2 Main */
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
85 { CODEC_ID_MPEG2VIDEO, 98 }, /* MPEG2 SNR */
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
86 { CODEC_ID_MPEG2VIDEO, 99 }, /* MPEG2 Spatial */
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
87 { CODEC_ID_MPEG2VIDEO, 100 }, /* MPEG2 High */
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
88 { CODEC_ID_MPEG2VIDEO, 101 }, /* MPEG2 422 */
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
89 { CODEC_ID_AAC , 102 }, /* MPEG2 AAC Main */
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
90 { CODEC_ID_AAC , 103 }, /* MPEG2 AAC Low */
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
91 { CODEC_ID_AAC , 104 }, /* MPEG2 AAC SSR */
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
92 { CODEC_ID_MP3 , 105 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
93 { CODEC_ID_MPEG1VIDEO, 106 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
94 { CODEC_ID_MP2 , 107 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
95 { CODEC_ID_MJPEG , 108 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
96 { CODEC_ID_PCM_S16LE , 224 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
97 { CODEC_ID_VORBIS , 225 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
98 { CODEC_ID_AC3 , 226 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
99 { CODEC_ID_PCM_ALAW , 227 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
100 { CODEC_ID_PCM_MULAW , 228 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
101 { CODEC_ID_PCM_S16BE , 230 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
102 { CODEC_ID_H263 , 242 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
103 { CODEC_ID_H261 , 243 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
104 { 0, 0 },
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
105 };
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
106
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 static const CodecTag mov_video_tags[] = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 /* { CODEC_ID_, MKTAG('c', 'v', 'i', 'd') }, *//* Cinepak */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 /* { CODEC_ID_H263, MKTAG('r', 'a', 'w', ' ') }, *//* Uncompressed RGB */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 /* { 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
111 /* { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, *//* YUV with alpha-channel (AVID Uncompressed) */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 /* Graphics */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 /* Animation */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 /* Apple video */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 /* Kodak Photo CD */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 { CODEC_ID_MJPEG, 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
120 { 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
121 /* { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channel (AVID ABVB/Truevision NuVista) */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 /* { CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, *//* embedded gif files as frames (usually one "click to play movie" frame) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 /* Sorenson video */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, /* Sorenson Video v1 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, /* Sorenson Video v1 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
126 { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', 'i') }, /* Sorenson Video v1 (from QT specs)*/
129
b1843685a8f7 svq3 decoder by anonymous
michaelni
parents: 124
diff changeset
127 { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
289
4baa098c12c3 added XVID fourcc (ISO MPEG-4?) and AC3 fourcc
melanson
parents: 286
diff changeset
130 { 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
131 { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, /* experimental: 3IVX files before ivx D4 4.5.1 */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 /* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */
133
31f0dda651f8 * added s263 (mapped to h263 - 3gp files)
kabi
parents: 132
diff changeset
134 { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */
101
0865b0aaa2af QT AVID 4CCs patch by ("Sebastien Bechet" <s dot bechet at av7 dot net>) (not tested)
mmu_man
parents: 85
diff changeset
137 /* { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, *//* AVID dv */
124
a1ad0f8b75bf first pass at a new VP3 video decoder
tmmm
parents: 121
diff changeset
138 { 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
139 { 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
140 { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */
301
4513d5ab9eb5 8BPS decoder
rtognimp
parents: 289
diff changeset
141 { 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
142 { 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
143 { 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
144 { CODEC_ID_QDRAW, MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
145 { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
805
6ace9fde011e add hdv2 fourcc to MPEG2 codec mapping
aurel
parents: 800
diff changeset
146 { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 produced by Sony HD camera */
959
b0a6f09d8d38 mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
michael
parents: 956
diff changeset
147 { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX 635/50 50mb/s produced by FCP */
b0a6f09d8d38 mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
michael
parents: 956
diff changeset
148 { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX 635/50 30mb/s produced by FCP */
b0a6f09d8d38 mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
michael
parents: 956
diff changeset
149 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL produced by FCP */
b0a6f09d8d38 mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
michael
parents: 956
diff changeset
150 //{ CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD produced by FCP */
b0a6f09d8d38 mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
michael
parents: 956
diff changeset
151 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 produced by FCP */
b0a6f09d8d38 mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
michael
parents: 956
diff changeset
152 { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* HDV produced by FCP */
b0a6f09d8d38 mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
michael
parents: 956
diff changeset
153 //{ CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
154 { CODEC_ID_NONE, 0 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
155 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
156
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
157 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
158 { 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
159 { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
160 /* { CODEC_ID_PCM_S16BE, MKTAG('N', 'O', 'N', 'E') }, *//* uncompressed */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161 { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
162 /* { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's') },*/ /* 8 bits */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
163 { CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') }, /* 8 bits unsigned */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
164 { CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, /* */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, /* */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166 { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
167 { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, /* IMA-4 ADPCM */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
168 { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, /* Macintosh Audio Compression and Expansion 3:1 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169 { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
170
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
171 { CODEC_ID_MP2, MKTAG('.', 'm', 'p', '3') }, /* MPEG layer 3 */ /* sample files at http://www.3ivx.com/showcase.html use this tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
172 { CODEC_ID_MP2, 0x6D730055 }, /* MPEG layer 3 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
173 { CODEC_ID_MP2, 0x5500736D }, /* MPEG layer 3 *//* XXX: check endianness */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
174 /* { CODEC_ID_OGG_VORBIS, MKTAG('O', 'g', 'g', 'S') }, *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175 /* MP4 tags */
655
7cba02909808 AAC fix by Thomas Raivio <tjraivio AT cc DOT hut DOT fi>
mmu_man
parents: 654
diff changeset
176 { 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
177 /* 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
178 { 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
179 { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */
289
4baa098c12c3 added XVID fourcc (ISO MPEG-4?) and AC3 fourcc
melanson
parents: 286
diff changeset
180 { 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
181 { CODEC_ID_ALAC,MKTAG('a', 'l', 'a', 'c') }, /* Apple Lossless */
865
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
182 { CODEC_ID_QDM2,MKTAG('Q', 'D', 'M', '2') }, /* QDM2 */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
183 { CODEC_ID_NONE, 0 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
184 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
185
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
186 /* map numeric codes from mdhd atom to ISO 639 */
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
187 /* cf. QTFileFormat.pdf p253, qtff.pdf p205 */
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
188 /* http://developer.apple.com/documentation/mac/Text/Text-368.html */
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
189 /* deprecated by putting the code as 3*5bit ascii */
912
844bc9093aa3 Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 896
diff changeset
190 static const char *mov_mdhd_language_map[] = {
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
191 /* 0-9 */
912
844bc9093aa3 Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 896
diff changeset
192 "eng", "fra", "ger", "ita", "dut", "sve", "spa", "dan", "por", "nor",
844bc9093aa3 Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 896
diff changeset
193 "heb", "jpn", "ara", "fin", "gre", "ice", "mlt", "tur", "hr "/*scr*/, "chi"/*ace?*/,
844bc9093aa3 Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 896
diff changeset
194 "urd", "hin", "tha", "kor", "lit", "pol", "hun", "est", "lav", NULL,
844bc9093aa3 Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 896
diff changeset
195 "fo ", NULL, "rus", "chi", NULL, "iri", "alb", "ron", "ces", "slk",
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
196 "slv", "yid", "sr ", "mac", "bul", "ukr", "bel", "uzb", "kaz", "aze",
912
844bc9093aa3 Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 896
diff changeset
197 /*?*/
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
198 "aze", "arm", "geo", "mol", "kir", "tgk", "tuk", "mon", NULL, "pus",
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
199 "kur", "kas", "snd", "tib", "nep", "san", "mar", "ben", "asm", "guj",
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
200 "pa ", "ori", "mal", "kan", "tam", "tel", NULL, "bur", "khm", "lao",
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
201 /* roman? arabic? */
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
202 "vie", "ind", "tgl", "may", "may", "amh", "tir", "orm", "som", "swa",
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
203 /*==rundi?*/
912
844bc9093aa3 Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 896
diff changeset
204 NULL, "run", NULL, "mlg", "epo", NULL, NULL, NULL, NULL, NULL,
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
205 /* 100 */
912
844bc9093aa3 Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 896
diff changeset
206 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
844bc9093aa3 Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 896
diff changeset
207 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
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
208 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "wel", "baq",
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
209 "cat", "lat", "que", "grn", "aym", "tat", "uig", "dzo", "jav"
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
210 };
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
211
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 /* the QuickTime file format is quite convoluted...
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 * it has lots of index tables, each indexing something in another one...
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 * Here we just use what is needed to read the chunks
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
216
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217 typedef struct MOV_sample_to_chunk_tbl {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 long first;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 long count;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 long id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221 } MOV_sample_to_chunk_tbl;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
223 typedef struct {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
224 uint32_t type;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
225 int64_t offset;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
226 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
227 } MOV_atom_t;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
228
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
229 typedef struct {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
230 int seed;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
231 int flags;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
232 int size;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
233 void* clrs;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
234 } MOV_ctab_t;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
235
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
236 typedef struct {
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
237 uint8_t version;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
238 uint32_t flags; // 24bit
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
239
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
240 /* 0x03 ESDescrTag */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
241 uint16_t es_id;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
242 #define MP4ODescrTag 0x01
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
243 #define MP4IODescrTag 0x02
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
244 #define MP4ESDescrTag 0x03
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
245 #define MP4DecConfigDescrTag 0x04
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
246 #define MP4DecSpecificDescrTag 0x05
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
247 #define MP4SLConfigDescrTag 0x06
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
248 #define MP4ContentIdDescrTag 0x07
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
249 #define MP4SupplContentIdDescrTag 0x08
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
250 #define MP4IPIPtrDescrTag 0x09
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
251 #define MP4IPMPPtrDescrTag 0x0A
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
252 #define MP4IPMPDescrTag 0x0B
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
253 #define MP4RegistrationDescrTag 0x0D
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
254 #define MP4ESIDIncDescrTag 0x0E
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
255 #define MP4ESIDRefDescrTag 0x0F
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
256 #define MP4FileIODescrTag 0x10
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
257 #define MP4FileODescrTag 0x11
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
258 #define MP4ExtProfileLevelDescrTag 0x13
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
259 #define MP4ExtDescrTagsStart 0x80
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
260 #define MP4ExtDescrTagsEnd 0xFE
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
261 uint8_t stream_priority;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
262
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
263 /* 0x04 DecConfigDescrTag */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
264 uint8_t object_type_id;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
265 uint8_t stream_type;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
266 /* XXX: really streamType is
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
267 * only 6bit, followed by:
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
268 * 1bit upStream
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
269 * 1bit reserved
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
270 */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
271 uint32_t buffer_size_db; // 24
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
272 uint32_t max_bitrate;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
273 uint32_t avg_bitrate;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
274
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
275 /* 0x05 DecSpecificDescrTag */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
276 uint8_t decoder_cfg_len;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
277 uint8_t *decoder_cfg;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
278
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
279 /* 0x06 SLConfigDescrTag */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
280 uint8_t sl_config_len;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
281 uint8_t *sl_config;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
282 } MOV_esds_t;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
283
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
284 struct MOVParseTableEntry;
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
285
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
286 typedef struct MOVStreamContext {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
287 int ffindex; /* the ffmpeg stream id */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 int is_ff_stream; /* Is this stream presented to ffmpeg ? i.e. is this an audio or video stream ? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
289 long next_chunk;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
290 long chunk_count;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
291 int64_t *chunk_offsets;
670
856b151f926a cleanup
michael
parents: 660
diff changeset
292 int stts_count;
856b151f926a cleanup
michael
parents: 660
diff changeset
293 Time2Sample *stts_data;
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
294 int ctts_count;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
295 Time2Sample *ctts_data;
670
856b151f926a cleanup
michael
parents: 660
diff changeset
296 int edit_count; /* number of 'edit' (elst atom) */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 long sample_to_chunk_sz;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 MOV_sample_to_chunk_tbl *sample_to_chunk;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 long sample_to_chunk_index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
300 int sample_to_time_index;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
301 long sample_to_time_sample;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
302 uint64_t sample_to_time_time;
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
303 int sample_to_ctime_index;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
304 int sample_to_ctime_sample;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 long sample_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 long sample_count;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 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
308 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
309 long *keyframes;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
310 int time_scale;
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
311 int time_rate;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312 long current_sample;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
313 long left_in_chunk; /* how many samples before next chunk */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
314 MOV_esds_t esds;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
315 } MOVStreamContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
316
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317 typedef struct MOVContext {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318 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) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319 AVFormatContext *fc;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
320 int time_scale;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
321 int duration; /* duration of the longest track */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
322 int found_moov; /* when both 'moov' and 'mdat' sections has been found */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
323 int found_mdat; /* we suppose we have enough data to read the file */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
324 int64_t mdat_size;
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
325 int64_t mdat_offset;
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
326 int ni; ///< non interleaved mode
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 int total_streams;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 /* some streams listed here aren't presented to the ffmpeg API, since they aren't either video nor audio
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
329 * but we need the info to be able to skip data from those streams in the 'mdat' section
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
330 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 MOVStreamContext *streams[MAX_STREAMS];
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
332
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
333 int64_t next_chunk_offset;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
334 MOVStreamContext *partial; /* != 0 : there is still to read in the current chunk */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
335 int ctab_size;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
336 MOV_ctab_t **ctab; /* color tables */
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
337 const struct MOVParseTableEntry *parse_table; /* could be eventually used to change the table */
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
338 /* 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
339
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
340 AVPaletteControl palette_control;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341 } MOVContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 /* XXX: it's the first time I make a recursive parser I think... sorry if it's ugly :P */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
346 /* those functions parse an atom */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
347 /* return code:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 1: found what I wanted, exit
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349 0: continue to parse next atom
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 -1: error occured, exit
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
352 typedef int (*mov_parse_function)(MOVContext *ctx, ByteIOContext *pb, MOV_atom_t atom);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 /* links atom IDs to parse functions */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355 typedef struct MOVParseTableEntry {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
356 uint32_t type;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
357 mov_parse_function func;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
358 } MOVParseTableEntry;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
359
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
360 static int ff_mov_lang_to_iso639(int code, char *to)
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
361 {
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
362 int i;
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
363 /* is it the mangled iso code? */
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
364 /* see http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt */
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
365 if (code > 138) {
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
366 for (i = 2; i >= 0; i--) {
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
367 to[i] = 0x60 + (code & 0x1f);
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
368 code >>= 5;
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
369 }
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
370 return 1;
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
371 }
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
372 /* old fashion apple lang code */
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
373 if (code >= (sizeof(mov_mdhd_language_map)/sizeof(char *)))
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
374 return 0;
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
375 if (!mov_mdhd_language_map[code])
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
376 return 0;
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
377 strncpy(to, mov_mdhd_language_map[code], 4);
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
378 return 1;
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
379 }
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
380
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
381 extern int ff_mov_iso639_to_lang(const char *lang, int mp4); /* for movenc.c */
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
382 int ff_mov_iso639_to_lang(const char *lang, int mp4)
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
383 {
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
384 int i, code = 0;
912
844bc9093aa3 Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 896
diff changeset
385
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
386 /* old way, only for QT? */
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
387 for (i = 0; !mp4 && (i < (sizeof(mov_mdhd_language_map)/sizeof(char *))); i++) {
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
388 if (mov_mdhd_language_map[i] && !strcmp(lang, mov_mdhd_language_map[i]))
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
389 return i;
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
390 }
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
391 /* XXX:can we do that in mov too? */
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
392 if (!mp4)
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
393 return 0;
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
394 /* handle undefined as such */
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
395 if (lang[0] == '\0')
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
396 lang = "und";
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
397 /* 5bit ascii */
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
398 for (i = 0; i < 3; i++) {
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
399 unsigned char c = (unsigned char)lang[i];
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
400 if (c < 0x60)
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
401 return 0;
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
402 if (c > 0x60 + 0x1f)
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
403 return 0;
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
404 code <<= 5;
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
405 code |= (c - 0x60);
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
406 }
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
407 return code;
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
408 }
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
409
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
410 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
411 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
412 if (atom.size>1)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
413 url_fskip(pb, atom.size);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
414 /* url_seek(pb, atom_offset+atom.size, SEEK_SET); */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
416 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
418 static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419 {
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
420 int64_t total_size = 0;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
421 MOV_atom_t a;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
422 int i;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
423 int err = 0;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
424
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
425 a.offset = atom.offset;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
426
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
427 if (atom.size < 0)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
428 atom.size = 0x7fffffffffffffffLL;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
429 while(((total_size + 8) < atom.size) && !url_feof(pb) && !err) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
430 a.size = atom.size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
431 a.type=0L;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
432 if(atom.size >= 8) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
433 a.size = get_be32(pb);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
434 a.type = get_le32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
435 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
436 total_size += 8;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
437 a.offset += 8;
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
438 dprintf("type: %08x %.4s sz: %Lx %Lx %Lx\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
439 if (a.size == 1) { /* 64 bit extended size */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
440 a.size = get_be64(pb) - 8;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
441 a.offset += 8;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
442 total_size += 8;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
443 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
444 if (a.size == 0) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
445 a.size = atom.size - total_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
446 if (a.size <= 8)
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
447 break;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
448 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
449 for (i = 0; c->parse_table[i].type != 0L
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
450 && c->parse_table[i].type != a.type; i++)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
451 /* empty */;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
452
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
453 a.size -= 8;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
454
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
455 if(a.size < 0)
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
456 break;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
457
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
458 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
459 url_fskip(pb, a.size);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
460 } else {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
461 err = (c->parse_table[i].func)(c, pb, a);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
462 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
463
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
464 a.offset += a.size;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
465 total_size += a.size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
466 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
467
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
468 if (!err && total_size < atom.size && atom.size < 0x7ffff) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
469 url_fskip(pb, atom.size - total_size);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
470 }
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
471
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
472 return err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
473 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
474
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
475 static int mov_read_ctab(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
476 {
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
477 #if 1
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
478 url_fskip(pb, atom.size); // for now
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
479 #else
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
480 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
481 unsigned int len;
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 677
diff changeset
482 MOV_ctab_t *t;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
483 c->ctab = av_realloc(c->ctab, ++c->ctab_size);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
484 t = c->ctab[c->ctab_size];
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
485 t->seed = get_be32(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
486 t->flags = get_be16(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
487 t->size = get_be16(pb) + 1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
488 len = 2 * t->size * 4;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
489 if (len > 0) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
490 t->clrs = av_malloc(len); // 16bit A R G B
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
491 if (t->clrs)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
492 get_buffer(pb, t->clrs, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
493 }
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
494 #endif
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
495
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
496 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
497 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
498
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
499 static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
500 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
501 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
502 int len = 0;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
503 uint32_t type;
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
504 uint32_t ctype;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
505
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506 get_byte(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
507 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
508
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509 /* component type */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
510 ctype = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
511 type = get_le32(pb); /* component subtype */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
512
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
513 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
514 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
515 if(ctype == MKTAG('m', 'h', 'l', 'r')) /* MOV */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516 c->mp4 = 0;
965
d3b4919dd5ec simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents: 964
diff changeset
517 else if(ctype == 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
518 c->mp4 = 1;
965
d3b4919dd5ec simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
michael
parents: 964
diff changeset
519 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
520 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
521 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
522 st->codec->codec_type = CODEC_TYPE_AUDIO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
523 get_be32(pb); /* component manufacture */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
524 get_be32(pb); /* component flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
525 get_be32(pb); /* component flags mask */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
526
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
527 if(atom.size <= 24)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
528 return 0; /* nothing left to read */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529 /* XXX: MP4 uses a C string, not a pascal one */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
530 /* component name */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
532 if(c->mp4) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
533 /* .mp4: C string */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
534 while(get_byte(pb) && (++len < (atom.size - 24)));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
535 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
536 /* .mov: PASCAL string */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
537 len = get_byte(pb);
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
538 url_fskip(pb, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
539 }
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
540
489
aeb69a5f3756 The atom 'skip' should be handled by 'mov_read_leaf()', not by
michael
parents: 438
diff changeset
541 url_fskip(pb, atom.size - (url_ftell(pb) - atom.offset));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
543 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
544
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
545 static int mov_mp4_read_descr_len(ByteIOContext *pb)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
546 {
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
547 int len = 0;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
548 int count = 4;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
549 while (count--) {
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
550 int c = get_byte(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
551 len = (len << 7) | (c & 0x7f);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
552 if (!(c & 0x80))
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
553 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
554 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
555 return len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
556 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
557
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
558 static int mov_mp4_read_descr(ByteIOContext *pb, int *tag)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
559 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
560 int len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
561 *tag = get_byte(pb);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
562 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
563 dprintf("MPEG4 description: tag=0x%02x len=%d\n", *tag, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
564 return len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
565 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
566
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
567 static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
568 {
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
569 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
570 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
571 int64_t start_pos = url_ftell(pb);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
572 int tag, len;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
573
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
574 /* Well, broken but suffisant for some MP4 streams */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
575 get_be32(pb); /* version + flags */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
576 len = mov_mp4_read_descr(pb, &tag);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
577 if (tag == MP4ESDescrTag) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
578 get_be16(pb); /* ID */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
579 get_byte(pb); /* priority */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
580 } else
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
581 get_be16(pb); /* ID */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
582
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
583 len = mov_mp4_read_descr(pb, &tag);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
584 if (tag == MP4DecConfigDescrTag) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
585 sc->esds.object_type_id = get_byte(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
586 sc->esds.stream_type = get_byte(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
587 sc->esds.buffer_size_db = get_be24(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
588 sc->esds.max_bitrate = get_be32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
589 sc->esds.avg_bitrate = get_be32(pb);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
590
943
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 928
diff changeset
591 st->codec->codec_id= codec_get_id(ff_mov_obj_type, sc->esds.object_type_id);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
592 len = mov_mp4_read_descr(pb, &tag);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
593 if (tag == MP4DecSpecificDescrTag) {
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
594 dprintf("Specific MPEG4 header len=%d\n", len);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
595 st->codec->extradata = (uint8_t*) av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
596 if (st->codec->extradata) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
597 get_buffer(pb, st->codec->extradata, len);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
598 st->codec->extradata_size = len;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
599 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
600 }
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
601 }
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
602 /* in any case, skip garbage */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
603 url_fskip(pb, atom.size - ((url_ftell(pb) - start_pos)));
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
604 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
605 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
606
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
607 /* this atom contains actual media data */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
608 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
609 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
610 if(atom.size == 0) /* wrong one (MP4) */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
611 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
612 c->found_mdat=1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
613 c->mdat_offset = atom.offset;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
614 c->mdat_size = atom.size;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
615 if(c->found_moov)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
616 return 1; /* found both, just go */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
617 url_fskip(pb, atom.size);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
618 return 0; /* now go for moov */
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
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
621 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
622 {
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
623 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
624
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
625 /* 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
626 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
627 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
628 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
629 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
630 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
631 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
632 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
633 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
634 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
635 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
636 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
637 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
638 case MKTAG('M', '4', 'P', ' '): /* Apple iTunes AAC-LC Protected 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
639 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
640 case MKTAG('q', 't', ' ', ' '):
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
641 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
642 }
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
643 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
644 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
645 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
646 }
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
647
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
648 /* this atom should contain all header atoms */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
649 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
650 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
651 int err;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
652
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
653 err = mov_read_default(c, pb, atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
654 /* 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
655 /* 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
656 c->found_moov=1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
657 if(c->found_mdat)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
658 return 1; /* found both, just go */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
659 return 0; /* now go for mdat */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
660 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
661
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
662
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
663 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
664 {
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
665 int version;
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
666 int lang;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
667
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
668 version = get_byte(pb); /* version */
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
669 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
670 return 1; /* unsupported */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
671
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
672 get_byte(pb); get_byte(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
673 get_byte(pb); /* flags */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
674
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
675 (version==1)?get_be64(pb):get_be32(pb); /* creation time */
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
676 (version==1)?get_be64(pb):get_be32(pb); /* modification time */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
677
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
678 c->streams[c->fc->nb_streams-1]->time_scale = get_be32(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
679 c->fc->streams[c->fc->nb_streams-1]->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
680
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
681 lang = get_be16(pb); /* language */
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 889
diff changeset
682 ff_mov_lang_to_iso639(lang, c->fc->streams[c->fc->nb_streams-1]->language);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
683 get_be16(pb); /* quality */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
684
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
685 return 0;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
686 }
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
687
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
688 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
689 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
690 get_byte(pb); /* version */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
691 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
692
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
693 get_be32(pb); /* creation time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
694 get_be32(pb); /* modification time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
695 c->time_scale = get_be32(pb); /* time scale */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
696 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
697 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
698 #endif
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
699 c->duration = get_be32(pb); /* duration */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
700 get_be32(pb); /* preferred scale */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
701
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
702 get_be16(pb); /* preferred volume */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
703
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
704 url_fskip(pb, 10); /* reserved */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
705
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
706 url_fskip(pb, 36); /* display matrix */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
707
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
708 get_be32(pb); /* preview time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
709 get_be32(pb); /* preview duration */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
710 get_be32(pb); /* poster time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
711 get_be32(pb); /* selection time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
712 get_be32(pb); /* selection duration */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
713 get_be32(pb); /* current time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
714 get_be32(pb); /* next track ID */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
715
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
716 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
717 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
718
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
719 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
720 {
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
721 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
722
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
723 if((uint64_t)atom.size > (1<<30))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
724 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
725
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
726 // 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
727 // 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
728 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
729 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
730 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
731
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
732 if (st->codec->extradata) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
733 strcpy(st->codec->extradata, "SVQ3"); // fake
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
734 get_buffer(pb, st->codec->extradata + 0x5a, atom.size);
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
735 dprintf("Reading SMI %Ld %s\n", atom.size, (char*)st->codec->extradata + 0x5a);
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
736 } else
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
737 url_fskip(pb, atom.size);
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
738
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
739 return 0;
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
740 }
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
741
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
742 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
743 {
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
744 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
745 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
746
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
747 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
748 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
749 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
750 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
751 break;
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
752 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
753 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
754 break;
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
755 default:
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
756 break;
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
757 }
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
758 }
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
759 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
760 }
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
761
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
762 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
763 {
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
764 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
765
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
766 // 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
767 // 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
768
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
769 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
770 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
771 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
772
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
773 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
774 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
775 get_buffer(pb, st->codec->extradata + 8, 36 - 8);
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
776 dprintf("Reading alac %Ld %s\n", st->codec->extradata_size, (char*)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
777 } else
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
778 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
779 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
780 }
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
781
865
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
782 static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
783 {
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
784 offset_t start_pos = url_ftell(pb);
865
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
785 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
786
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
787 if((uint64_t)atom.size > (1<<30))
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
788 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
789
947
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
790 if (st->codec->codec_id == CODEC_ID_QDM2) {
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
791 // 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
792 av_free(st->codec->extradata);
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
793 st->codec->extradata_size = atom.size;
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
794 st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
865
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
795
947
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
796 if (st->codec->extradata) {
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
797 get_buffer(pb, st->codec->extradata, atom.size);
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
798 } else
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
799 url_fskip(pb, atom.size);
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
800 } 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
801 mov_read_default(c, pb, atom);
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
802 } else if (atom.size > 0)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
803 url_fskip(pb, atom.size);
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
804 /* in any case, skip garbage */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
805 url_fskip(pb, atom.size - ((url_ftell(pb) - start_pos)));
865
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
806 return 0;
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
807 }
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
808
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
809 static int mov_read_avcC(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
810 {
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
811 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
812
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
813 if((uint64_t)atom.size > (1<<30))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
814 return -1;
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
815
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
816 av_free(st->codec->extradata);
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
817
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
818 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
819 st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
820
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
821 if (st->codec->extradata) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
822 get_buffer(pb, st->codec->extradata, atom.size);
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
823 } else
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
824 url_fskip(pb, atom.size);
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
825
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
826 return 0;
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
827 }
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
828
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
829 static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
830 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
831 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
832 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
833 unsigned int i, entries;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
834
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
835 get_byte(pb); /* version */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
836 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
837
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
838 entries = get_be32(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
839
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
840 if(entries >= UINT_MAX/sizeof(int64_t))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
841 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
842
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
843 sc->chunk_count = entries;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
844 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
845 if (!sc->chunk_offsets)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
846 return -1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
847 if (atom.type == MKTAG('s', 't', 'c', 'o')) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
848 for(i=0; i<entries; i++) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
849 sc->chunk_offsets[i] = get_be32(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
850 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
851 } else if (atom.type == MKTAG('c', 'o', '6', '4')) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
852 for(i=0; i<entries; i++) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
853 sc->chunk_offsets[i] = get_be64(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
854 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
855 } else
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
856 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
857
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
858 for(i=0; i<c->fc->nb_streams; i++){
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
859 MOVStreamContext *sc2 = (MOVStreamContext *)c->fc->streams[i]->priv_data;
770
34e05913d999 segfault fix
michael
parents: 769
diff changeset
860 if(sc2 && sc2->chunk_offsets){
34e05913d999 segfault fix
michael
parents: 769
diff changeset
861 int64_t first= sc2->chunk_offsets[0];
34e05913d999 segfault fix
michael
parents: 769
diff changeset
862 int64_t last= sc2->chunk_offsets[sc2->chunk_count-1];
34e05913d999 segfault fix
michael
parents: 769
diff changeset
863 if(first >= sc->chunk_offsets[entries-1] || last <= sc->chunk_offsets[0])
34e05913d999 segfault fix
michael
parents: 769
diff changeset
864 c->ni=1;
34e05913d999 segfault fix
michael
parents: 769
diff changeset
865 }
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
866 }
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
867 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
868 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
869
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
870 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
871 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
872 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
873 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
874 int entries, frames_per_sample;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
875 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
876 uint8_t codec_name[32];
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
877
302
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
878 /* for palette traversal */
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
879 int color_depth;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
880 int color_start;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
881 int color_count;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
882 int color_end;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
883 int color_index;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
884 int color_dec;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
885 int color_greyscale;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
886 unsigned char *color_table;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
887 int j;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
888 unsigned char r, g, b;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
889
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
890 get_byte(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
891 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
892
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
893 entries = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
894
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
895 while(entries--) { //Parsing Sample description table
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
896 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
897 MOV_atom_t a = { 0, 0, 0 };
947
929f84cc63c3 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
michael
parents: 943
diff changeset
898 offset_t start_pos = url_ftell(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
899 int size = get_be32(pb); /* size */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
900 format = get_le32(pb); /* data format */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
901
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
902 get_be32(pb); /* reserved */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
903 get_be16(pb); /* reserved */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
904 get_be16(pb); /* index */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
905
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
906 dprintf("size=%d 4CC= %c%c%c%c codec_type=%d\n",
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
907 size,
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
908 (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, (format >> 24) & 0xff,
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
909 st->codec->codec_type);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
910 st->codec->codec_tag = format;
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
911 /* codec_type is set earlier by read_hdlr */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
912 if(st->codec->codec_type==CODEC_TYPE_VIDEO) {
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
913 /* for MPEG4: set codec type by looking for it */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
914 id = codec_get_id(mov_video_tags, format);
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
915 if(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
916 id = codec_get_id(codec_bmp_tags, format);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
917 st->codec->codec_id = id;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
918 get_be16(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
919 get_be16(pb); /* revision level */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
920 get_be32(pb); /* vendor */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
921 get_be32(pb); /* temporal quality */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
922 get_be32(pb); /* spacial quality */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
923 if(st->codec->codec_id == CODEC_ID_MPEG4){ //FIXME this is silly
768
c71d10dfc681 10l (overwriting w/h with 0)
michael
parents: 764
diff changeset
924 get_be16(pb);
c71d10dfc681 10l (overwriting w/h with 0)
michael
parents: 764
diff changeset
925 get_be16(pb);
c71d10dfc681 10l (overwriting w/h with 0)
michael
parents: 764
diff changeset
926 }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
927 st->codec->width = get_be16(pb); /* width */
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
928 st->codec->height = get_be16(pb); /* height */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
929 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
930 get_be32(pb); /* horiz resolution */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
931 get_be32(pb); /* vert resolution */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
932 get_be32(pb); /* data size, always 0 */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
933 frames_per_sample = get_be16(pb); /* frames per samples */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
934 #ifdef DEBUG
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
935 av_log(NULL, AV_LOG_DEBUG, "frames/samples = %d\n", frames_per_sample);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
936 #endif
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
937 get_buffer(pb, codec_name, 32); /* codec name, pascal string (FIXME: true for mp4?) */
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 655
diff changeset
938 if (codec_name[0] <= 31) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
939 memcpy(st->codec->codec_name, &codec_name[1],codec_name[0]);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
940 st->codec->codec_name[codec_name[0]] = 0;
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
941 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
942
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
943 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
944 st->codec->color_table_id = get_be16(pb); /* colortable id */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
945
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
946 /* These are set in mov_read_stts and might already be set!
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
947 st->codec->time_base.den = 25;
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->time_base.num = 1;
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
949 */
302
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
950
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
951 /* 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
952 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
953 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
954
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
955 /* if the depth is 2, 4, or 8 bpp, file is palettized */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
956 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
957 (color_depth == 8)) {
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
958
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
959 if (color_greyscale) {
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
960
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
961 /* compute the greyscale palette */
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
962 color_count = 1 << color_depth;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
963 color_index = 255;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
964 color_dec = 256 / (color_count - 1);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
965 for (j = 0; j < color_count; j++) {
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
966 r = g = b = color_index;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
967 c->palette_control.palette[j] =
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
968 (r << 16) | (g << 8) | (b);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
969 color_index -= color_dec;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
970 if (color_index < 0)
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
971 color_index = 0;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
972 }
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
973
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
974 } 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
975
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
976 /* 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
977 color_count = 1 << color_depth;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
978 if (color_depth == 2)
431
fe91c780d26a prefix global
michael
parents: 428
diff changeset
979 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
980 else if (color_depth == 4)
431
fe91c780d26a prefix global
michael
parents: 428
diff changeset
981 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
982 else
431
fe91c780d26a prefix global
michael
parents: 428
diff changeset
983 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
984
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
985 for (j = 0; j < color_count; j++) {
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
986 r = color_table[j * 4 + 0];
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
987 g = color_table[j * 4 + 1];
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
988 b = color_table[j * 4 + 2];
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
989 c->palette_control.palette[j] =
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
990 (r << 16) | (g << 8) | (b);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
991 }
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
992
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
993 } else {
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
994
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
995 /* load the palette from the file */
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
996 color_start = get_be32(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
997 color_count = get_be16(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
998 color_end = get_be16(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
999 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
1000 /* 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
1001 * 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
1002 * up front */
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1003 get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1004 get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1005 r = get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1006 get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1007 g = get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1008 get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1009 b = get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1010 get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1011 c->palette_control.palette[j] =
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1012 (r << 16) | (g << 8) | (b);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1013 }
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1014 }
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1015
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1016 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
1017 st->codec->palctrl->palette_changed = 1;
302
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1018 } 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
1019 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
1020 } else if(st->codec->codec_type==CODEC_TYPE_AUDIO) {
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1021 uint16_t version = get_be16(pb);
302
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1022
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1023 st->codec->codec_id = codec_get_id(mov_audio_tags, format);
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1024 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
1025 get_be32(pb); /* vendor */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1026
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1027 st->codec->channels = get_be16(pb); /* channel count */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1028 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
1029 /* 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
1030
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1031 /* 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
1032 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
1033 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
1034
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1035 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
1036
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1037 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
1038 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
1039 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
1040 st->codec->codec_id = CODEC_ID_PCM_S8;
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1041 /* fall */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1042 case CODEC_ID_PCM_U8:
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1043 if (st->codec->bits_per_sample == 16)
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1044 st->codec->codec_id = 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
1045 st->codec->bit_rate = st->codec->sample_rate * 8;
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1046 break;
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1047 case CODEC_ID_AMR_WB:
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1048 st->codec->sample_rate = 16000; /* should really we ? */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1049 st->codec->channels=1; /* really needed */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1050 break;
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1051 case CODEC_ID_AMR_NB:
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1052 st->codec->sample_rate = 8000; /* should really we ? */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1053 st->codec->channels=1; /* really needed */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1054 break;
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1055 default:
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1056 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
1057 }
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1058
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1059 //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
1060 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
1061 if(version==1) {
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1062 get_be32(pb); /* samples per packet */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1063 get_be32(pb); /* bytes per packet */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1064 get_be32(pb); /* bytes per frame */
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1065 get_be32(pb); /* bytes per sample */
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1066 }
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1067 } else {
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1068 /* 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
1069 url_fskip(pb, size - (url_ftell(pb) - start_pos));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1070 }
968
dbf4bc73c7c9 Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 967
diff changeset
1071 /* 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
1072 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
1073 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
1074 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
1075 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
1076 url_fskip(pb, a.size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1077 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1078
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
1079 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
1080 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
1081 }
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1082
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1083 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1084 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1085
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1086 static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1087 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1088 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1089 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1090 unsigned int i, entries;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1091
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1092 get_byte(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1093 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1094
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1095 entries = get_be32(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1096
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1097 if(entries >= UINT_MAX / sizeof(MOV_sample_to_chunk_tbl))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1098 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1099
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1100 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1101 av_log(NULL, AV_LOG_DEBUG, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1, entries);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1102 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1103 sc->sample_to_chunk_sz = entries;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1104 sc->sample_to_chunk = (MOV_sample_to_chunk_tbl*) av_malloc(entries * sizeof(MOV_sample_to_chunk_tbl));
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1105 if (!sc->sample_to_chunk)
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1106 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1107 for(i=0; i<entries; i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1108 sc->sample_to_chunk[i].first = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1109 sc->sample_to_chunk[i].count = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1110 sc->sample_to_chunk[i].id = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1111 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1112 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1113 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1114
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 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
1116 {
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 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
1118 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1119 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
1120
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
1121 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
1122 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
1123
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 entries = get_be32(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1125
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1126 if(entries >= UINT_MAX / sizeof(long))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1127 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1128
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
1129 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
1130 #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
1131 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
1132 #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
1133 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
1134 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
1135 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
1136 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
1137 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
1138 #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
1139 /* 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
1140 #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
1141 }
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
1142 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
1143 }
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
1144
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1145 static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1146 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1147 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1148 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1149 unsigned int i, entries;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1150
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1151 get_byte(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1152 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1153
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1154 sc->sample_size = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1155 entries = get_be32(pb);
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1156 if(entries >= UINT_MAX / sizeof(long))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1157 return -1;
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1158
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1159 sc->sample_count = entries;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1160 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1161 av_log(NULL, AV_LOG_DEBUG, "sample_size = %ld sample_count = %ld\n", sc->sample_size, sc->sample_count);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1162 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1163 if(sc->sample_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1164 return 0; /* there isn't any table following */
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1165 sc->sample_sizes = (long*) av_malloc(entries * sizeof(long));
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1166 if (!sc->sample_sizes)
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1167 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1168 for(i=0; i<entries; i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1169 sc->sample_sizes[i] = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1170 #ifdef DEBUG
653
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1171 av_log(NULL, AV_LOG_DEBUG, "sample_sizes[]=%ld\n", sc->sample_sizes[i]);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1172 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1173 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1174 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1175 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1176
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1177 static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1178 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1179 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1180 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1181 unsigned int i, entries;
395
c1ed10f3b052 cleanup frame_rate code, this may also fix some large file bugs
michael
parents: 383
diff changeset
1182 int64_t duration=0;
c1ed10f3b052 cleanup frame_rate code, this may also fix some large file bugs
michael
parents: 383
diff changeset
1183 int64_t total_sample_count=0;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1184
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1185 get_byte(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1186 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1187 entries = get_be32(pb);
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1188 if(entries >= UINT_MAX / sizeof(Time2Sample))
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1189 return -1;
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1190
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1191 sc->stts_count = entries;
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1192 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
1193
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1194 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1195 av_log(NULL, AV_LOG_DEBUG, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1, entries);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1196 #endif
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1197
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1198 sc->time_rate=0;
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1199
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1200 for(i=0; i<entries; i++) {
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1201 int sample_duration;
856b151f926a cleanup
michael
parents: 660
diff changeset
1202 int sample_count;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1203
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1204 sample_count=get_be32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1205 sample_duration = get_be32(pb);
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1206 sc->stts_data[i].count= sample_count;
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1207 sc->stts_data[i].duration= sample_duration;
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1208
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1209 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
1210
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1211 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
1212
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1213 duration+=sample_duration*sample_count;
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1214 total_sample_count+=sample_count;
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1215 }
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1216
794
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
1217 st->nb_frames= total_sample_count;
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
1218 if(duration)
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
1219 st->duration= duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1220 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1221 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1222
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1223 static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1224 {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1225 unsigned int i, entries;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1226
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1227 get_byte(pb); /* version */
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1228 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1229 entries = get_be32(pb);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1230 if(entries >= UINT_MAX / sizeof(Time2Sample))
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1231 return -1;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1232
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1233 c->streams[c->fc->nb_streams-1]->ctts_count = entries;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1234 c->streams[c->fc->nb_streams-1]->ctts_data = av_malloc(entries * sizeof(Time2Sample));
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
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
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1238 for(i=0; i<entries; i++) {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1239 c->streams[c->fc->nb_streams - 1]->ctts_data[i].count= get_be32(pb);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1240 c->streams[c->fc->nb_streams - 1]->ctts_data[i].duration= get_be32(pb);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1241 }
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1242 return 0;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1243 }
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1244
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1245 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
1246 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1247 AVStream *st;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1248 MOVStreamContext *sc;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1249
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1250 st = av_new_stream(c->fc, c->fc->nb_streams);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1251 if (!st) return -2;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1252 sc = (MOVStreamContext*) av_mallocz(sizeof(MOVStreamContext));
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1253 if (!sc) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1254 av_free(st);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1255 return -1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1256 }
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 sc->sample_to_chunk_index = -1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1259 st->priv_data = sc;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1260 st->codec->codec_type = CODEC_TYPE_MOV_OTHER;
191
efb35207fb1b update duration and start_time
bellard
parents: 157
diff changeset
1261 st->start_time = 0; /* XXX: check */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1262 c->streams[c->fc->nb_streams-1] = sc;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1263
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1264 return mov_read_default(c, pb, atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1265 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1266
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1267 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
1268 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1269 AVStream *st;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1270
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1271 st = c->fc->streams[c->fc->nb_streams-1];
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1272
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1273 get_byte(pb); /* version */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1274
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1275 get_byte(pb); get_byte(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1276 get_byte(pb); /* flags */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1277 /*
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1278 MOV_TRACK_ENABLED 0x0001
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1279 MOV_TRACK_IN_MOVIE 0x0002
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1280 MOV_TRACK_IN_PREVIEW 0x0004
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1281 MOV_TRACK_IN_POSTER 0x0008
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1282 */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1283
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1284 get_be32(pb); /* creation time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1285 get_be32(pb); /* modification time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1286 st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1287 get_be32(pb); /* reserved */
191
efb35207fb1b update duration and start_time
bellard
parents: 157
diff changeset
1288 st->start_time = 0; /* check */
794
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
1289 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
1290 get_be32(pb); /* reserved */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1291 get_be32(pb); /* reserved */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1292
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1293 get_be16(pb); /* layer */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1294 get_be16(pb); /* alternate group */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1295 get_be16(pb); /* volume */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1296 get_be16(pb); /* reserved */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1297
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1298 url_fskip(pb, 36); /* display matrix */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1299
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1300 /* those are fixed-point */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1301 /*st->codec->width =*/ get_be32(pb) >> 16; /* track width */
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1302 /*st->codec->height =*/ get_be32(pb) >> 16; /* track height */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1303
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1304 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1305 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1306
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1307 /* 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
1308 /* 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
1309 /* http://graphics.tudelft.nl/~wouter/publications/soundtests/ */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1310 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
1311 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1312 int err;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1313
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1314 if (atom.size < 8)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1315 return 0; /* continue */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1316 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
1317 url_fskip(pb, atom.size - 4);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1318 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1319 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1320 atom.type = get_le32(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1321 atom.offset += 8;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1322 atom.size -= 8;
131
5bb5f3d201d6 * uninitialized/unused vars cleanup
kabi
parents: 130
diff changeset
1323 if (atom.type != MKTAG('m', 'd', 'a', 't')) {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1324 url_fskip(pb, atom.size);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1325 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1326 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1327 err = mov_read_mdat(c, pb, atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1328 return err;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1329 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1330
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1331
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1332 #ifdef CONFIG_ZLIB
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
1333 static int null_read_packet(void *opaque, uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1334 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1335 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1336 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1337
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1338 static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1339 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1340 ByteIOContext ctx;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1341 uint8_t *cmov_data;
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1342 uint8_t *moov_data; /* uncompressed data */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1343 long cmov_len, moov_len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1344 int ret;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1345
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1346 get_be32(pb); /* dcom atom */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1347 if (get_le32(pb) != MKTAG( 'd', 'c', 'o', 'm' ))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1348 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1349 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
1350 av_log(NULL, AV_LOG_ERROR, "unknown compression for cmov atom !");
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1351 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1352 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1353 get_be32(pb); /* cmvd atom */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1354 if (get_le32(pb) != MKTAG( 'c', 'm', 'v', 'd' ))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1355 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1356 moov_len = get_be32(pb); /* uncompressed size */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1357 cmov_len = atom.size - 6 * 4;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1358
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1359 cmov_data = (uint8_t *) av_malloc(cmov_len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1360 if (!cmov_data)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1361 return -1;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1362 moov_data = (uint8_t *) av_malloc(moov_len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1363 if (!moov_data) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1364 av_free(cmov_data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1365 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1366 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1367 get_buffer(pb, cmov_data, cmov_len);
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1368 if(uncompress (moov_data, (uLongf *) &moov_len, (const Bytef *)cmov_data, cmov_len) != Z_OK)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1369 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1370 if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, null_read_packet, NULL, NULL) != 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1371 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1372 ctx.buf_end = ctx.buffer + moov_len;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1373 atom.type = MKTAG( 'm', 'o', 'o', 'v' );
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1374 atom.offset = 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1375 atom.size = moov_len;
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
1376 #ifdef DEBUG
953
76deb0728cbd 10l for myself
michael
parents: 952
diff changeset
1377 // { 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
1378 #endif
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1379 ret = mov_read_default(c, &ctx, atom);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1380 av_free(moov_data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1381 av_free(cmov_data);
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
1382
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1383 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1384 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1385 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1386
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1387 /* edit list atom */
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1388 static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1389 {
500
4070a7d58d2c mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents: 499
diff changeset
1390 int i, edit_count;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1391
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1392 get_byte(pb); /* version */
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1393 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
500
4070a7d58d2c mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents: 499
diff changeset
1394 edit_count= c->streams[c->fc->nb_streams-1]->edit_count = get_be32(pb); /* entries */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1395
500
4070a7d58d2c mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents: 499
diff changeset
1396 for(i=0; i<edit_count; i++){
4070a7d58d2c mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents: 499
diff changeset
1397 get_be32(pb); /* Track duration */
4070a7d58d2c mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents: 499
diff changeset
1398 get_be32(pb); /* Media time */
4070a7d58d2c mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents: 499
diff changeset
1399 get_be32(pb); /* Media rate */
4070a7d58d2c mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents: 499
diff changeset
1400 }
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1401 dprintf("track[%i].edit_count = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->edit_count);
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1402 return 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1403 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1404
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1405 static const MOVParseTableEntry mov_default_parse_table[] = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1406 /* mp4 atoms */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1407 { MKTAG( 'c', 'o', '6', '4' ), mov_read_stco },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1408 { MKTAG( 'c', 'p', 'r', 't' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1409 { MKTAG( 'c', 'r', 'h', 'd' ), mov_read_default },
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1410 { 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
1411 { MKTAG( 'd', 'i', 'n', 'f' ), mov_read_default }, /* data information */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1412 { MKTAG( 'd', 'p', 'n', 'd' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1413 { MKTAG( 'd', 'r', 'e', 'f' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1414 { 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
1415 { 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
1416 { MKTAG( 'e', 'n', 'd', 'a' ), mov_read_enda },
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1417 { 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
1418 { MKTAG( 'f', 't', 'y', 'p' ), mov_read_ftyp },
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1419 { MKTAG( 'h', 'd', 'l', 'r' ), mov_read_hdlr },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1420 { MKTAG( 'h', 'i', 'n', 't' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1421 { MKTAG( 'h', 'm', 'h', 'd' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1422 { MKTAG( 'i', 'o', 'd', 's' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1423 { MKTAG( 'm', 'd', 'a', 't' ), mov_read_mdat },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1424 { MKTAG( 'm', 'd', 'h', 'd' ), mov_read_mdhd },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1425 { MKTAG( 'm', 'd', 'i', 'a' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1426 { MKTAG( 'm', 'i', 'n', 'f' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1427 { MKTAG( 'm', 'o', 'o', 'v' ), mov_read_moov },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1428 { MKTAG( 'm', 'p', '4', 'a' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1429 { MKTAG( 'm', 'p', '4', 's' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1430 { MKTAG( 'm', 'p', '4', 'v' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1431 { MKTAG( 'm', 'p', 'o', 'd' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1432 { MKTAG( 'm', 'v', 'h', 'd' ), mov_read_mvhd },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1433 { MKTAG( 'n', 'm', 'h', 'd' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1434 { MKTAG( 'o', 'd', 'h', 'd' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1435 { 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
1436 { MKTAG( 's', 'k', 'i', 'p' ), mov_read_leaf },
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1437 { MKTAG( 's', 'm', 'h', 'd' ), mov_read_leaf }, /* sound media info header */
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
1438 { 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
1439 { MKTAG( 'a', 'l', 'a', 'c' ), mov_read_alac }, /* alac specific atom */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1440 { MKTAG( 'a', 'v', 'c', 'C' ), mov_read_avcC },
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1441 { MKTAG( 's', 't', 'b', 'l' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1442 { MKTAG( 's', 't', 'c', 'o' ), mov_read_stco },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1443 { MKTAG( 's', 't', 'd', 'p' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1444 { MKTAG( 's', 't', 's', 'c' ), mov_read_stsc },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1445 { MKTAG( 's', 't', 's', 'd' ), mov_read_stsd }, /* sample description */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1446 { 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
1447 { 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
1448 { MKTAG( 's', 't', 's', 'z' ), mov_read_stsz }, /* sample size */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1449 { MKTAG( 's', 't', 't', 's' ), mov_read_stts },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1450 { MKTAG( 't', 'k', 'h', 'd' ), mov_read_tkhd }, /* track header */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1451 { MKTAG( 't', 'r', 'a', 'k' ), mov_read_trak },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1452 { MKTAG( 't', 'r', 'e', 'f' ), mov_read_default }, /* not really */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1453 { MKTAG( 'u', 'd', 't', 'a' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1454 { MKTAG( 'u', 'r', 'l', ' ' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1455 { MKTAG( 'u', 'r', 'n', ' ' ), mov_read_leaf },
695
645c4432947b uuid patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 691
diff changeset
1456 { MKTAG( 'u', 'u', 'i', 'd' ), mov_read_leaf },
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1457 { MKTAG( 'v', 'm', 'h', 'd' ), mov_read_leaf }, /* video media info header */
865
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
1458 { MKTAG( 'w', 'a', 'v', 'e' ), mov_read_wave },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1459 /* extra mp4 */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1460 { MKTAG( 'M', 'D', 'E', 'S' ), mov_read_leaf },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1461 /* QT atoms */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1462 { MKTAG( 'c', 'h', 'a', 'p' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1463 { MKTAG( 'c', 'l', 'i', 'p' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1464 { MKTAG( 'c', 'r', 'g', 'n' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1465 { MKTAG( 'c', 't', 'a', 'b' ), mov_read_ctab },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1466 { MKTAG( 'e', 's', 'd', 's' ), mov_read_esds },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1467 { MKTAG( 'k', 'm', 'a', 't' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1468 { MKTAG( 'm', 'a', 't', 't' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1469 { MKTAG( 'r', 'd', 'r', 'f' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1470 { MKTAG( 'r', 'm', 'd', 'a' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1471 { MKTAG( 'r', 'm', 'd', 'r' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1472 { MKTAG( 'r', 'm', 'r', 'a' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1473 { MKTAG( 's', 'c', 'p', 't' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1474 { MKTAG( 's', 's', 'r', 'c' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1475 { MKTAG( 's', 'y', 'n', 'c' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1476 { MKTAG( 't', 'c', 'm', 'd' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1477 { MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1478 //{ MKTAG( 'r', 'm', 'q', 'u' ), mov_read_leaf },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1479 #ifdef CONFIG_ZLIB
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1480 { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_cmov },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1481 #else
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1482 { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_leaf },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1483 #endif
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1484 { 0L, mov_read_leaf }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1485 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1486
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1487 static void mov_free_stream_context(MOVStreamContext *sc)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1488 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1489 if(sc) {
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1490 av_freep(&sc->chunk_offsets);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1491 av_freep(&sc->sample_to_chunk);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1492 av_freep(&sc->sample_sizes);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1493 av_freep(&sc->keyframes);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1494 av_freep(&sc->stts_data);
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1495 av_freep(&sc->ctts_data);
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1496 av_freep(&sc);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1497 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1498 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1499
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1500 static inline uint32_t mov_to_tag(uint8_t *buf)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1501 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1502 return MKTAG(buf[0], buf[1], buf[2], buf[3]);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1503 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1504
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1505 static inline uint32_t to_be32(uint8_t *buf)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1506 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1507 return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1508 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1509
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1510 /* XXX: is it sufficient ? */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1511 static int mov_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1512 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1513 unsigned int offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1514 uint32_t tag;
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1515 int score = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1516
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1517 /* check file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1518 if (p->buf_size <= 12)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1519 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1520 offset = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1521 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1522 /* ignore invalid offset */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1523 if ((offset + 8) > (unsigned int)p->buf_size)
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1524 return score;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1525 tag = mov_to_tag(p->buf + offset + 4);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1526 switch(tag) {
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1527 /* check for obvious tags */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1528 case MKTAG( 'm', 'o', 'o', 'v' ):
24
215c0f0f916e Fix probing for some files (ew.mov, april.mov)
mmu_man
parents: 0
diff changeset
1529 case MKTAG( 'm', 'd', 'a', 't' ):
215c0f0f916e Fix probing for some files (ew.mov, april.mov)
mmu_man
parents: 0
diff changeset
1530 case MKTAG( 'p', 'n', 'o', 't' ): /* detect movs with preview pics like ew.mov and april.mov */
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1531 case MKTAG( 'u', 'd', 't', 'a' ): /* Packet Video PVAuthor adds this and a lot of more junk */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1532 return AVPROBE_SCORE_MAX;
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1533 /* those are more common words, so rate then a bit less */
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1534 case MKTAG( 'w', 'i', 'd', 'e' ):
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1535 case MKTAG( 'f', 'r', 'e', 'e' ):
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1536 case MKTAG( 'j', 'u', 'n', 'k' ):
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1537 case MKTAG( 'p', 'i', 'c', 't' ):
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1538 return AVPROBE_SCORE_MAX - 5;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1539 case MKTAG( 'f', 't', 'y', 'p' ):
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1540 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
1541 case MKTAG( 'u', 'u', 'i', 'd' ):
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1542 offset = to_be32(p->buf+offset) + offset;
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1543 /* if we only find those cause probedata is too small at least rate them */
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1544 score = AVPROBE_SCORE_MAX - 50;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1545 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1546 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1547 /* unrecognized tag */
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1548 return score;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1549 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1550 }
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1551 return score;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1552 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1553
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1554 static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1555 {
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1556 MOVContext *mov = (MOVContext *) s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1557 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1558 int i, j, nb, err;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1559 MOV_atom_t atom = { 0, 0, 0 };
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1560
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1561 mov->fc = s;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1562 mov->parse_table = mov_default_parse_table;
956
18bb4485996c useless code removal by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 955
diff changeset
1563
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1564 if(!url_is_streamed(pb)) /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1565 atom.size = url_fsize(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1566 else
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1567 atom.size = 0x7FFFFFFFFFFFFFFFLL;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1568
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1569 /* check MOV header */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1570 err = mov_read_default(mov, pb, atom);
133
31f0dda651f8 * added s263 (mapped to h263 - 3gp files)
kabi
parents: 132
diff changeset
1571 if (err<0 || (!mov->found_moov && !mov->found_mdat)) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1572 av_log(s, AV_LOG_ERROR, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%"PRId64"\n",
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1573 err, mov->found_moov, mov->found_mdat, url_ftell(pb));
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1574 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1575 }
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1576 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
1577
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1578 /* some cleanup : make sure we are on the mdat atom */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1579 if(!url_is_streamed(pb) && (url_ftell(pb) != mov->mdat_offset))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1580 url_fseek(pb, mov->mdat_offset, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1581
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1582 mov->next_chunk_offset = mov->mdat_offset; /* initialise reading */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1583 mov->total_streams = nb = s->nb_streams;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1584
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1585 #if 1
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1586 for(i=0; i<s->nb_streams;) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1587 if(s->streams[i]->codec->codec_type == CODEC_TYPE_MOV_OTHER) {/* not audio, not video, delete */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1588 av_free(s->streams[i]);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1589 for(j=i+1; j<s->nb_streams; j++)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1590 s->streams[j-1] = s->streams[j];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1591 s->nb_streams--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1592 } else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1593 i++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1594 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1595 for(i=0; i<s->nb_streams;i++) {
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1596 MOVStreamContext *sc = (MOVStreamContext *)s->streams[i]->priv_data;
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1597
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1598 if(!sc->time_rate)
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1599 sc->time_rate=1;
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1600 av_set_pts_info(s->streams[i], 64, sc->time_rate, sc->time_scale);
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1601
955
8e5de2f2eece fix demuxing of Video006.3gp
michael
parents: 954
diff changeset
1602 if(s->streams[i]->duration != AV_NOPTS_VALUE){
8e5de2f2eece fix demuxing of Video006.3gp
michael
parents: 954
diff changeset
1603 assert(s->streams[i]->duration % sc->time_rate == 0);
8e5de2f2eece fix demuxing of Video006.3gp
michael
parents: 954
diff changeset
1604 s->streams[i]->duration /= sc->time_rate;
8e5de2f2eece fix demuxing of Video006.3gp
michael
parents: 954
diff changeset
1605 }
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1606
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1607 sc->ffindex = i;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1608 sc->is_ff_stream = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1609 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1610 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1611 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1612 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1613
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1614 /* Yes, this is ugly... I didn't write the specs of QT :p */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1615 /* XXX:remove useless commented code sometime */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1616 static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1617 {
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1618 MOVContext *mov = (MOVContext *) s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1619 MOVStreamContext *sc;
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1620 AVStream *st;
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1621 int64_t offset = INT64_MAX;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1622 int64_t best_dts = INT64_MAX;
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
1623 int i, a, b, m;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1624 int size;
640
6f3a6774df82 handle fixed sample_size patch by Roine Gustafsson <roine AT users.sourceforge.net>
mmu_man
parents: 639
diff changeset
1625 int idx;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1626 size = 0x0FFFFFFF;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1627
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1628 if (mov->partial) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1629 sc = mov->partial;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1630 idx = sc->sample_to_chunk_index;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1631
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1632 if (idx < 0) return 0;
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1633 dprintf("sc[ffid %d]->sample_size = %ld\n", sc->ffindex, sc->sample_size);
723
3a9f7fb4e7bb reverting 1.66 -> 1.67 change
michael
parents: 712
diff changeset
1634 //size = sc->sample_sizes[sc->current_sample];
3a9f7fb4e7bb reverting 1.66 -> 1.67 change
michael
parents: 712
diff changeset
1635 // that ain't working...
3a9f7fb4e7bb reverting 1.66 -> 1.67 change
michael
parents: 712
diff changeset
1636 //size = (sc->sample_size)?sc->sample_size:sc->sample_sizes[sc->current_sample];
3a9f7fb4e7bb reverting 1.66 -> 1.67 change
michael
parents: 712
diff changeset
1637 size = (sc->sample_size > 1)?sc->sample_size:sc->sample_sizes[sc->current_sample];
3a9f7fb4e7bb reverting 1.66 -> 1.67 change
michael
parents: 712
diff changeset
1638
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1639 sc->current_sample++;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1640 sc->left_in_chunk--;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1641
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1642 if (sc->left_in_chunk <= 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1643 mov->partial = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1644 offset = mov->next_chunk_offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1645 /* extract the sample */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1646
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1647 goto readchunk;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1648 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1649
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1650 again:
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1651 sc = 0;
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1652 if(offset == INT64_MAX)
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1653 best_dts= INT64_MAX;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1654 for(i=0; i<mov->total_streams; i++) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1655 MOVStreamContext *msc = mov->streams[i];
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1656
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1657 if ((msc->next_chunk < msc->chunk_count) && msc->next_chunk >= 0){
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1658 if (msc->sample_to_time_index < msc->stts_count && mov->ni) {
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1659 int64_t dts;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1660 int index= msc->sample_to_time_index;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1661 int sample= msc->sample_to_time_sample;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1662 int time= msc->sample_to_time_time;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1663 int duration = msc->stts_data[index].duration;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1664 int count = msc->stts_data[index].count;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1665 if (sample + count < msc->current_sample) {
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1666 sample += count;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1667 time += count*duration;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1668 index ++;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1669 duration = msc->stts_data[index].duration;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1670 }
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1671 dts = time + (msc->current_sample-1 - sample) * (int64_t)duration;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1672 dts = av_rescale(dts, AV_TIME_BASE, msc->time_scale);
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1673 dprintf("stream: %d dts: %Ld best_dts: %Ld offset: %Ld \n", i, dts, best_dts, offset);
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1674 if(dts < best_dts){
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1675 best_dts= dts;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1676 sc = msc;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1677 offset = msc->chunk_offsets[msc->next_chunk];
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1678 }
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1679 }else{
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1680 if ((msc->chunk_offsets[msc->next_chunk] < offset)) {
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1681 sc = msc;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1682 offset = msc->chunk_offsets[msc->next_chunk];
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1683 }
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1684 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1685 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1686 }
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1687 if (!sc || offset==INT64_MAX)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1688 return -1;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1689
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1690 sc->next_chunk++;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1691
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1692 if(mov->next_chunk_offset < offset) { /* some meta data */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1693 url_fskip(&s->pb, (offset - mov->next_chunk_offset));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1694 mov->next_chunk_offset = offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1695 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1696
708
d79164865a7c more fine grained discarding of packets
michael
parents: 697
diff changeset
1697 if(!sc->is_ff_stream || (s->streams[sc->ffindex]->discard >= AVDISCARD_ALL)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1698 url_fskip(&s->pb, (offset - mov->next_chunk_offset));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1699 mov->next_chunk_offset = offset;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1700 offset = INT64_MAX;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1701 goto again;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1702 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1703
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1704 /* now get the chunk size... */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1705
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1706 for(i=0; i<mov->total_streams; i++) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1707 MOVStreamContext *msc = mov->streams[i];
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1708 if ((msc->next_chunk < msc->chunk_count)
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1709 && msc->chunk_offsets[msc->next_chunk] - offset < size
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1710 && msc->chunk_offsets[msc->next_chunk] > offset)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1711 size = msc->chunk_offsets[msc->next_chunk] - offset;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1712 }
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1713
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1714 #ifdef MOV_MINOLTA_FIX
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1715 //Make sure that size is according to sample_size (Needed by .mov files
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1716 //created on a Minolta Dimage Xi where audio chunks contains waste data in the end)
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1717 //Maybe we should really not only check sc->sample_size, but also sc->sample_sizes
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1718 //but I have no such movies
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1719 if (sc->sample_size > 0) {
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1720 int foundsize=0;
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1721 for(i=0; i<(sc->sample_to_chunk_sz); i++) {
660
758929a1744c chunk support in mov patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 658
diff changeset
1722 if( (sc->sample_to_chunk[i].first)<=(sc->next_chunk) )
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1723 {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1724 // I can't figure out why for PCM audio sample_size is always 1
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1725 // (it should actually be channels*bits_per_second/8) but it is.
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1726 AVCodecContext* cod = s->streams[sc->ffindex]->codec;
401
42cc78ece67f * .mov files with uncompressed audio can't be correctly processed
romansh
parents: 395
diff changeset
1727 if (sc->sample_size == 1 && (cod->codec_id == CODEC_ID_PCM_S16BE || cod->codec_id == CODEC_ID_PCM_S16LE))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1728 foundsize=(sc->sample_to_chunk[i].count*cod->channels*cod->bits_per_sample)/8;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1729 else
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1730 foundsize=sc->sample_to_chunk[i].count*sc->sample_size;
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1731 }
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1732 dprintf("sample_to_chunk first=%ld count=%ld, id=%ld\n", sc->sample_to_chunk[i].first, sc->sample_to_chunk[i].count, sc->sample_to_chunk[i].id);
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1733 }
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1734 if( (foundsize>0) && (foundsize<size) )
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1735 {
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1736 size=foundsize;
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1737 }
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1738 }
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1739 #endif //MOV_MINOLTA_FIX
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1740
771
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1741 idx = sc->sample_to_chunk_index;
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1742 if (idx + 1 < sc->sample_to_chunk_sz && sc->next_chunk >= sc->sample_to_chunk[idx + 1].first)
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1743 idx++;
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1744 sc->sample_to_chunk_index = idx;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1745 /* split chunks into samples */
771
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1746 if (sc->sample_size == 0 || sc->sample_size > 100) {
653
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1747 if (idx >= 0 && sc->sample_to_chunk[idx].count != 1) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1748 mov->partial = sc;
653
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1749 /* we'll have to get those samples before next chunk */
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1750 sc->left_in_chunk = sc->sample_to_chunk[idx].count - 1;
723
3a9f7fb4e7bb reverting 1.66 -> 1.67 change
michael
parents: 712
diff changeset
1751 size = (sc->sample_size > 1)?sc->sample_size:sc->sample_sizes[sc->current_sample];
653
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1752 }
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1753
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1754 sc->current_sample++;
771
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1755 }else if(idx + 1 < sc->sample_to_chunk_sz){
967
46316f0fae06 The current_sample field is meant to be the sample number, not an offset into
diego
parents: 965
diff changeset
1756 sc->current_sample += sc->sample_to_chunk[idx].count;
640
6f3a6774df82 handle fixed sample_size patch by Roine Gustafsson <roine AT users.sourceforge.net>
mmu_man
parents: 639
diff changeset
1757 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1758
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1759 readchunk:
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1760 dprintf("chunk: %lli -> %lli (%i)\n", offset, offset + size, size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1761 if(size == 0x0FFFFFFF)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1762 size = mov->mdat_size + mov->mdat_offset - offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1763 if(size < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1764 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1765 if(size == 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1766 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1767 url_fseek(&s->pb, offset, SEEK_SET);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1768
775
c5077fdab490 AVPacket.pos
michael
parents: 771
diff changeset
1769 av_get_packet(&s->pb, pkt, size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1770 pkt->stream_index = sc->ffindex;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1771
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
1772 // If the keyframes table exists, mark any samples that are in the table as key frames.
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
1773 // If no table exists, treat very sample as a key frame.
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1774 if (sc->keyframes) {
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
1775 a = 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
1776 b = sc->keyframe_count - 1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1777
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
1778 while (a < b) {
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 m = (a + b + 1) >> 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
1780 if (sc->keyframes[m] > sc->current_sample) {
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
1781 b = m - 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
1782 } else {
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
1783 a = m;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1784 }
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
1785 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1786
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
1787 if (sc->keyframes[a] == sc->current_sample)
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
1788 pkt->flags |= PKT_FLAG_KEY;
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
1789 }
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
1790 else
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
1791 pkt->flags |= PKT_FLAG_KEY;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1792
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1793 mov->next_chunk_offset = offset + size;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1794
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1795 /* find the corresponding dts */
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1796 if (sc && sc->sample_to_time_index < sc->stts_count && pkt) {
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1797 unsigned int count;
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1798 uint64_t dts, pts;
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1799 unsigned int duration = sc->stts_data[sc->sample_to_time_index].duration;
856b151f926a cleanup
michael
parents: 660
diff changeset
1800 count = sc->stts_data[sc->sample_to_time_index].count;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1801 if ((sc->sample_to_time_sample + count) < sc->current_sample) {
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1802 sc->sample_to_time_sample += count;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1803 sc->sample_to_time_time += count*duration;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1804 sc->sample_to_time_index ++;
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1805 duration = sc->stts_data[sc->sample_to_time_index].duration;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1806 }
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1807 dts = sc->sample_to_time_time + (sc->current_sample-1 - sc->sample_to_time_sample) * (int64_t)duration;
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1808 /* find the corresponding pts */
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1809 if (sc->sample_to_ctime_index < sc->ctts_count) {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1810 int duration = sc->ctts_data[sc->sample_to_ctime_index].duration;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1811 int count = sc->ctts_data[sc->sample_to_ctime_index].count;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1812
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1813 if ((sc->sample_to_ctime_sample + count) < sc->current_sample) {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1814 sc->sample_to_ctime_sample += count;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1815 sc->sample_to_ctime_index ++;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1816 duration = sc->ctts_data[sc->sample_to_ctime_index].duration;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1817 }
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1818 pts = dts + duration;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1819 }else
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1820 pts = dts;
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1821
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1822 st= s->streams[ sc->ffindex ];
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1823 assert(pts % st->time_base.num == 0);
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1824 assert(dts % st->time_base.num == 0);
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1825
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1826 pkt->pts = pts / st->time_base.num;
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1827 pkt->dts = dts / st->time_base.num;
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1828 dprintf("stream #%d smp #%ld dts = %lld pts = %lld (smp:%ld time:%lld idx:%d ent:%d count:%d dur:%d)\n"
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1829 , pkt->stream_index, sc->current_sample-1, pkt->dts, pkt->pts
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1830 , sc->sample_to_time_sample
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1831 , sc->sample_to_time_time
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1832 , sc->sample_to_time_index
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1833 , sc->stts_count
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1834 , count
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1835 , duration);
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1836 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1837
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1838 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1839 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1840
954
7d778342142f mov split chunks removal patch by (Baptiste COUDURIER / baptiste.coudurier smartjog com>
michael
parents: 953
diff changeset
1841 #if defined(MOV_SEEK)
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1842 /**
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1843 * Seek method based on the one described in the Appendix C of QTFileFormat.pdf
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1844 */
794
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
1845 static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_time, int flags)
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1846 {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1847 MOVContext* mov = (MOVContext *) s->priv_data;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1848 MOVStreamContext* sc;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1849 int32_t i, a, b, m;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1850 int64_t start_time;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1851 int32_t seek_sample, sample;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1852 int32_t duration;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1853 int32_t count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1854 int32_t chunk;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1855 int32_t left_in_chunk;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1856 int64_t chunk_file_offset;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1857 int64_t sample_file_offset;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1858 int32_t first_chunk_sample;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1859 int32_t sample_to_chunk_idx;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1860 int sample_to_time_index;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1861 long sample_to_time_sample = 0;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1862 uint64_t sample_to_time_time = 0;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1863 int mov_idx;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1864
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1865 // Find the corresponding mov stream
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1866 for (mov_idx = 0; mov_idx < mov->total_streams; mov_idx++)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1867 if (mov->streams[mov_idx]->ffindex == stream_index)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1868 break;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1869 if (mov_idx == mov->total_streams) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1870 av_log(s, AV_LOG_ERROR, "mov: requested stream was not found in mov streams (idx=%i)\n", stream_index);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1871 return -1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1872 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1873 sc = mov->streams[mov_idx];
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1874
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1875 sample_time *= s->streams[stream_index]->time_base.num;
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1876
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1877 // Step 1. Find the edit that contains the requested time (elst)
928
2244fbe4a883 simplify timebase if possible
michael
parents: 913
diff changeset
1878 if (sc->edit_count && 0) {
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1879 // FIXME should handle edit list
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1880 av_log(s, AV_LOG_ERROR, "mov: does not handle seeking in files that contain edit list (c:%d)\n", sc->edit_count);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1881 return -1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1882 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1883
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1884 // Step 2. Find the corresponding sample using the Time-to-sample atom (stts) */
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1885 dprintf("Searching for time %li in stream #%i (time_scale=%i)\n", (long)sample_time, mov_idx, sc->time_scale);
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1886 start_time = 0; // FIXME use elst atom
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1887 sample = 1; // sample are 0 based in table
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1888
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1889 for (i = 0; i < sc->stts_count; i++) {
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1890 count = sc->stts_data[i].count;
856b151f926a cleanup
michael
parents: 660
diff changeset
1891 duration = sc->stts_data[i].duration;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1892 if ((start_time + count*duration) > sample_time) {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1893 sample_to_time_time = start_time;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1894 sample_to_time_index = i;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1895 sample_to_time_sample = sample;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1896 sample += (sample_time - start_time) / duration;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1897 break;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1898 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1899 sample += count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1900 start_time += count * duration;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1901 }
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1902 sample_to_time_time = start_time;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1903 sample_to_time_index = i;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1904 /* NOTE: despite what qt doc say, the dt value (Display Time in qt vocabulary) computed with the stts atom
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1905 is a decoding time stamp (dts) not a presentation time stamp. And as usual dts != pts for stream with b frames */
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1906
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1907 dprintf("Found time %li at sample #%u\n", (long)sample_time, sample);
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1908 if (sample > sc->sample_count) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1909 av_log(s, AV_LOG_ERROR, "mov: sample pos is too high, unable to seek (req. sample=%i, sample count=%ld)\n", sample, sc->sample_count);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1910 return -1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1911 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1912
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1913 // Step 3. Find the prior sync. sample using the Sync sample atom (stss)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1914 if (sc->keyframes) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1915 a = 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1916 b = sc->keyframe_count - 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1917 while (a < b) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1918 m = (a + b + 1) >> 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1919 if (sc->keyframes[m] > sample) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1920 b = m - 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1921 } else {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1922 a = m;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1923 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1924 }
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
1925 // for low latency prob: always use the previous keyframe, just uncomment the next line
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
1926 // if (a) a--;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1927 seek_sample = sc->keyframes[a];
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1928 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1929 else
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1930 seek_sample = sample; // else all samples are key frames
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1931 dprintf("Found nearest keyframe at sample #%i \n", seek_sample);
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1932
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1933 // Step 4. Find the chunk of the sample using the Sample-to-chunk-atom (stsc)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1934 for (first_chunk_sample = 1, i = 0; i < (sc->sample_to_chunk_sz - 1); i++) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1935 b = (sc->sample_to_chunk[i + 1].first - sc->sample_to_chunk[i].first) * sc->sample_to_chunk[i].count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1936 if (seek_sample >= first_chunk_sample && seek_sample < (first_chunk_sample + b))
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1937 break;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1938 first_chunk_sample += b;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1939 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1940 chunk = sc->sample_to_chunk[i].first + (seek_sample - first_chunk_sample) / sc->sample_to_chunk[i].count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1941 left_in_chunk = sc->sample_to_chunk[i].count - (seek_sample - first_chunk_sample) % sc->sample_to_chunk[i].count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1942 first_chunk_sample += ((seek_sample - first_chunk_sample) / sc->sample_to_chunk[i].count) * sc->sample_to_chunk[i].count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1943 sample_to_chunk_idx = i;
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1944 dprintf("Sample was found in chunk #%i at sample offset %i (idx %i)\n", chunk, seek_sample - first_chunk_sample, sample_to_chunk_idx);
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1945
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1946 // Step 5. Find the offset of the chunk using the chunk offset atom
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1947 if (!sc->chunk_offsets) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1948 av_log(s, AV_LOG_ERROR, "mov: no chunk offset atom, unable to seek\n");
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1949 return -1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1950 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1951 if (chunk > sc->chunk_count) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1952 av_log(s, AV_LOG_ERROR, "mov: chunk offset atom too short, unable to seek (req. chunk=%i, chunk count=%li)\n", chunk, sc->chunk_count);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1953 return -1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1954 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1955 chunk_file_offset = sc->chunk_offsets[chunk - 1];
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1956 dprintf("Chunk file offset is #%llu \n", chunk_file_offset);
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1957
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1958 // Step 6. Find the byte offset within the chunk using the sample size atom
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1959 sample_file_offset = chunk_file_offset;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1960 if (sc->sample_size)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1961 sample_file_offset += (seek_sample - first_chunk_sample) * sc->sample_size;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1962 else {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1963 for (i = 0; i < (seek_sample - first_chunk_sample); i++) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1964 sample_file_offset += sc->sample_sizes[first_chunk_sample + i - 1];
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1965 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1966 }
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1967 dprintf("Sample file offset is #%llu \n", sample_file_offset);
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1968
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1969 // Step 6. Update the parser
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1970 mov->partial = sc;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1971 mov->next_chunk_offset = sample_file_offset;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1972 // Update current stream state
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1973 sc->current_sample = seek_sample - 1; // zero based
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1974 sc->left_in_chunk = left_in_chunk;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1975 sc->next_chunk = chunk; // +1 -1 (zero based)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1976 sc->sample_to_chunk_index = sample_to_chunk_idx;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1977
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1978 // Update other streams
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1979 for (i = 0; i<mov->total_streams; i++) {
492
0ed5d359f63a compilation of mov.c broken patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 491
diff changeset
1980 MOVStreamContext *msc;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1981 if (i == mov_idx) continue;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1982 // Find the nearest 'next' chunk
492
0ed5d359f63a compilation of mov.c broken patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 491
diff changeset
1983 msc = mov->streams[i];
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1984 a = 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1985 b = msc->chunk_count - 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1986 while (a < b) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1987 m = (a + b + 1) >> 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1988 if (msc->chunk_offsets[m] > chunk_file_offset) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1989 b = m - 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1990 } else {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1991 a = m;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1992 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1993 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1994 msc->next_chunk = a;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1995 if (msc->chunk_offsets[a] < chunk_file_offset && a < (msc->chunk_count-1))
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1996 msc->next_chunk ++;
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1997 dprintf("Nearest next chunk for stream #%i is #%li @%lli\n", i, msc->next_chunk+1, msc->chunk_offsets[msc->next_chunk]);
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
1998
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1999 // Compute sample count and index in the sample_to_chunk table (what a pity)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2000 msc->sample_to_chunk_index = 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2001 msc->current_sample = 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2002 for(; msc->sample_to_chunk_index < (msc->sample_to_chunk_sz - 1)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2003 && msc->sample_to_chunk[msc->sample_to_chunk_index + 1].first <= (1 + msc->next_chunk); msc->sample_to_chunk_index++) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2004 msc->current_sample += (msc->sample_to_chunk[msc->sample_to_chunk_index + 1].first - msc->sample_to_chunk[msc->sample_to_chunk_index].first) \
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2005 * msc->sample_to_chunk[msc->sample_to_chunk_index].count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2006 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2007 msc->current_sample += (msc->next_chunk - (msc->sample_to_chunk[msc->sample_to_chunk_index].first - 1)) * sc->sample_to_chunk[msc->sample_to_chunk_index].count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2008 msc->left_in_chunk = msc->sample_to_chunk[msc->sample_to_chunk_index].count - 1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2009 // Find corresponding position in stts (used later to compute dts)
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2010 sample = 0;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2011 start_time = 0;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2012 for (msc->sample_to_time_index = 0; msc->sample_to_time_index < msc->stts_count; msc->sample_to_time_index++) {
670
856b151f926a cleanup
michael
parents: 660
diff changeset
2013 count = msc->stts_data[msc->sample_to_time_index].count;
856b151f926a cleanup
michael
parents: 660
diff changeset
2014 duration = msc->stts_data[msc->sample_to_time_index].duration;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2015 if ((sample + count - 1) > msc->current_sample) {
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2016 msc->sample_to_time_time = start_time;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2017 msc->sample_to_time_sample = sample;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2018 break;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2019 }
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2020 sample += count;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2021 start_time += count * duration;
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2022 }
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2023 sample = 0;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2024 for (msc->sample_to_ctime_index = 0; msc->sample_to_ctime_index < msc->ctts_count; msc->sample_to_ctime_index++) {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2025 count = msc->ctts_data[msc->sample_to_ctime_index].count;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2026 duration = msc->ctts_data[msc->sample_to_ctime_index].duration;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2027 if ((sample + count - 1) > msc->current_sample) {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2028 msc->sample_to_ctime_sample = sample;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2029 break;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2030 }
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2031 sample += count;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2032 }
952
5fdcae83a82f mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 949
diff changeset
2033 dprintf("Next Sample for stream #%i is #%li @%li\n", i, msc->current_sample + 1, msc->sample_to_chunk_index + 1);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2034 }
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2035 return 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2036 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2037 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2038
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2039 static int mov_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2040 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2041 int i;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
2042 MOVContext *mov = (MOVContext *) s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2043 for(i=0; i<mov->total_streams; i++)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2044 mov_free_stream_context(mov->streams[i]);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
2045 /* free color tabs */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
2046 for(i=0; i<mov->ctab_size; i++)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
2047 av_freep(&mov->ctab[i]);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
2048 av_freep(&mov->ctab);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2049 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2050 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2051
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2052 static AVInputFormat mov_iformat = {
677
6d6a11ba402a quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents: 671
diff changeset
2053 "mov,mp4,m4a,3gp,3g2",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2054 "QuickTime/MPEG4 format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2055 sizeof(MOVContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2056 mov_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2057 mov_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2058 mov_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2059 mov_read_close,
954
7d778342142f mov split chunks removal patch by (Baptiste COUDURIER / baptiste.coudurier smartjog com>
michael
parents: 953
diff changeset
2060 #if defined(MOV_SEEK)
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2061 mov_read_seek,
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
2062 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2063 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2064
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2065 int mov_init(void)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2066 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2067 av_register_input_format(&mov_iformat);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2068 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2069 }