annotate mov.c @ 865:1646098f8e26 libavformat

QDM2 compatible decoder
author rtognimp
date Tue, 18 Oct 2005 20:16:43 +0000
parents 27c765023958
children 91dcb9da9be6
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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>
c1ed10f3b052 cleanup frame_rate code, this may also fix some large file bugs
michael
parents: 383
diff changeset
21
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
23 #include "avi.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25 #ifdef CONFIG_ZLIB
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26 #include <zlib.h>
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30 * First version by Francois Revol revol@free.fr
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
31 * Seek function by Gael Chardon gael.dev@4now.net
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
32 *
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 * Features and limitations:
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
34 * - reads most of the QT files I have (at least the structure),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
35 * 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
36 * FIXED, Francois Revol, 07/17/2002
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 * - ffmpeg has nearly none of the usual QuickTime codecs,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
38 * although I succesfully dumped raw and mp3 audio tracks off .mov files.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 * 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
40 * - .mp4 parsing is still hazardous, although the format really is QuickTime with some minor changes
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
41 * (to make .mov parser crash maybe ?), despite what they say in the MPEG FAQ at
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42 * http://mpeg.telecomitalialab.com/faq.htm
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 * - 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
44 * - 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
45 *
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
46 * Funny I didn't know about http://sourceforge.net/projects/qt-ffmpeg/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
47 * when coding this :) (it's a writer anyway)
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 * Reference documents:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50 * http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 * Apple:
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
52 * 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
53 * http://developer.apple.com/documentation/QuickTime/QTFF/qtff.pdf
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 * QuickTime is a trademark of Apple (AFAIK :))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 //#define DEBUG
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
58 #ifdef DEBUG
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
59 #include <stdio.h>
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
60 #include <fcntl.h>
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
61 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62
302
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
63 #include "qtpalette.h"
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
64
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
65
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
66 /* Allows seeking (MOV_SPLIT_CHUNKS should also be defined) */
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
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 /* allows chunk splitting - should work now... */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 /* in case you can't read a file, try commenting */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 #define MOV_SPLIT_CHUNKS
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
73 /* Special handling for movies created with Minolta Dimaxe Xi*/
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
74 /* 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
75 #define MOV_MINOLTA_FIX
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
76
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 /* some streams in QT (and in MP4 mostly) aren't either video nor audio */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 /* 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
79 /* getting rid of these */
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
80 #define CODEC_TYPE_MOV_OTHER (enum CodecType) 2
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82 static const CodecTag mov_video_tags[] = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 /* { CODEC_ID_, MKTAG('c', 'v', 'i', 'd') }, *//* Cinepak */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 /* { CODEC_ID_H263, MKTAG('r', 'a', 'w', ' ') }, *//* Uncompressed RGB */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 /* { 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
86 /* { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, *//* YUV with alpha-channel (AVID Uncompressed) */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87 /* Graphics */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 /* Animation */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89 /* Apple video */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90 /* Kodak Photo CD */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93 { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
94 { 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
95 { 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
96 /* { 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
97 /* { 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
98 /* Sorenson video */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, /* Sorenson Video v1 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, /* Sorenson Video v1 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 { 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
102 { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 { 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
105 { 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
106 { 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
107 /* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */
133
31f0dda651f8 * added s263 (mapped to h263 - 3gp files)
kabi
parents: 132
diff changeset
109 { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 { 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
112 /* { 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
113 { 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
114 { 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
115 { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */
301
4513d5ab9eb5 8BPS decoder
rtognimp
parents: 289
diff changeset
116 { 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
117 { 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
118 { 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
119 { CODEC_ID_QDRAW, MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
120 { 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
121 { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 produced by Sony HD camera */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
122 { CODEC_ID_NONE, 0 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 static const CodecTag mov_audio_tags[] = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
126 /* { CODEC_ID_PCM_S16BE, MKTAG('N', 'O', 'N', 'E') }, *//* uncompressed */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
127 { 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
128 /* { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's') },*/ /* 8 bits */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
129 { CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') }, /* 8 bits unsigned */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
130 { CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, /* */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, /* */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, /* IMA-4 ADPCM */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134 { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, /* Macintosh Audio Compression and Expansion 3:1 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137 { 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
138 { CODEC_ID_MP2, 0x6D730055 }, /* MPEG layer 3 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 { CODEC_ID_MP2, 0x5500736D }, /* MPEG layer 3 *//* XXX: check endianness */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 /* { 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
141 /* MP4 tags */
655
7cba02909808 AAC fix by Thomas Raivio <tjraivio AT cc DOT hut DOT fi>
mmu_man
parents: 654
diff changeset
142 { 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
143 /* 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
144 { 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
145 { 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
146 { 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
147 { CODEC_ID_ALAC,MKTAG('a', 'l', 'a', 'c') }, /* Apple Lossless */
865
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
148 { CODEC_ID_QDM2,MKTAG('Q', 'D', 'M', '2') }, /* QDM2 */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
149 { CODEC_ID_NONE, 0 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
151
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
152 /* the QuickTime file format is quite convoluted...
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
153 * it has lots of index tables, each indexing something in another one...
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
154 * Here we just use what is needed to read the chunks
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 typedef struct MOV_sample_to_chunk_tbl {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
158 long first;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
159 long count;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
160 long id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161 } MOV_sample_to_chunk_tbl;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
163 typedef struct {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
164 uint32_t type;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
165 int64_t offset;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
166 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
167 } MOV_atom_t;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
168
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
169 typedef struct {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
170 int seed;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
171 int flags;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
172 int size;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
173 void* clrs;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
174 } MOV_ctab_t;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
175
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
176 typedef struct {
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
177 uint8_t version;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
178 uint32_t flags; // 24bit
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
179
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
180 /* 0x03 ESDescrTag */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
181 uint16_t es_id;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
182 #define MP4ODescrTag 0x01
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
183 #define MP4IODescrTag 0x02
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
184 #define MP4ESDescrTag 0x03
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
185 #define MP4DecConfigDescrTag 0x04
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
186 #define MP4DecSpecificDescrTag 0x05
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
187 #define MP4SLConfigDescrTag 0x06
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
188 #define MP4ContentIdDescrTag 0x07
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
189 #define MP4SupplContentIdDescrTag 0x08
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
190 #define MP4IPIPtrDescrTag 0x09
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
191 #define MP4IPMPPtrDescrTag 0x0A
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
192 #define MP4IPMPDescrTag 0x0B
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
193 #define MP4RegistrationDescrTag 0x0D
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
194 #define MP4ESIDIncDescrTag 0x0E
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
195 #define MP4ESIDRefDescrTag 0x0F
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
196 #define MP4FileIODescrTag 0x10
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
197 #define MP4FileODescrTag 0x11
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
198 #define MP4ExtProfileLevelDescrTag 0x13
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
199 #define MP4ExtDescrTagsStart 0x80
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
200 #define MP4ExtDescrTagsEnd 0xFE
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
201 uint8_t stream_priority;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
202
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
203 /* 0x04 DecConfigDescrTag */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
204 uint8_t object_type_id;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
205 uint8_t stream_type;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
206 /* XXX: really streamType is
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
207 * only 6bit, followed by:
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
208 * 1bit upStream
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
209 * 1bit reserved
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
210 */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
211 uint32_t buffer_size_db; // 24
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
212 uint32_t max_bitrate;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
213 uint32_t avg_bitrate;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
214
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
215 /* 0x05 DecSpecificDescrTag */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
216 uint8_t decoder_cfg_len;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
217 uint8_t *decoder_cfg;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
218
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
219 /* 0x06 SLConfigDescrTag */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
220 uint8_t sl_config_len;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
221 uint8_t *sl_config;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
222 } MOV_esds_t;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
223
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
224 struct MOVParseTableEntry;
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
225
670
856b151f926a cleanup
michael
parents: 660
diff changeset
226 typedef struct Time2Sample{
856b151f926a cleanup
michael
parents: 660
diff changeset
227 int count;
856b151f926a cleanup
michael
parents: 660
diff changeset
228 int duration;
856b151f926a cleanup
michael
parents: 660
diff changeset
229 }Time2Sample;
856b151f926a cleanup
michael
parents: 660
diff changeset
230
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
231 typedef struct MOVStreamContext {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
232 int ffindex; /* the ffmpeg stream id */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 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
234 long next_chunk;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
235 long chunk_count;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
236 int64_t *chunk_offsets;
670
856b151f926a cleanup
michael
parents: 660
diff changeset
237 int stts_count;
856b151f926a cleanup
michael
parents: 660
diff changeset
238 Time2Sample *stts_data;
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
239 int ctts_count;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
240 Time2Sample *ctts_data;
670
856b151f926a cleanup
michael
parents: 660
diff changeset
241 int edit_count; /* number of 'edit' (elst atom) */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 long sample_to_chunk_sz;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 MOV_sample_to_chunk_tbl *sample_to_chunk;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 long sample_to_chunk_index;
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
245 int sample_to_time_index;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
246 long sample_to_time_sample;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
247 uint64_t sample_to_time_time;
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
248 int sample_to_ctime_index;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
249 int sample_to_ctime_sample;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 long sample_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 long sample_count;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 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
253 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
254 long *keyframes;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
255 int time_scale;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 long current_sample;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 long left_in_chunk; /* how many samples before next chunk */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
258 MOV_esds_t esds;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259 } MOVStreamContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261 typedef struct MOVContext {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
262 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
263 AVFormatContext *fc;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
264 int time_scale;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
265 int duration; /* duration of the longest track */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 int found_moov; /* when both 'moov' and 'mdat' sections has been found */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 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
268 int64_t mdat_size;
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
269 int64_t mdat_offset;
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
270 int ni; ///< non interleaved mode
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 int total_streams;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 /* 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
273 * 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
274 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 MOVStreamContext *streams[MAX_STREAMS];
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
276
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
277 int64_t next_chunk_offset;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
278 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
279 int ctab_size;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
280 MOV_ctab_t **ctab; /* color tables */
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
281 const struct MOVParseTableEntry *parse_table; /* could be eventually used to change the table */
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
282 /* 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
283
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
284 AVPaletteControl palette_control;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
285 } MOVContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
286
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
287
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 /* 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
289
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
290 /* those functions parse an atom */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 /* return code:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 1: found what I wanted, exit
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
293 0: continue to parse next atom
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 -1: error occured, exit
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295 */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
296 typedef int (*mov_parse_function)(MOVContext *ctx, ByteIOContext *pb, MOV_atom_t atom);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 /* links atom IDs to parse functions */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 typedef struct MOVParseTableEntry {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
300 uint32_t type;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 mov_parse_function func;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 } MOVParseTableEntry;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
304 #ifdef DEBUG
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
305 /*
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
306 * XXX: static sux, even more in a multithreaded environment...
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
307 * Avoid them. This is here just to help debugging.
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
308 */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
309 static int debug_indent = 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
310 void print_atom(const char *str, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
311 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
312 unsigned int tag, i;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
313 tag = (unsigned int) atom.type;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
314 i=debug_indent;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
315 if(tag == 0) tag = MKTAG('N', 'U', 'L', 'L');
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
316 while(i--)
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
317 av_log(NULL, AV_LOG_DEBUG, "|");
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
318 av_log(NULL, AV_LOG_DEBUG, "parse:");
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
319 av_log(NULL, AV_LOG_DEBUG, " %s: tag=%c%c%c%c offset=0x%x size=0x%x\n",
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
320 str, tag & 0xff,
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
321 (tag >> 8) & 0xff,
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
322 (tag >> 16) & 0xff,
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
323 (tag >> 24) & 0xff,
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
324 (unsigned int)atom.offset,
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
325 (unsigned int)atom.size);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
326 assert((unsigned int)atom.size < 0x7fffffff);// catching errors
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
327 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
328 #else
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
329 #define print_atom(a,b)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
330 #endif
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
331
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
332
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
333 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
334 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
335 print_atom("leaf", atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
336
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
337 if (atom.size>1)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
338 url_fskip(pb, atom.size);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
339 /* url_seek(pb, atom_offset+atom.size, SEEK_SET); */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
340 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
343 static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 {
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
345 int64_t total_size = 0;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
346 MOV_atom_t a;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
347 int i;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 int err = 0;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
349
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 #ifdef DEBUG
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
351 print_atom("default", atom);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 debug_indent++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 #endif
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
354
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
355 a.offset = atom.offset;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
356
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
357 if (atom.size < 0)
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
358 atom.size = 0x7fffffffffffffffLL;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
359 while(((total_size + 8) < atom.size) && !url_feof(pb) && !err) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
360 a.size = atom.size;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
361 a.type=0L;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
362 if(atom.size >= 8) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
363 a.size = get_be32(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
364 a.type = get_le32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
365 }
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
366 total_size += 8;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
367 a.offset += 8;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
368 //av_log(NULL, AV_LOG_DEBUG, "type: %08x %.4s sz: %Lx %Lx %Lx\n", type, (char*)&type, size, atom.size, total_size);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
369 if (a.size == 1) { /* 64 bit extended size */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
370 a.size = get_be64(pb) - 8;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
371 a.offset += 8;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
372 total_size += 8;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373 }
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
374 if (a.size == 0) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
375 a.size = atom.size - total_size;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
376 if (a.size <= 8)
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
377 break;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
378 }
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
379 for (i = 0; c->parse_table[i].type != 0L
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
380 && c->parse_table[i].type != a.type; i++)
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
381 /* empty */;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
382
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
383 a.size -= 8;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
384
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
385 if(a.size < 0)
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
386 break;
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
387
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
388 // av_log(NULL, AV_LOG_DEBUG, " i=%ld\n", i);
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
389 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
390 // url_seek(pb, atom.offset+atom.size, SEEK_SET);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
391 #ifdef DEBUG
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
392 print_atom("unknown", a);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
393 #endif
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
394 url_fskip(pb, a.size);
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
395 } else {
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
396 #ifdef DEBUG
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
397 //char b[5] = { type & 0xff, (type >> 8) & 0xff, (type >> 16) & 0xff, (type >> 24) & 0xff, 0 };
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
398 //print_atom(b, type, offset, size);
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
399 #endif
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
400 err = (c->parse_table[i].func)(c, pb, a);
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
401 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
403 a.offset += a.size;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
404 total_size += a.size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
405 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
406
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
407 if (!err && total_size < atom.size && atom.size < 0x7ffff) {
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
408 //av_log(NULL, AV_LOG_DEBUG, "RESET %Ld %Ld err:%d\n", atom.size, total_size, err);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
409 url_fskip(pb, atom.size - total_size);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
410 }
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
411
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 debug_indent--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 return err;
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_ctab(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419 {
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
420 #if 1
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
421 url_fskip(pb, atom.size); // for now
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
422 #else
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
423 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
424 unsigned int len;
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 677
diff changeset
425 MOV_ctab_t *t;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
426 c->ctab = av_realloc(c->ctab, ++c->ctab_size);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
427 t = c->ctab[c->ctab_size];
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
428 t->seed = get_be32(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
429 t->flags = get_be16(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
430 t->size = get_be16(pb) + 1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
431 len = 2 * t->size * 4;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
432 if (len > 0) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
433 t->clrs = av_malloc(len); // 16bit A R G B
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
434 if (t->clrs)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
435 get_buffer(pb, t->clrs, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
436 }
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
437 #endif
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
438
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
439 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
440 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
441
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
442 static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
443 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
444 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
445 int len = 0;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
446 uint32_t type;
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
447 uint32_t ctype;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
448
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
449 print_atom("hdlr", atom);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
450
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
451 get_byte(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
452 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
453
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
454 /* component type */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
455 ctype = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
456 type = get_le32(pb); /* component subtype */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
457
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
459 av_log(NULL, AV_LOG_DEBUG, "ctype= %c%c%c%c (0x%08lx)\n", *((char *)&ctype), ((char *)&ctype)[1], ((char *)&ctype)[2], ((char *)&ctype)[3], (long) ctype);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
460 av_log(NULL, AV_LOG_DEBUG, "stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
461 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
462 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
463 /* XXX: yeah this is ugly... */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
464 if(ctype == MKTAG('m', 'h', 'l', 'r')) { /* MOV */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
465 if(type == MKTAG('v', 'i', 'd', 'e'))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
466 puts("hdlr: vide");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
467 else if(type == MKTAG('s', 'o', 'u', 'n'))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
468 puts("hdlr: soun");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
469 } else if(ctype == 0) { /* MP4 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
470 if(type == MKTAG('v', 'i', 'd', 'e'))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
471 puts("hdlr: vide");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
472 else if(type == MKTAG('s', 'o', 'u', 'n'))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
473 puts("hdlr: soun");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
474 else if(type == MKTAG('o', 'd', 's', 'm'))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
475 puts("hdlr: odsm");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
476 else if(type == MKTAG('s', 'd', 's', 'm'))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
477 puts("hdlr: sdsm");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
478 } else puts("hdlr: meta");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
479 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
480
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
481 if(ctype == MKTAG('m', 'h', 'l', 'r')) { /* MOV */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
482 /* helps parsing the string hereafter... */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
483 c->mp4 = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
484 if(type == MKTAG('v', 'i', 'd', 'e'))
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
485 st->codec->codec_type = CODEC_TYPE_VIDEO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
486 else if(type == MKTAG('s', 'o', 'u', 'n'))
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
487 st->codec->codec_type = CODEC_TYPE_AUDIO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
488 } else if(ctype == 0) { /* MP4 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
489 /* helps parsing the string hereafter... */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
490 c->mp4 = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
491 if(type == MKTAG('v', 'i', 'd', 'e'))
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
492 st->codec->codec_type = CODEC_TYPE_VIDEO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
493 else if(type == MKTAG('s', 'o', 'u', 'n'))
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
494 st->codec->codec_type = CODEC_TYPE_AUDIO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
495 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
496 get_be32(pb); /* component manufacture */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
497 get_be32(pb); /* component flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
498 get_be32(pb); /* component flags mask */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
499
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
500 if(atom.size <= 24)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
501 return 0; /* nothing left to read */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
502 /* XXX: MP4 uses a C string, not a pascal one */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
503 /* component name */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
504
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
505 if(c->mp4) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506 /* .mp4: C string */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
507 while(get_byte(pb) && (++len < (atom.size - 24)));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
508 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509 /* .mov: PASCAL string */
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
510 #ifdef DEBUG
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
511 char* buf;
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
512 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513 len = get_byte(pb);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
514 #ifdef DEBUG
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
515 buf = (uint8_t*) av_malloc(len+1);
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
516 if (buf) {
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
517 get_buffer(pb, buf, len);
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
518 buf[len] = '\0';
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
519 av_log(NULL, AV_LOG_DEBUG, "**buf='%s'\n", buf);
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
520 av_free(buf);
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
521 } else
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
522 #endif
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
523 url_fskip(pb, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
524 }
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
525
489
aeb69a5f3756 The atom 'skip' should be handled by 'mov_read_leaf()', not by
michael
parents: 438
diff changeset
526 url_fskip(pb, atom.size - (url_ftell(pb) - atom.offset));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
527 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
528 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
530 static int mov_mp4_read_descr_len(ByteIOContext *pb)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531 {
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
532 int len = 0;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
533 int count = 4;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
534 while (count--) {
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
535 int c = get_byte(pb);
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
536 len = (len << 7) | (c & 0x7f);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
537 if (!(c & 0x80))
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
538 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
539 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
540 return len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
541 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
543 static int mov_mp4_read_descr(ByteIOContext *pb, int *tag)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
544 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
545 int len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
546 *tag = get_byte(pb);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
547 len = mov_mp4_read_descr_len(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
548 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
549 av_log(NULL, AV_LOG_DEBUG, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
550 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
551 return len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
552 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
553
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
554 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
555 {
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
556 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
557 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
558 int64_t start_pos = url_ftell(pb);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
559 int tag, len;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
560
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
561 print_atom("esds", atom);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
562
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
563 /* Well, broken but suffisant for some MP4 streams */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
564 get_be32(pb); /* version + flags */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
565 len = mov_mp4_read_descr(pb, &tag);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
566 if (tag == MP4ESDescrTag) {
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
567 get_be16(pb); /* ID */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
568 get_byte(pb); /* priority */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
569 } else
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
570 get_be16(pb); /* ID */
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
571
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
572 len = mov_mp4_read_descr(pb, &tag);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
573 if (tag == MP4DecConfigDescrTag) {
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
574 sc->esds.object_type_id = get_byte(pb);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
575 sc->esds.stream_type = get_byte(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
576 sc->esds.buffer_size_db = get_be24(pb);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
577 sc->esds.max_bitrate = get_be32(pb);
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
578 sc->esds.avg_bitrate = get_be32(pb);
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
579
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
580 len = mov_mp4_read_descr(pb, &tag);
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
581 //av_log(NULL, AV_LOG_DEBUG, "LEN %d TAG %d m:%d a:%d\n", len, tag, sc->esds.max_bitrate, sc->esds.avg_bitrate);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
582 if (tag == MP4DecSpecificDescrTag) {
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
583 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
584 av_log(NULL, AV_LOG_DEBUG, "Specific MPEG4 header len=%d\n", len);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
585 #endif
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
586 st->codec->extradata = (uint8_t*) av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
587 if (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
588 get_buffer(pb, st->codec->extradata, len);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
589 st->codec->extradata_size = len;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
590 }
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
591 }
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
592 }
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
593 /* in any case, skip garbage */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
594 url_fskip(pb, atom.size - ((url_ftell(pb) - start_pos)));
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
595 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
596 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
597
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
598 /* this atom contains actual media data */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
599 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
600 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
601 print_atom("mdat", atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
602
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
603 if(atom.size == 0) /* wrong one (MP4) */
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 c->found_mdat=1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
606 c->mdat_offset = atom.offset;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
607 c->mdat_size = atom.size;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
608 if(c->found_moov)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
609 return 1; /* found both, just go */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
610 url_fskip(pb, atom.size);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
611 return 0; /* now go for moov */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
612 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
613
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
614 /* this atom should contain all header atoms */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
615 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
616 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
617 int err;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
618
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
619 print_atom("moov", atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
620
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
621 err = mov_read_default(c, pb, atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
622 /* 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
623 /* 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
624 c->found_moov=1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
625 if(c->found_mdat)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
626 return 1; /* found both, just go */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
627 return 0; /* now go for mdat */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
628 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
629
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
630
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
631 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
632 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
633 print_atom("mdhd", atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
634
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
635 get_byte(pb); /* version */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
636
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
637 get_byte(pb); get_byte(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
638 get_byte(pb); /* flags */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
639
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
640 get_be32(pb); /* creation time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
641 get_be32(pb); /* modification time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
642
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
643 c->streams[c->fc->nb_streams-1]->time_scale = get_be32(pb);
852
27c765023958 set time_base as soon as time_scale is known instead of in a unrelated chunck which might be missing
michael
parents: 849
diff changeset
644 av_set_pts_info(c->fc->streams[c->fc->nb_streams-1], 64, 1, c->streams[c->fc->nb_streams-1]->time_scale);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
645
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
646 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
647 av_log(NULL, AV_LOG_DEBUG, "track[%i].time_scale = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->time_scale); /* time scale */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
648 #endif
794
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
649 c->fc->streams[c->fc->nb_streams-1]->duration= get_be32(pb); /* duration */
130
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 get_be16(pb); /* language */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
652 get_be16(pb); /* quality */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
653
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
654 return 0;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
655 }
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
656
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
657 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
658 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
659 print_atom("mvhd", atom);
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 get_byte(pb); /* version */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
662 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
663
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
664 get_be32(pb); /* creation time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
665 get_be32(pb); /* modification time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
666 c->time_scale = get_be32(pb); /* time scale */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
667 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
668 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
669 #endif
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
670 c->duration = get_be32(pb); /* duration */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
671 get_be32(pb); /* preferred scale */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
672
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
673 get_be16(pb); /* preferred volume */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
674
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
675 url_fskip(pb, 10); /* reserved */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
676
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
677 url_fskip(pb, 36); /* display matrix */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
678
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
679 get_be32(pb); /* preview time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
680 get_be32(pb); /* preview duration */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
681 get_be32(pb); /* poster time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
682 get_be32(pb); /* selection time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
683 get_be32(pb); /* selection duration */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
684 get_be32(pb); /* current time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
685 get_be32(pb); /* next track ID */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
686
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
687 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
688 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
689
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
690 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
691 {
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
692 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
693
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
694 if((uint64_t)atom.size > (1<<30))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
695 return -1;
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
696
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
697 // 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
698 // 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
699 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
700 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
701 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
702
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
703 if (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
704 strcpy(st->codec->extradata, "SVQ3"); // fake
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
705 get_buffer(pb, st->codec->extradata + 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
706 //av_log(NULL, AV_LOG_DEBUG, "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
707 } else
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
708 url_fskip(pb, atom.size);
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
709
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
710 return 0;
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
711 }
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
712
865
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
713 static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
714 {
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
715 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
716
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
717 if((uint64_t)atom.size > (1<<30))
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
718 return -1;
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
719
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
720 // pass all frma atom to codec, needed at least for QDM2
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
721 av_free(st->codec->extradata);
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
722 st->codec->extradata_size = atom.size;
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
723 st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
724
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
725 if (st->codec->extradata) {
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
726 get_buffer(pb, st->codec->extradata, atom.size);
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
727 //av_log(NULL, AV_LOG_DEBUG, "Reading frma %Ld %s\n", atom.size, (char*)st->codec->extradata);
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
728 } else
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
729 url_fskip(pb, atom.size);
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
730
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
731 return 0;
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
732 }
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
733
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
734 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
735 {
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
736 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
737
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
738 if((uint64_t)atom.size > (1<<30))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
739 return -1;
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
740
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
741 av_free(st->codec->extradata);
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
742
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
743 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
744 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
745
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
746 if (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
747 get_buffer(pb, st->codec->extradata, atom.size);
615
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
748 } else
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
749 url_fskip(pb, atom.size);
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
750
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
751 return 0;
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
752 }
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
753
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
754 static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
755 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
756 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
757 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
758 unsigned int i, entries;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
759
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
760 print_atom("stco", atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
761
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
762 get_byte(pb); /* version */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
763 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
764
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
765 entries = get_be32(pb);
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
766
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
767 if(entries >= UINT_MAX/sizeof(int64_t))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
768 return -1;
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
769
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
770 sc->chunk_count = entries;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
771 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
772 if (!sc->chunk_offsets)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
773 return -1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
774 if (atom.type == MKTAG('s', 't', 'c', 'o')) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
775 for(i=0; i<entries; i++) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
776 sc->chunk_offsets[i] = get_be32(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
777 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
778 } else if (atom.type == MKTAG('c', 'o', '6', '4')) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
779 for(i=0; i<entries; i++) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
780 sc->chunk_offsets[i] = get_be64(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
781 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
782 } else
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
783 return -1;
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
784
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
785 for(i=0; i<c->fc->nb_streams; i++){
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
786 MOVStreamContext *sc2 = (MOVStreamContext *)c->fc->streams[i]->priv_data;
770
34e05913d999 segfault fix
michael
parents: 769
diff changeset
787 if(sc2 && sc2->chunk_offsets){
34e05913d999 segfault fix
michael
parents: 769
diff changeset
788 int64_t first= sc2->chunk_offsets[0];
34e05913d999 segfault fix
michael
parents: 769
diff changeset
789 int64_t last= sc2->chunk_offsets[sc2->chunk_count-1];
34e05913d999 segfault fix
michael
parents: 769
diff changeset
790 if(first >= sc->chunk_offsets[entries-1] || last <= sc->chunk_offsets[0])
34e05913d999 segfault fix
michael
parents: 769
diff changeset
791 c->ni=1;
34e05913d999 segfault fix
michael
parents: 769
diff changeset
792 }
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
793 }
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
794 #ifdef DEBUG
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
795 /*
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
796 for(i=0; i<entries; i++) {
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
797 av_log(NULL, AV_LOG_DEBUG, "chunk offset=0x%Lx\n", sc->chunk_offsets[i]);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
798 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
799 */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
800 #endif
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
801 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
802 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
803
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
804 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
805 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
806 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
807 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
808 int entries, frames_per_sample;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
809 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
810 uint8_t codec_name[32];
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
811
302
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
812 /* for palette traversal */
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
813 int color_depth;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
814 int color_start;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
815 int color_count;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
816 int color_end;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
817 int color_index;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
818 int color_dec;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
819 int color_greyscale;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
820 unsigned char *color_table;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
821 int j;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
822 unsigned char r, g, b;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
823
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
824 print_atom("stsd", atom);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
825
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
826 get_byte(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
827 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
828
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
829 entries = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
830
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
831 while(entries--) { //Parsing Sample description table
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
832 enum CodecID id;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
833 int size = get_be32(pb); /* size */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
834 format = get_le32(pb); /* data format */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
835
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
836 get_be32(pb); /* reserved */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
837 get_be16(pb); /* reserved */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
838 get_be16(pb); /* index */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
839
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
840 /* for MPEG4: set codec type by looking for it */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
841 id = codec_get_id(mov_video_tags, format);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
842 if (id >= 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
843 AVCodec *codec;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
844 codec = avcodec_find_decoder(id);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
845 if (codec)
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
846 st->codec->codec_type = codec->type;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
847 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
848 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
849 av_log(NULL, AV_LOG_DEBUG, "size=%d 4CC= %c%c%c%c codec_type=%d\n",
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
850 size,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
851 (format >> 0) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
852 (format >> 8) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
853 (format >> 16) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
854 (format >> 24) & 0xff,
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
855 st->codec->codec_type);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
856 #endif
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
857 st->codec->codec_tag = format;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
858 if(st->codec->codec_type==CODEC_TYPE_VIDEO) {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
859 MOV_atom_t a = { 0, 0, 0 };
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
860 st->codec->codec_id = id;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
861 get_be16(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
862 get_be16(pb); /* revision level */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
863 get_be32(pb); /* vendor */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
864 get_be32(pb); /* temporal quality */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
865 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
866 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
867 get_be16(pb);
c71d10dfc681 10l (overwriting w/h with 0)
michael
parents: 764
diff changeset
868 get_be16(pb);
c71d10dfc681 10l (overwriting w/h with 0)
michael
parents: 764
diff changeset
869 }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
870 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
871 st->codec->height = get_be16(pb); /* height */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
872 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
873 get_be32(pb); /* horiz resolution */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
874 get_be32(pb); /* vert resolution */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
875 get_be32(pb); /* data size, always 0 */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
876 frames_per_sample = get_be16(pb); /* frames per samples */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
877 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
878 av_log(NULL, AV_LOG_DEBUG, "frames/samples = %d\n", frames_per_sample);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
879 #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
880 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
881 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
882 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
883 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
884 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
885
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
886 st->codec->bits_per_sample = get_be16(pb); /* depth */
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
887 st->codec->color_table_id = get_be16(pb); /* colortable id */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
888
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
889 /* 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
890 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
891 st->codec->time_base.num = 1;
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
892 */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
893 size -= (16+8*4+2+32+2*2);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
894 #if 0
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
895 while (size >= 8) {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
896 MOV_atom_t a;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
897 int64_t start_pos;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
898
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
899 a.size = get_be32(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
900 a.type = get_le32(pb);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
901 size -= 8;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
902 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
903 av_log(NULL, AV_LOG_DEBUG, "VIDEO: atom_type=%c%c%c%c atom.size=%Ld size_left=%d\n",
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
904 (a.type >> 0) & 0xff,
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
905 (a.type >> 8) & 0xff,
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
906 (a.type >> 16) & 0xff,
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
907 (a.type >> 24) & 0xff,
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
908 a.size, size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
909 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
910 start_pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
911
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
912 switch(a.type) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
913 case MKTAG('e', 's', 'd', 's'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
914 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
915 int tag, len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
916 /* Well, broken but suffisant for some MP4 streams */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
917 get_be32(pb); /* version + flags */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
918 len = mov_mp4_read_descr(pb, &tag);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
919 if (tag == 0x03) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
920 /* MP4ESDescrTag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
921 get_be16(pb); /* ID */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
922 get_byte(pb); /* priority */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
923 len = mov_mp4_read_descr(pb, &tag);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
924 if (tag != 0x04)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
925 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
926 /* MP4DecConfigDescrTag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
927 get_byte(pb); /* objectTypeId */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
928 get_be32(pb); /* streamType + buffer size */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
929 get_be32(pb); /* max bit rate */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
930 get_be32(pb); /* avg bit rate */
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
931 len = mov_mp4_read_descr(pb, &tag);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
932 if (tag != 0x05)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
933 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
934 /* MP4DecSpecificDescrTag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
935 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
936 av_log(NULL, AV_LOG_DEBUG, "Specific MPEG4 header len=%d\n", len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
937 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
938 sc->header_data = av_mallocz(len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
939 if (sc->header_data) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
940 get_buffer(pb, sc->header_data, len);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
941 sc->header_len = len;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
942 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
943 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
944 /* in any case, skip garbage */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
945 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
946 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
947 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
948 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
949 }
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
950 fail:
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
951 av_log(NULL, AV_LOG_DEBUG, "ATOMENEWSIZE %Ld %d\n", atom.size, url_ftell(pb) - start_pos);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
952 if (atom.size > 8) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
953 url_fskip(pb, (atom.size - 8) -
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
954 ((url_ftell(pb) - start_pos)));
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
955 size -= atom.size - 8;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
956 }
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
957 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
958 if (size > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
959 /* unknown extension */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
960 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
961 }
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
962 #else
302
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
963
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
964 /* 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
965 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
966 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
967
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
968 /* if the depth is 2, 4, or 8 bpp, file is palettized */
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
969 if ((color_depth == 2) || (color_depth == 4) ||
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
970 (color_depth == 8)) {
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
971
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
972 if (color_greyscale) {
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
973
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
974 /* compute the greyscale palette */
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
975 color_count = 1 << color_depth;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
976 color_index = 255;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
977 color_dec = 256 / (color_count - 1);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
978 for (j = 0; j < color_count; j++) {
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
979 r = g = b = color_index;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
980 c->palette_control.palette[j] =
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
981 (r << 16) | (g << 8) | (b);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
982 color_index -= color_dec;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
983 if (color_index < 0)
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
984 color_index = 0;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
985 }
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
986
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
987 } 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
988
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
989 /* 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
990 color_count = 1 << color_depth;
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
991 if (color_depth == 2)
431
fe91c780d26a prefix global
michael
parents: 428
diff changeset
992 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
993 else if (color_depth == 4)
431
fe91c780d26a prefix global
michael
parents: 428
diff changeset
994 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
995 else
431
fe91c780d26a prefix global
michael
parents: 428
diff changeset
996 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
997
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
998 for (j = 0; j < color_count; j++) {
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
999 r = color_table[j * 4 + 0];
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1000 g = color_table[j * 4 + 1];
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1001 b = color_table[j * 4 + 2];
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1002 c->palette_control.palette[j] =
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1003 (r << 16) | (g << 8) | (b);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1004 }
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1005
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1006 } else {
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1007
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1008 /* load the palette from the file */
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1009 color_start = get_be32(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1010 color_count = get_be16(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1011 color_end = get_be16(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1012 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
1013 /* 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
1014 * 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
1015 * up front */
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1016 get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1017 get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1018 r = get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1019 get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1020 g = get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1021 get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1022 b = get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1023 get_byte(pb);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1024 c->palette_control.palette[j] =
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1025 (r << 16) | (g << 8) | (b);
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1026 }
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1027 }
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1028
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1029 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
1030 st->codec->palctrl->palette_changed = 1;
302
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1031 } 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
1032 st->codec->palctrl = NULL;
302
6949df67922d added palette support to the QT demuxer; registered SMC video decoder
melanson
parents: 301
diff changeset
1033
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1034 a.size = size;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1035 mov_read_default(c, pb, a);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1036 #endif
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1037 } 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
1038 st->codec->codec_id = codec_get_id(mov_audio_tags, format);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1039 if(st->codec->codec_id==CODEC_ID_AMR_NB || st->codec->codec_id==CODEC_ID_AMR_WB) //from TS26.244
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1040 {
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1041 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1042 av_log(NULL, AV_LOG_DEBUG, "AMR-NB or AMR-WB audio identified!!\n");
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1043 #endif
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1044 get_be32(pb);get_be32(pb); //Reserved_8
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1045 get_be16(pb);//Reserved_2
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1046 get_be16(pb);//Reserved_2
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1047 get_be32(pb);//Reserved_4
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1048 get_be16(pb);//TimeScale
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1049 get_be16(pb);//Reserved_2
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1050
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1051 //AMRSpecificBox.(10 bytes)
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 191
diff changeset
1052
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1053 get_be32(pb); //size
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1054 get_be32(pb); //type=='damr'
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1055 get_be32(pb); //vendor
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1056 get_byte(pb); //decoder version
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1057 get_be16(pb); //mode_set
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1058 get_byte(pb); //mode_change_period
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1059 get_byte(pb); //frames_per_sample
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1060
191
efb35207fb1b update duration and start_time
bellard
parents: 157
diff changeset
1061 st->duration = AV_NOPTS_VALUE;//Not possible to get from this info, must count number of AMR frames
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1062 if(st->codec->codec_id==CODEC_ID_AMR_NB)
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 191
diff changeset
1063 {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1064 st->codec->sample_rate=8000;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1065 st->codec->channels=1;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 191
diff changeset
1066 }
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 191
diff changeset
1067 else //AMR-WB
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 191
diff changeset
1068 {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1069 st->codec->sample_rate=16000;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1070 st->codec->channels=1;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 191
diff changeset
1071 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1072 st->codec->bits_per_sample=16;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1073 st->codec->bit_rate=0; /*It is not possible to tell this before we have
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1074 an audio frame and even then every frame can be different*/
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1075 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1076 else if( st->codec->codec_tag == MKTAG( 'm', 'p', '4', 's' ))
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1077 {
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1078 //This is some stuff for the hint track, lets ignore it!
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1079 //Do some mp4 auto detect.
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1080 c->mp4=1;
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1081 size-=(16);
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1082 url_fskip(pb, size); /* The mp4s atom also contians a esds atom that we can skip*/
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1083 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1084 else if( st->codec->codec_tag == MKTAG( 'm', 'p', '4', 'a' ))
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
1085 {
690
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1086 MOV_atom_t a;
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1087 int mp4_version;
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1088
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
1089 /* Handle mp4 audio tag */
690
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1090 mp4_version=get_be16(pb);/*version*/
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1091 get_be16(pb); /*revesion*/
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
1092 get_be32(pb);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1093 st->codec->channels = get_be16(pb); /* channels */
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1094 st->codec->bits_per_sample = get_be16(pb); /* bits per sample */
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
1095 get_be32(pb);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1096 st->codec->sample_rate = get_be16(pb); /* sample rate, not always correct */
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
1097 if(st->codec->sample_rate == 1) //nonsese rate? -> ignore
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
1098 st->codec->sample_rate= 0;
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
1099
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
1100 get_be16(pb);
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
1101 c->mp4=1;
690
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1102
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1103 if(mp4_version==1)
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1104 {
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1105 url_fskip(pb,16);
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1106 a.size=size-(16+20+16);
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1107 }
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1108 else
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1109 a.size=size-(16+20);
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1110
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1111 a.offset=url_ftell(pb);
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1112
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
1113 mov_read_default(c, pb, a);
690
fec605ce7d4a mp4a fix based on some code by (Song.Itany inventec-inc com)
michael
parents: 683
diff changeset
1114
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
1115 /* Get correct sample rate from extradata */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1116 if(st->codec->extradata_size) {
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
1117 const int samplerate_table[] = {
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
1118 96000, 88200, 64000, 48000, 44100, 32000,
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
1119 24000, 22050, 16000, 12000, 11025, 8000,
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
1120 7350, 0, 0, 0
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
1121 };
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1122 unsigned char *px = st->codec->extradata;
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
1123 // 5 bits objectTypeIndex, 4 bits sampleRateIndex, 4 bits channels
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
1124 int samplerate_index = ((px[0] & 7) << 1) + ((px[1] >> 7) & 1);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1125 st->codec->sample_rate = samplerate_table[samplerate_index];
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1126 st->codec->channels = (px[1] >> 3) & 15;
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
1127 }
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
1128 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1129 else if( st->codec->codec_tag == MKTAG( 'a', 'l', 'a', 'c' ))
691
28af25a9a897 first pass at ALAC decoder from David Hammerton; while David's original
melanson
parents: 690
diff changeset
1130 {
28af25a9a897 first pass at ALAC decoder from David Hammerton; while David's original
melanson
parents: 690
diff changeset
1131 /* Handle alac audio tag + special extradata */
28af25a9a897 first pass at ALAC decoder from David Hammerton; while David's original
melanson
parents: 690
diff changeset
1132 get_be32(pb); /* version */
28af25a9a897 first pass at ALAC decoder from David Hammerton; while David's original
melanson
parents: 690
diff changeset
1133 get_be32(pb);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1134 st->codec->channels = get_be16(pb); /* channels */
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1135 st->codec->bits_per_sample = get_be16(pb); /* bits per sample */
691
28af25a9a897 first pass at ALAC decoder from David Hammerton; while David's original
melanson
parents: 690
diff changeset
1136 get_be32(pb);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1137 st->codec->sample_rate = get_be16(pb);
691
28af25a9a897 first pass at ALAC decoder from David Hammerton; while David's original
melanson
parents: 690
diff changeset
1138 get_be16(pb);
28af25a9a897 first pass at ALAC decoder from David Hammerton; while David's original
melanson
parents: 690
diff changeset
1139
28af25a9a897 first pass at ALAC decoder from David Hammerton; while David's original
melanson
parents: 690
diff changeset
1140 /* fetch the 36-byte extradata needed for alac decoding */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1141 st->codec->extradata_size = 36;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1142 st->codec->extradata = (uint8_t*)
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1143 av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1144 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
691
28af25a9a897 first pass at ALAC decoder from David Hammerton; while David's original
melanson
parents: 690
diff changeset
1145 }
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1146 else if(size>=(16+20))
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1147 {//16 bytes read, reading atleast 20 more
641
4f45848cc1ec get debug code to compile again.
mmu_man
parents: 640
diff changeset
1148 uint16_t version;
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1149 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1150 av_log(NULL, AV_LOG_DEBUG, "audio size=0x%X\n",size);
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1151 #endif
641
4f45848cc1ec get debug code to compile again.
mmu_man
parents: 640
diff changeset
1152 version = get_be16(pb); /* version */
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1153 get_be16(pb); /* revision level */
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1154 get_be32(pb); /* vendor */
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1155
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1156 st->codec->channels = get_be16(pb); /* channel count */
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1157 st->codec->bits_per_sample = get_be16(pb); /* sample size */
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1158
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1159 /* handle specific s8 codec */
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1160 get_be16(pb); /* compression id = 0*/
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1161 get_be16(pb); /* packet size = 0 */
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1162
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1163 st->codec->sample_rate = ((get_be32(pb) >> 16));
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1164 //av_log(NULL, AV_LOG_DEBUG, "CODECID %d %d %.4s\n", st->codec->codec_id, CODEC_ID_PCM_S16BE, (char*)&format);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1165
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1166 switch (st->codec->codec_id) {
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1167 case CODEC_ID_PCM_S16BE:
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1168 if (st->codec->bits_per_sample == 8)
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1169 st->codec->codec_id = CODEC_ID_PCM_S8;
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1170 /* fall */
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1171 case CODEC_ID_PCM_U8:
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1172 st->codec->bit_rate = st->codec->sample_rate * 8;
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1173 break;
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1174 default:
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1175 ;
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1176 }
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1177
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1178 //Read QT version 1 fields. In version 0 theese dont exist
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1179 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1180 av_log(NULL, AV_LOG_DEBUG, "version =%d mp4=%d\n",version,c->mp4);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1181 av_log(NULL, AV_LOG_DEBUG, "size-(16+20+16)=%d\n",size-(16+20+16));
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1182 #endif
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1183 if((version==1) && size>=(16+20+16))
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1184 {
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1185 get_be32(pb); /* samples per packet */
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1186 get_be32(pb); /* bytes per packet */
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1187 get_be32(pb); /* bytes per frame */
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1188 get_be32(pb); /* bytes per sample */
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1189 if(size>(16+20+16))
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1190 {
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1191 //Optional, additional atom-based fields
641
4f45848cc1ec get debug code to compile again.
mmu_man
parents: 640
diff changeset
1192 MOV_atom_t a = { format, url_ftell(pb), size - (16 + 20 + 16 + 8) };
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1193 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1194 av_log(NULL, AV_LOG_DEBUG, "offest=0x%X, sizeleft=%d=0x%x,format=%c%c%c%c\n",(int)url_ftell(pb),size - (16 + 20 + 16 ),size - (16 + 20 + 16 ),
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1195 (format >> 0) & 0xff,
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1196 (format >> 8) & 0xff,
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1197 (format >> 16) & 0xff,
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1198 (format >> 24) & 0xff);
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1199 #endif
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1200 mov_read_default(c, pb, a);
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1201 }
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1202 }
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1203 else
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1204 {
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1205 //We should be down to 0 bytes here, but lets make sure.
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1206 size-=(16+20);
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1207 #ifdef DEBUG
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1208 if(size>0)
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1209 av_log(NULL, AV_LOG_DEBUG, "skipping 0x%X bytes\n",size-(16+20));
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1210 #endif
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1211 url_fskip(pb, size);
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1212 }
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1213 }
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1214 else
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1215 {
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1216 size-=16;
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1217 //Unknown size, but lets do our best and skip the rest.
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1218 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1219 av_log(NULL, AV_LOG_DEBUG, "Strange size, skipping 0x%X bytes\n",size);
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1220 #endif
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1221 url_fskip(pb, size);
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1222 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1223 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1224 }
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
1225
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
1226 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
1227 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
1228 }
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1229
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1230 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1231 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1232
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1233 static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1234 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1235 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1236 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1237 unsigned int i, entries;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1238
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1239 print_atom("stsc", atom);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1240
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1241 get_byte(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1242 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1243
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1244 entries = get_be32(pb);
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1245
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1246 if(entries >= UINT_MAX / sizeof(MOV_sample_to_chunk_tbl))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1247 return -1;
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1248
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1249 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1250 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
1251 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1252 sc->sample_to_chunk_sz = entries;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1253 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
1254 if (!sc->sample_to_chunk)
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1255 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1256 for(i=0; i<entries; i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1257 sc->sample_to_chunk[i].first = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1258 sc->sample_to_chunk[i].count = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1259 sc->sample_to_chunk[i].id = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1260 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1261 /* av_log(NULL, AV_LOG_DEBUG, "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); */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1262 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1263 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1264 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1265 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1266
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
1267 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
1268 {
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
1269 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
1270 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1271 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
1272
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
1273 print_atom("stss", 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
1274
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
1275 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
1276 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
1277
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
1278 entries = get_be32(pb);
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1279
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1280 if(entries >= UINT_MAX / sizeof(long))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1281 return -1;
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1282
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
1283 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
1284 #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
1285 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
1286 #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
1287 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
1288 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
1289 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
1290 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
1291 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
1292 #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
1293 /* 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
1294 #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
1295 }
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
1296 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
1297 }
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
1298
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1299 static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1300 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1301 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1302 MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1303 unsigned int i, entries;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1304
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1305 print_atom("stsz", atom);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1306
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1307 get_byte(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1308 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1309
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1310 sc->sample_size = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1311 entries = get_be32(pb);
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1312 if(entries >= UINT_MAX / sizeof(long))
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1313 return -1;
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1314
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1315 sc->sample_count = entries;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1316 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1317 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
1318 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1319 if(sc->sample_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1320 return 0; /* there isn't any table following */
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1321 sc->sample_sizes = (long*) av_malloc(entries * sizeof(long));
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1322 if (!sc->sample_sizes)
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1323 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1324 for(i=0; i<entries; i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1325 sc->sample_sizes[i] = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1326 #ifdef DEBUG
653
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1327 av_log(NULL, AV_LOG_DEBUG, "sample_sizes[]=%ld\n", sc->sample_sizes[i]);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1328 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1329 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1330 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1331 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1332
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1333 static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1334 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1335 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
131
5bb5f3d201d6 * uninitialized/unused vars cleanup
kabi
parents: 130
diff changeset
1336 //MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1337 unsigned int i, entries;
395
c1ed10f3b052 cleanup frame_rate code, this may also fix some large file bugs
michael
parents: 383
diff changeset
1338 int64_t duration=0;
c1ed10f3b052 cleanup frame_rate code, this may also fix some large file bugs
michael
parents: 383
diff changeset
1339 int64_t total_sample_count=0;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1340
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1341 print_atom("stts", atom);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1342
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1343 get_byte(pb); /* version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1344 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1345 entries = get_be32(pb);
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1346 if(entries >= UINT_MAX / sizeof(Time2Sample))
639
0b52743104ac integer overflows, heap corruption
michael
parents: 615
diff changeset
1347 return -1;
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1348
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1349 c->streams[c->fc->nb_streams-1]->stts_count = entries;
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1350 c->streams[c->fc->nb_streams-1]->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
1351
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1352 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1353 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
1354 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1355 for(i=0; i<entries; i++) {
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1356 int sample_duration;
856b151f926a cleanup
michael
parents: 660
diff changeset
1357 int sample_count;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1358
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1359 sample_count=get_be32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1360 sample_duration = get_be32(pb);
670
856b151f926a cleanup
michael
parents: 660
diff changeset
1361 c->streams[c->fc->nb_streams - 1]->stts_data[i].count= sample_count;
856b151f926a cleanup
michael
parents: 660
diff changeset
1362 c->streams[c->fc->nb_streams - 1]->stts_data[i].duration= sample_duration;
794
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
1363
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1364 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1365 av_log(NULL, AV_LOG_DEBUG, "sample_count=%d, sample_duration=%d\n",sample_count,sample_duration);
134
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1366 #endif
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1367 duration+=sample_duration*sample_count;
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1368 total_sample_count+=sample_count;
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1369 }
5cda954c6e9a AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents: 133
diff changeset
1370
794
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
1371 st->nb_frames= total_sample_count;
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
1372 if(duration)
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
1373 st->duration= duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1374 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1375 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1376
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1377 static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1378 {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1379 // AVStream *st = c->fc->streams[c->fc->nb_streams-1];
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1380 //MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1381 unsigned int i, entries;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1382
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1383 print_atom("ctts", atom);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1384
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1385 get_byte(pb); /* version */
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1386 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1387 entries = get_be32(pb);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1388 if(entries >= UINT_MAX / sizeof(Time2Sample))
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1389 return -1;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1390
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1391 c->streams[c->fc->nb_streams-1]->ctts_count = entries;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1392 c->streams[c->fc->nb_streams-1]->ctts_data = av_malloc(entries * sizeof(Time2Sample));
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1393
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1394 // #ifdef DEBUG
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1395 av_log(NULL, AV_LOG_DEBUG, "track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1396 // #endif
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1397 for(i=0; i<entries; i++) {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1398 c->streams[c->fc->nb_streams - 1]->ctts_data[i].count= get_be32(pb);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1399 c->streams[c->fc->nb_streams - 1]->ctts_data[i].duration= get_be32(pb);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1400 }
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1401 return 0;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1402 }
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1403
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1404 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
1405 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1406 AVStream *st;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1407 MOVStreamContext *sc;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1408
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1409 print_atom("trak", atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1410
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1411 st = av_new_stream(c->fc, c->fc->nb_streams);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1412 if (!st) return -2;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1413 sc = (MOVStreamContext*) av_mallocz(sizeof(MOVStreamContext));
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1414 if (!sc) {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1415 av_free(st);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1416 return -1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1417 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1418
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1419 sc->sample_to_chunk_index = -1;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1420 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
1421 st->codec->codec_type = CODEC_TYPE_MOV_OTHER;
191
efb35207fb1b update duration and start_time
bellard
parents: 157
diff changeset
1422 st->start_time = 0; /* XXX: check */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1423 c->streams[c->fc->nb_streams-1] = sc;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1424
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1425 return mov_read_default(c, pb, atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1426 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1427
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1428 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
1429 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1430 AVStream *st;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1431
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1432 print_atom("tkhd", atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1433
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1434 st = c->fc->streams[c->fc->nb_streams-1];
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1435
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1436 get_byte(pb); /* version */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1437
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1438 get_byte(pb); get_byte(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1439 get_byte(pb); /* flags */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1440 /*
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1441 MOV_TRACK_ENABLED 0x0001
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1442 MOV_TRACK_IN_MOVIE 0x0002
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1443 MOV_TRACK_IN_PREVIEW 0x0004
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1444 MOV_TRACK_IN_POSTER 0x0008
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1445 */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1446
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1447 get_be32(pb); /* creation time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1448 get_be32(pb); /* modification time */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1449 st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1450 get_be32(pb); /* reserved */
191
efb35207fb1b update duration and start_time
bellard
parents: 157
diff changeset
1451 st->start_time = 0; /* check */
794
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
1452 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
1453 get_be32(pb); /* reserved */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1454 get_be32(pb); /* reserved */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1455
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1456 get_be16(pb); /* layer */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1457 get_be16(pb); /* alternate group */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1458 get_be16(pb); /* volume */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1459 get_be16(pb); /* reserved */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1460
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1461 url_fskip(pb, 36); /* display matrix */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1462
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1463 /* 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
1464 /*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
1465 /*st->codec->height =*/ get_be32(pb) >> 16; /* track height */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1466
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1467 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1468 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1469
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1470 /* 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
1471 /* 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
1472 /* http://graphics.tudelft.nl/~wouter/publications/soundtests/ */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1473 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
1474 {
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1475 int err;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1476
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1477 #ifdef DEBUG
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1478 print_atom("wide", atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1479 debug_indent++;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1480 #endif
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1481 if (atom.size < 8)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1482 return 0; /* continue */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1483 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
1484 url_fskip(pb, atom.size - 4);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1485 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1486 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1487 atom.type = get_le32(pb);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1488 atom.offset += 8;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1489 atom.size -= 8;
131
5bb5f3d201d6 * uninitialized/unused vars cleanup
kabi
parents: 130
diff changeset
1490 if (atom.type != MKTAG('m', 'd', 'a', 't')) {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1491 url_fskip(pb, atom.size);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1492 return 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1493 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1494 err = mov_read_mdat(c, pb, atom);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1495 #ifdef DEBUG
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1496 debug_indent--;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1497 #endif
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1498 return err;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1499 }
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1500
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1501
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1502 #ifdef CONFIG_ZLIB
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 25
diff changeset
1503 static int null_read_packet(void *opaque, uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1504 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1505 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1506 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1507
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1508 static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1509 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1510 ByteIOContext ctx;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1511 uint8_t *cmov_data;
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1512 uint8_t *moov_data; /* uncompressed data */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1513 long cmov_len, moov_len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1514 int ret;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1515
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1516 print_atom("cmov", atom);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1517
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1518 get_be32(pb); /* dcom atom */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1519 if (get_le32(pb) != MKTAG( 'd', 'c', 'o', 'm' ))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1520 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1521 if (get_le32(pb) != MKTAG( 'z', 'l', 'i', 'b' )) {
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1522 av_log(NULL, AV_LOG_DEBUG, "unknown compression for cmov atom !");
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1523 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1524 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1525 get_be32(pb); /* cmvd atom */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1526 if (get_le32(pb) != MKTAG( 'c', 'm', 'v', 'd' ))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1527 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1528 moov_len = get_be32(pb); /* uncompressed size */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1529 cmov_len = atom.size - 6 * 4;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1530
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1531 cmov_data = (uint8_t *) av_malloc(cmov_len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1532 if (!cmov_data)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1533 return -1;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1534 moov_data = (uint8_t *) av_malloc(moov_len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1535 if (!moov_data) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1536 av_free(cmov_data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1537 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1538 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1539 get_buffer(pb, cmov_data, cmov_len);
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1540 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
1541 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1542 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
1543 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1544 ctx.buf_end = ctx.buffer + moov_len;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1545 atom.type = MKTAG( 'm', 'o', 'o', 'v' );
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1546 atom.offset = 0;
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1547 atom.size = moov_len;
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
1548 #ifdef DEBUG
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
1549 { int fd = open("/tmp/uncompheader.mov", O_WRONLY | O_CREAT); write(fd, moov_data, moov_len); close(fd); }
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
1550 #endif
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1551 ret = mov_read_default(c, &ctx, atom);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1552 av_free(moov_data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1553 av_free(cmov_data);
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
1554
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1555 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1556 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1557 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1558
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1559 /* edit list atom */
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1560 static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1561 {
500
4070a7d58d2c mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents: 499
diff changeset
1562 int i, edit_count;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1563 print_atom("elst", atom);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1564
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1565 get_byte(pb); /* version */
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1566 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
1567 edit_count= c->streams[c->fc->nb_streams-1]->edit_count = get_be32(pb); /* entries */
4070a7d58d2c mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents: 499
diff changeset
1568
4070a7d58d2c mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
michael
parents: 499
diff changeset
1569 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
1570 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
1571 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
1572 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
1573 }
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1574 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1575 av_log(NULL, AV_LOG_DEBUG, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->edit_count);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1576 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1577 return 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1578 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1579
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1580 static const MOVParseTableEntry mov_default_parse_table[] = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1581 /* mp4 atoms */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1582 { MKTAG( 'c', 'o', '6', '4' ), mov_read_stco },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1583 { MKTAG( 'c', 'p', 'r', 't' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1584 { MKTAG( 'c', 'r', 'h', 'd' ), mov_read_default },
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1585 { 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
1586 { MKTAG( 'd', 'i', 'n', 'f' ), mov_read_default }, /* data information */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1587 { MKTAG( 'd', 'p', 'n', 'd' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1588 { MKTAG( 'd', 'r', 'e', 'f' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1589 { 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
1590 { MKTAG( 'e', 'l', 's', 't' ), mov_read_elst },
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1591 { MKTAG( 'f', 'r', 'e', 'e' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1592 { MKTAG( 'h', 'd', 'l', 'r' ), mov_read_hdlr },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1593 { MKTAG( 'h', 'i', 'n', 't' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1594 { MKTAG( 'h', 'm', 'h', 'd' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1595 { MKTAG( 'i', 'o', 'd', 's' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1596 { MKTAG( 'm', 'd', 'a', 't' ), mov_read_mdat },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1597 { MKTAG( 'm', 'd', 'h', 'd' ), mov_read_mdhd },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1598 { MKTAG( 'm', 'd', 'i', 'a' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1599 { MKTAG( 'm', 'i', 'n', 'f' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1600 { MKTAG( 'm', 'o', 'o', 'v' ), mov_read_moov },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1601 { MKTAG( 'm', 'p', '4', 'a' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1602 { MKTAG( 'm', 'p', '4', 's' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1603 { MKTAG( 'm', 'p', '4', 'v' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1604 { MKTAG( 'm', 'p', 'o', 'd' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1605 { MKTAG( 'm', 'v', 'h', 'd' ), mov_read_mvhd },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1606 { MKTAG( 'n', 'm', 'h', 'd' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1607 { MKTAG( 'o', 'd', 'h', 'd' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1608 { 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
1609 { MKTAG( 's', 'k', 'i', 'p' ), mov_read_leaf },
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1610 { 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
1611 { MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorenson extension ??? */
adc5295cd0a2 load the 'avcC' atom needed for 'avc1' decoding
melanson
parents: 587
diff changeset
1612 { MKTAG( 'a', 'v', 'c', 'C' ), mov_read_avcC },
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1613 { MKTAG( 's', 't', 'b', 'l' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1614 { MKTAG( 's', 't', 'c', 'o' ), mov_read_stco },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1615 { MKTAG( 's', 't', 'd', 'p' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1616 { MKTAG( 's', 't', 's', 'c' ), mov_read_stsc },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1617 { MKTAG( 's', 't', 's', 'd' ), mov_read_stsd }, /* sample description */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1618 { 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
1619 { 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
1620 { MKTAG( 's', 't', 's', 'z' ), mov_read_stsz }, /* sample size */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1621 { MKTAG( 's', 't', 't', 's' ), mov_read_stts },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1622 { MKTAG( 't', 'k', 'h', 'd' ), mov_read_tkhd }, /* track header */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1623 { MKTAG( 't', 'r', 'a', 'k' ), mov_read_trak },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1624 { MKTAG( 't', 'r', 'e', 'f' ), mov_read_default }, /* not really */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1625 { MKTAG( 'u', 'd', 't', 'a' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1626 { MKTAG( 'u', 'r', 'l', ' ' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1627 { MKTAG( 'u', 'r', 'n', ' ' ), mov_read_leaf },
695
645c4432947b uuid patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 691
diff changeset
1628 { MKTAG( 'u', 'u', 'i', 'd' ), mov_read_leaf },
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1629 { MKTAG( 'v', 'm', 'h', 'd' ), mov_read_leaf }, /* video media info header */
865
1646098f8e26 QDM2 compatible decoder
rtognimp
parents: 852
diff changeset
1630 { MKTAG( 'w', 'a', 'v', 'e' ), mov_read_wave },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1631 /* extra mp4 */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1632 { MKTAG( 'M', 'D', 'E', 'S' ), mov_read_leaf },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1633 /* QT atoms */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1634 { MKTAG( 'c', 'h', 'a', 'p' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1635 { MKTAG( 'c', 'l', 'i', 'p' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1636 { MKTAG( 'c', 'r', 'g', 'n' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1637 { MKTAG( 'c', 't', 'a', 'b' ), mov_read_ctab },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1638 { MKTAG( 'e', 's', 'd', 's' ), mov_read_esds },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1639 { MKTAG( 'k', 'm', 'a', 't' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1640 { MKTAG( 'm', 'a', 't', 't' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1641 { MKTAG( 'r', 'd', 'r', 'f' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1642 { MKTAG( 'r', 'm', 'd', 'a' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1643 { MKTAG( 'r', 'm', 'd', 'r' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1644 { MKTAG( 'r', 'm', 'r', 'a' ), mov_read_default },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1645 { MKTAG( 's', 'c', 'p', 't' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1646 { MKTAG( 's', 's', 'r', 'c' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1647 { MKTAG( 's', 'y', 'n', 'c' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1648 { MKTAG( 't', 'c', 'm', 'd' ), mov_read_leaf },
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1649 { MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1650 //{ MKTAG( 'r', 'm', 'q', 'u' ), mov_read_leaf },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1651 #ifdef CONFIG_ZLIB
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1652 { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_cmov },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1653 #else
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1654 { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_leaf },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1655 #endif
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1656 { 0L, mov_read_leaf }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1657 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1658
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1659 static void mov_free_stream_context(MOVStreamContext *sc)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1660 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1661 if(sc) {
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1662 av_freep(&sc->chunk_offsets);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1663 av_freep(&sc->sample_to_chunk);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1664 av_freep(&sc->sample_sizes);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1665 av_freep(&sc->keyframes);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1666 av_freep(&sc->stts_data);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1667 av_freep(&sc->ctts_data);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
1668 av_freep(&sc);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1669 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1670 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1671
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1672 static inline uint32_t mov_to_tag(uint8_t *buf)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1673 {
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1674 return MKTAG(buf[0], buf[1], buf[2], buf[3]);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1675 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1676
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1677 static inline uint32_t to_be32(uint8_t *buf)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1678 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1679 return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1680 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1681
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1682 /* XXX: is it sufficient ? */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1683 static int mov_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1684 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1685 unsigned int offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1686 uint32_t tag;
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1687 int score = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1688
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1689 /* check file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1690 if (p->buf_size <= 12)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1691 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1692 offset = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1693 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1694 /* ignore invalid offset */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1695 if ((offset + 8) > (unsigned int)p->buf_size)
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1696 return score;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1697 tag = mov_to_tag(p->buf + offset + 4);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1698 switch(tag) {
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1699 /* check for obvious tags */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1700 case MKTAG( 'm', 'o', 'o', 'v' ):
24
215c0f0f916e Fix probing for some files (ew.mov, april.mov)
mmu_man
parents: 0
diff changeset
1701 case MKTAG( 'm', 'd', 'a', 't' ):
215c0f0f916e Fix probing for some files (ew.mov, april.mov)
mmu_man
parents: 0
diff changeset
1702 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
1703 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
1704 return AVPROBE_SCORE_MAX;
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1705 /* 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
1706 case MKTAG( 'w', 'i', 'd', 'e' ):
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1707 case MKTAG( 'f', 'r', 'e', 'e' ):
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1708 case MKTAG( 'j', 'u', 'n', 'k' ):
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1709 case MKTAG( 'p', 'i', 'c', 't' ):
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1710 return AVPROBE_SCORE_MAX - 5;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1711 case MKTAG( 'f', 't', 'y', 'p' ):
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1712 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
1713 case MKTAG( 'u', 'u', 'i', 'd' ):
147
2f924727fd96 * missing part of the 3gp patch by Johannes Carlsson
kabi
parents: 146
diff changeset
1714 offset = to_be32(p->buf+offset) + offset;
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1715 /* 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
1716 score = AVPROBE_SCORE_MAX - 50;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1717 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1718 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1719 /* unrecognized tag */
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1720 return score;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1721 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1722 }
658
0624def73c76 probe for 'junk' and 'pict', changed the scores.
mmu_man
parents: 657
diff changeset
1723 return score;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1724 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1725
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1726 static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1727 {
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1728 MOVContext *mov = (MOVContext *) s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1729 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1730 int i, j, nb, err;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1731 MOV_atom_t atom = { 0, 0, 0 };
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1732
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1733 mov->fc = s;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1734 mov->parse_table = mov_default_parse_table;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1735 #if 0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1736 /* XXX: I think we should auto detect */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1737 if(s->iformat->name[1] == 'p')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1738 mov->mp4 = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1739 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1740 if(!url_is_streamed(pb)) /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */
764
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 743
diff changeset
1741 atom.size = url_fsize(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1742 else
132
9ca36221ae23 * passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
kabi
parents: 131
diff changeset
1743 atom.size = 0x7FFFFFFFFFFFFFFFLL;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1744
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1745 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1746 av_log(NULL, AV_LOG_DEBUG, "filesz=%Ld\n", atom.size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1747 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1748
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1749 /* check MOV header */
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1750 err = mov_read_default(mov, pb, atom);
133
31f0dda651f8 * added s263 (mapped to h263 - 3gp files)
kabi
parents: 132
diff changeset
1751 if (err<0 || (!mov->found_moov && !mov->found_mdat)) {
370
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 358
diff changeset
1752 av_log(s, AV_LOG_ERROR, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%lld\n",
133
31f0dda651f8 * added s263 (mapped to h263 - 3gp files)
kabi
parents: 132
diff changeset
1753 err, mov->found_moov, mov->found_mdat, url_ftell(pb));
31f0dda651f8 * added s263 (mapped to h263 - 3gp files)
kabi
parents: 132
diff changeset
1754 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1755 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1756 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1757 av_log(NULL, AV_LOG_DEBUG, "on_parse_exit_offset=%d\n", (int) url_ftell(pb));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1758 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1759 /* some cleanup : make sure we are on the mdat atom */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1760 if(!url_is_streamed(pb) && (url_ftell(pb) != mov->mdat_offset))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1761 url_fseek(pb, mov->mdat_offset, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1762
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1763 mov->next_chunk_offset = mov->mdat_offset; /* initialise reading */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1764
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1765 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1766 av_log(NULL, AV_LOG_DEBUG, "mdat_reset_offset=%d\n", (int) url_ftell(pb));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1767 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1768
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1769 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1770 av_log(NULL, AV_LOG_DEBUG, "streams= %d\n", s->nb_streams);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1771 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1772 mov->total_streams = nb = s->nb_streams;
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
1773
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1774 #if 1
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1775 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
1776 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
1777 av_free(s->streams[i]);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1778 for(j=i+1; j<s->nb_streams; j++)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1779 s->streams[j-1] = s->streams[j];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1780 s->nb_streams--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1781 } else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1782 i++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1783 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1784 for(i=0; i<s->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1785 MOVStreamContext *sc;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1786 sc = (MOVStreamContext *)s->streams[i]->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1787 sc->ffindex = i;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1788 sc->is_ff_stream = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1789 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1790 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1791 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1792 av_log(NULL, AV_LOG_DEBUG, "real streams= %d\n", s->nb_streams);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1793 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1794 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1795 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1796
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1797 /* Yes, this is ugly... I didn't write the specs of QT :p */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1798 /* XXX:remove useless commented code sometime */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1799 static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1800 {
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
1801 MOVContext *mov = (MOVContext *) s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1802 MOVStreamContext *sc;
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1803 int64_t offset = INT64_MAX;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1804 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
1805 int i, a, b, m;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1806 int size;
640
6f3a6774df82 handle fixed sample_size patch by Roine Gustafsson <roine AT users.sourceforge.net>
mmu_man
parents: 639
diff changeset
1807 int idx;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1808 size = 0x0FFFFFFF;
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1809
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1810 #ifdef MOV_SPLIT_CHUNKS
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1811 if (mov->partial) {
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1812 sc = mov->partial;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1813 idx = sc->sample_to_chunk_index;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1814
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1815 if (idx < 0) return 0;
653
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1816 #ifdef DEBUG
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1817 fprintf(stderr, "sc[ffid %d]->sample_size = %d\n", sc->ffindex, sc->sample_size);
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1818 #endif
723
3a9f7fb4e7bb reverting 1.66 -> 1.67 change
michael
parents: 712
diff changeset
1819 //size = sc->sample_sizes[sc->current_sample];
3a9f7fb4e7bb reverting 1.66 -> 1.67 change
michael
parents: 712
diff changeset
1820 // that ain't working...
3a9f7fb4e7bb reverting 1.66 -> 1.67 change
michael
parents: 712
diff changeset
1821 //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
1822 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
1823
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1824 sc->current_sample++;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1825 sc->left_in_chunk--;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1826
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1827 if (sc->left_in_chunk <= 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1828 mov->partial = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1829 offset = mov->next_chunk_offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1830 /* extract the sample */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1831
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1832 goto readchunk;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1833 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1834 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1835
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1836 again:
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1837 sc = 0;
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1838 if(offset == INT64_MAX)
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1839 best_dts= INT64_MAX;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1840 for(i=0; i<mov->total_streams; i++) {
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1841 MOVStreamContext *msc = mov->streams[i];
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1842
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1843 if ((msc->next_chunk < msc->chunk_count) && msc->next_chunk >= 0){
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1844 if (msc->sample_to_time_index < msc->stts_count && mov->ni) {
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1845 int64_t dts;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1846 int index= msc->sample_to_time_index;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1847 int sample= msc->sample_to_time_sample;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1848 int time= msc->sample_to_time_time;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1849 int duration = msc->stts_data[index].duration;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1850 int count = msc->stts_data[index].count;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1851 if (sample + count < msc->current_sample) {
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1852 sample += count;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1853 time += count*duration;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1854 index ++;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1855 duration = msc->stts_data[index].duration;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1856 }
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1857 dts = time + (msc->current_sample-1 - sample) * (int64_t)duration;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1858 dts = av_rescale(dts, AV_TIME_BASE, msc->time_scale);
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1859 // av_log(NULL, AV_LOG_DEBUG, "%d %Ld %Ld %Ld \n", i, dts, best_dts, offset);
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1860 if(dts < best_dts){
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1861 best_dts= dts;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1862 sc = msc;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1863 offset = msc->chunk_offsets[msc->next_chunk];
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1864 }
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1865 }else{
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1866 //av_log(NULL, AV_LOG_DEBUG, "MOCHUNK %ld %d %p pos:%Ld\n", mov->streams[i]->next_chunk, mov->total_streams, mov->streams[i], url_ftell(&s->pb));
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1867 if ((msc->chunk_offsets[msc->next_chunk] < offset)) {
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1868 sc = msc;
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1869 offset = msc->chunk_offsets[msc->next_chunk];
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1870 //av_log(NULL, AV_LOG_DEBUG, "SELETED %Ld i:%d\n", offset, i);
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1871 }
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1872 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1873 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1874 }
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1875 if (!sc || offset==INT64_MAX)
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1876 return -1;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1877
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1878 sc->next_chunk++;
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1879
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1880 if(mov->next_chunk_offset < offset) { /* some meta data */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1881 url_fskip(&s->pb, (offset - mov->next_chunk_offset));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1882 mov->next_chunk_offset = offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1883 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1884
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1885 //av_log(NULL, AV_LOG_DEBUG, "chunk: [%i] %lli -> %lli\n", st_id, mov->next_chunk_offset, offset);
708
d79164865a7c more fine grained discarding of packets
michael
parents: 697
diff changeset
1886 if(!sc->is_ff_stream || (s->streams[sc->ffindex]->discard >= AVDISCARD_ALL)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1887 url_fskip(&s->pb, (offset - mov->next_chunk_offset));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1888 mov->next_chunk_offset = offset;
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1889 offset = INT64_MAX;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1890 goto again;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1891 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1892
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1893 /* now get the chunk size... */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1894
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1895 for(i=0; i<mov->total_streams; i++) {
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1896 MOVStreamContext *msc = mov->streams[i];
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1897 if ((msc->next_chunk < msc->chunk_count)
769
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1898 && msc->chunk_offsets[msc->next_chunk] - offset < size
23570fc45b40 support non interleaved mov files
michael
parents: 768
diff changeset
1899 && msc->chunk_offsets[msc->next_chunk] > offset)
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1900 size = msc->chunk_offsets[msc->next_chunk] - offset;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1901 }
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1902
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1903 #ifdef MOV_MINOLTA_FIX
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1904 //Make sure that size is according to sample_size (Needed by .mov files
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1905 //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
1906 //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
1907 //but I have no such movies
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1908 if (sc->sample_size > 0) {
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1909 int foundsize=0;
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1910 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
1911 if( (sc->sample_to_chunk[i].first)<=(sc->next_chunk) )
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1912 {
401
42cc78ece67f * .mov files with uncompressed audio can't be correctly processed
romansh
parents: 395
diff changeset
1913 // I can't figure out why for PCM audio sample_size is always 1
42cc78ece67f * .mov files with uncompressed audio can't be correctly processed
romansh
parents: 395
diff changeset
1914 // (it should actually be channels*bits_per_second/8) but it is.
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 805
diff changeset
1915 AVCodecContext* cod = s->streams[sc->ffindex]->codec;
401
42cc78ece67f * .mov files with uncompressed audio can't be correctly processed
romansh
parents: 395
diff changeset
1916 if (sc->sample_size == 1 && (cod->codec_id == CODEC_ID_PCM_S16BE || cod->codec_id == CODEC_ID_PCM_S16LE))
42cc78ece67f * .mov files with uncompressed audio can't be correctly processed
romansh
parents: 395
diff changeset
1917 foundsize=(sc->sample_to_chunk[i].count*cod->channels*cod->bits_per_sample)/8;
42cc78ece67f * .mov files with uncompressed audio can't be correctly processed
romansh
parents: 395
diff changeset
1918 else
42cc78ece67f * .mov files with uncompressed audio can't be correctly processed
romansh
parents: 395
diff changeset
1919 foundsize=sc->sample_to_chunk[i].count*sc->sample_size;
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1920 }
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1921 #ifdef DEBUG
641
4f45848cc1ec get debug code to compile again.
mmu_man
parents: 640
diff changeset
1922 av_log(NULL, AV_LOG_DEBUG, "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
1923 #endif
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1924 }
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1925 if( (foundsize>0) && (foundsize<size) )
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1926 {
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1927 #ifdef DEBUG
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1928 /*av_log(NULL, AV_LOG_DEBUG, "this size should actually be %d\n",foundsize);*/
146
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1929 #endif
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1930 size=foundsize;
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1931 }
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1932 }
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1933 #endif //MOV_MINOLTA_FIX
b9703b3c10b6 * 3gp patch by Joca
kabi
parents: 136
diff changeset
1934
771
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1935 idx = sc->sample_to_chunk_index;
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1936 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
1937 idx++;
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1938 sc->sample_to_chunk_index = idx;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1939 #ifdef MOV_SPLIT_CHUNKS
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1940 /* split chunks into samples */
771
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1941 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
1942 if (idx >= 0 && sc->sample_to_chunk[idx].count != 1) {
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1943 mov->partial = sc;
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1944 /* 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
1945 sc->left_in_chunk = sc->sample_to_chunk[idx].count - 1;
723
3a9f7fb4e7bb reverting 1.66 -> 1.67 change
michael
parents: 712
diff changeset
1946 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
1947 }
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1948
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1949 sc->current_sample++;
771
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1950 }else if(idx + 1 < sc->sample_to_chunk_sz){
581bec6f0eb0 update current_sample number for non split mode
michael
parents: 770
diff changeset
1951 sc->current_sample += sc->sample_size * 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
1952 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1953 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1954
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1955 readchunk:
641
4f45848cc1ec get debug code to compile again.
mmu_man
parents: 640
diff changeset
1956 #ifdef DEBUG
4f45848cc1ec get debug code to compile again.
mmu_man
parents: 640
diff changeset
1957 av_log(NULL, AV_LOG_DEBUG, "chunk: %lli -> %lli (%i)\n", offset, offset + size, size);
4f45848cc1ec get debug code to compile again.
mmu_man
parents: 640
diff changeset
1958 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1959 if(size == 0x0FFFFFFF)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1960 size = mov->mdat_size + mov->mdat_offset - offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1961 if(size < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1962 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1963 if(size == 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1964 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1965 url_fseek(&s->pb, offset, SEEK_SET);
118
79d651162d35 * fixed initialization and some memleak
kabi
parents: 101
diff changeset
1966
775
c5077fdab490 AVPacket.pos
michael
parents: 771
diff changeset
1967 av_get_packet(&s->pb, pkt, size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1968 pkt->stream_index = sc->ffindex;
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
1969
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
1970 // 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
1971 // If no table exists, treat very sample as a key frame.
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
1972 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
1973 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
1974 b = sc->keyframe_count - 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
1975
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
1976 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
1977 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
1978 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
1979 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
1980 } 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
1981 a = m;
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
1982 }
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
1983 }
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
1984
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
1985 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
1986 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
1987 }
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
1988 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
1989 pkt->flags |= PKT_FLAG_KEY;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1990
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1991 #ifdef DEBUG
653
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1992 /*
641
4f45848cc1ec get debug code to compile again.
mmu_man
parents: 640
diff changeset
1993 av_log(NULL, AV_LOG_DEBUG, "Packet (%d, %ld) ", pkt->stream_index, pkt->size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1994 for(i=0; i<8; i++)
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1995 av_log(NULL, AV_LOG_DEBUG, "%02x ", pkt->data[i]);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1996 for(i=0; i<8; i++)
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
1997 av_log(NULL, AV_LOG_DEBUG, "%c ", (pkt->data[i]) & 0x7F);
641
4f45848cc1ec get debug code to compile again.
mmu_man
parents: 640
diff changeset
1998 av_log(NULL, AV_LOG_DEBUG, "\n");
653
c61da0556426 Revert the fixed-size-sample patch as it brokes and others
mmu_man
parents: 652
diff changeset
1999 */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2000 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2001
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2002 mov->next_chunk_offset = offset + size;
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2003
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2004 /* find the corresponding dts */
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2005 if (sc && sc->sample_to_time_index < sc->stts_count && pkt) {
670
856b151f926a cleanup
michael
parents: 660
diff changeset
2006 unsigned int count;
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2007 uint64_t dts, pts;
670
856b151f926a cleanup
michael
parents: 660
diff changeset
2008 unsigned int duration = sc->stts_data[sc->sample_to_time_index].duration;
856b151f926a cleanup
michael
parents: 660
diff changeset
2009 count = sc->stts_data[sc->sample_to_time_index].count;
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2010 if ((sc->sample_to_time_sample + count) < sc->current_sample) {
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2011 sc->sample_to_time_sample += count;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2012 sc->sample_to_time_time += count*duration;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2013 sc->sample_to_time_index ++;
670
856b151f926a cleanup
michael
parents: 660
diff changeset
2014 duration = sc->stts_data[sc->sample_to_time_index].duration;
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2015 }
670
856b151f926a cleanup
michael
parents: 660
diff changeset
2016 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
2017 /* find the corresponding pts */
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2018 if (sc->sample_to_ctime_index < sc->ctts_count) {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2019 int duration = sc->ctts_data[sc->sample_to_ctime_index].duration;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2020 int count = sc->ctts_data[sc->sample_to_ctime_index].count;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2021
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2022 if ((sc->sample_to_ctime_sample + count) < sc->current_sample) {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2023 sc->sample_to_ctime_sample += count;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2024 sc->sample_to_ctime_index ++;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2025 duration = sc->ctts_data[sc->sample_to_ctime_index].duration;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2026 }
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2027 pts = dts + duration;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2028 }else
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2029 pts = dts;
794
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
2030 pkt->pts = pts;
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
2031 pkt->dts = dts;
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2032 #ifdef DEBUG
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2033 av_log(NULL, AV_LOG_DEBUG, "stream #%d smp #%ld dts = %lld pts = %lld (smp:%ld time:%lld idx:%d ent:%d count:%d dur:%d)\n"
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2034 , pkt->stream_index, sc->current_sample-1, pkt->dts, pkt->pts
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2035 , sc->sample_to_time_sample
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2036 , sc->sample_to_time_time
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2037 , sc->sample_to_time_index
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2038 , sc->stts_count
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2039 , count
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2040 , duration);
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2041 #endif
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2042 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2043
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2044 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2045 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2046
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2047 #if defined(MOV_SPLIT_CHUNKS) && defined(MOV_SEEK)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2048 /**
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2049 * 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
2050 */
794
040cf31abb4b another chapter in the neverending mov demuxer cleanup
michael
parents: 775
diff changeset
2051 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
2052 {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2053 MOVContext* mov = (MOVContext *) s->priv_data;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2054 MOVStreamContext* sc;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2055 int32_t i, a, b, m;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2056 int64_t start_time;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2057 int32_t seek_sample, sample;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2058 int32_t duration;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2059 int32_t count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2060 int32_t chunk;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2061 int32_t left_in_chunk;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2062 int64_t chunk_file_offset;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2063 int64_t sample_file_offset;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2064 int32_t first_chunk_sample;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2065 int32_t sample_to_chunk_idx;
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2066 int sample_to_time_index;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2067 long sample_to_time_sample = 0;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2068 uint64_t sample_to_time_time = 0;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2069 int mov_idx;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2070
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2071 // Find the corresponding mov stream
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2072 for (mov_idx = 0; mov_idx < mov->total_streams; mov_idx++)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2073 if (mov->streams[mov_idx]->ffindex == stream_index)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2074 break;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2075 if (mov_idx == mov->total_streams) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2076 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
2077 return -1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2078 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2079 sc = mov->streams[mov_idx];
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2080
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2081 // Step 1. Find the edit that contains the requested time (elst)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2082 if (sc->edit_count) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2083 // FIXME should handle edit list
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2084 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
2085 return -1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2086 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2087
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2088 // Step 2. Find the corresponding sample using the Time-to-sample atom (stts) */
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2089 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2090 av_log(s, AV_LOG_DEBUG, "Searching for time %li in stream #%i (time_scale=%i)\n", (long)timestamp, mov_idx, sc->time_scale);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2091 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2092 start_time = 0; // FIXME use elst atom
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2093 sample = 1; // sample are 0 based in table
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2094 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2095 av_log(s, AV_LOG_DEBUG, "Searching for sample_time %li \n", (long)sample_time);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2096 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2097 for (i = 0; i < sc->stts_count; i++) {
670
856b151f926a cleanup
michael
parents: 660
diff changeset
2098 count = sc->stts_data[i].count;
856b151f926a cleanup
michael
parents: 660
diff changeset
2099 duration = sc->stts_data[i].duration;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2100 //av_log(s, AV_LOG_DEBUG, "> sample_time %lli \n", (long)sample_time);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2101 //av_log(s, AV_LOG_DEBUG, "> count=%i duration=%i\n", count, duration);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2102 if ((start_time + count*duration) > sample_time) {
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2103 sample_to_time_time = start_time;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2104 sample_to_time_index = i;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2105 sample_to_time_sample = sample;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2106 sample += (sample_time - start_time) / duration;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2107 break;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2108 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2109 sample += count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2110 start_time += count * duration;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2111 }
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2112 sample_to_time_time = start_time;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2113 sample_to_time_index = i;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2114 /* 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
2115 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
2116
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2117 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2118 av_log(s, AV_LOG_DEBUG, "Found time %li at sample #%u\n", (long)sample_time, sample);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2119 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2120 if (sample > sc->sample_count) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2121 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
2122 return -1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2123 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2124
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2125 // Step 3. Find the prior sync. sample using the Sync sample atom (stss)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2126 if (sc->keyframes) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2127 a = 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2128 b = sc->keyframe_count - 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2129 while (a < b) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2130 m = (a + b + 1) >> 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2131 if (sc->keyframes[m] > sample) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2132 b = m - 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2133 } else {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2134 a = m;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2135 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2136 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2137 // av_log(s, AV_LOG_DEBUG, "a=%i (%i) b=%i (%i) m=%i (%i) stream #%i\n", a, sc->keyframes[a], b, sc->keyframes[b], m, sc->keyframes[m], mov_idx);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2138 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2139 }
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2140 // 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
2141 // if (a) a--;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2142 seek_sample = sc->keyframes[a];
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2143 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2144 else
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2145 seek_sample = sample; // else all samples are key frames
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2146 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2147 av_log(s, AV_LOG_DEBUG, "Found nearest keyframe at sample #%i \n", seek_sample);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2148 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2149
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2150 // 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
2151 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
2152 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
2153 if (seek_sample >= first_chunk_sample && seek_sample < (first_chunk_sample + b))
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2154 break;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2155 first_chunk_sample += b;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2156 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2157 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
2158 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
2159 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
2160 sample_to_chunk_idx = i;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2161 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2162 av_log(s, AV_LOG_DEBUG, "Sample was found in chunk #%i at sample offset %i (idx %i)\n", chunk, seek_sample - first_chunk_sample, sample_to_chunk_idx);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2163 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2164
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2165 // Step 5. Find the offset of the chunk using the chunk offset atom
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2166 if (!sc->chunk_offsets) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2167 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
2168 return -1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2169 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2170 if (chunk > sc->chunk_count) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2171 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
2172 return -1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2173 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2174 chunk_file_offset = sc->chunk_offsets[chunk - 1];
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2175 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2176 av_log(s, AV_LOG_DEBUG, "Chunk file offset is #%llu \n", chunk_file_offset);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2177 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2178
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2179 // 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
2180 sample_file_offset = chunk_file_offset;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2181 if (sc->sample_size)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2182 sample_file_offset += (seek_sample - first_chunk_sample) * sc->sample_size;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2183 else {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2184 for (i = 0; i < (seek_sample - first_chunk_sample); i++) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2185 sample_file_offset += sc->sample_sizes[first_chunk_sample + i - 1];
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2186 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2187 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2188 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2189 av_log(s, AV_LOG_DEBUG, "Sample file offset is #%llu \n", sample_file_offset);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2190 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2191
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2192 // Step 6. Update the parser
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2193 mov->partial = sc;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2194 mov->next_chunk_offset = sample_file_offset;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2195 // Update current stream state
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2196 sc->current_sample = seek_sample - 1; // zero based
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2197 sc->left_in_chunk = left_in_chunk;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2198 sc->next_chunk = chunk; // +1 -1 (zero based)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2199 sc->sample_to_chunk_index = sample_to_chunk_idx;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2200
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2201 // Update other streams
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2202 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
2203 MOVStreamContext *msc;
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2204 if (i == mov_idx) continue;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2205 // 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
2206 msc = mov->streams[i];
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2207 a = 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2208 b = msc->chunk_count - 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2209 while (a < b) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2210 m = (a + b + 1) >> 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2211 if (msc->chunk_offsets[m] > chunk_file_offset) {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2212 b = m - 1;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2213 } else {
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2214 a = m;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2215 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2216 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2217 /* av_log(s, AV_LOG_DEBUG, "a=%i (%li) b=%i (%li) m=%i (%li) stream #%i\n"
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2218 , a, (long)msc->chunk_offsets[a], b, (long)msc->chunk_offsets[b], m, (long)msc->chunk_offsets[m], i); */
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2219 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2220 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2221 msc->next_chunk = a;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2222 if (msc->chunk_offsets[a] < chunk_file_offset && a < (msc->chunk_count-1))
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2223 msc->next_chunk ++;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2224 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2225 av_log(s, AV_LOG_DEBUG, "Nearest next chunk for stream #%i is #%i @%lli\n", i, msc->next_chunk+1, msc->chunk_offsets[msc->next_chunk]);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2226 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2227 // 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
2228 msc->sample_to_chunk_index = 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2229 msc->current_sample = 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2230 for(; msc->sample_to_chunk_index < (msc->sample_to_chunk_sz - 1)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2231 && 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
2232 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
2233 * msc->sample_to_chunk[msc->sample_to_chunk_index].count;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2234 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2235 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
2236 msc->left_in_chunk = msc->sample_to_chunk[msc->sample_to_chunk_index].count - 1;
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2237 // Find corresponding position in stts (used later to compute dts)
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2238 sample = 0;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2239 start_time = 0;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2240 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
2241 count = msc->stts_data[msc->sample_to_time_index].count;
856b151f926a cleanup
michael
parents: 660
diff changeset
2242 duration = msc->stts_data[msc->sample_to_time_index].duration;
654
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2243 if ((sample + count - 1) > msc->current_sample) {
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2244 msc->sample_to_time_time = start_time;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2245 msc->sample_to_time_sample = sample;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2246 break;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2247 }
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2248 sample += count;
125ce04416b5 Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
mmu_man
parents: 653
diff changeset
2249 start_time += count * duration;
671
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2250 }
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2251 sample = 0;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2252 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
2253 count = msc->ctts_data[msc->sample_to_ctime_index].count;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2254 duration = msc->ctts_data[msc->sample_to_ctime_index].duration;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2255 if ((sample + count - 1) > msc->current_sample) {
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2256 msc->sample_to_ctime_sample = sample;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2257 break;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2258 }
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2259 sample += count;
19ae6e841a32 set timestamps correctly
michael
parents: 670
diff changeset
2260 }
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2261 #ifdef DEBUG
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2262 av_log(s, AV_LOG_DEBUG, "Next Sample for stream #%i is #%i @%i\n", i, msc->current_sample + 1, msc->sample_to_chunk_index + 1);
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2263 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2264 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2265 return 0;
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2266 }
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2267 #endif
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2268
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2269 static int mov_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2270 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2271 int i;
121
b9bd706c1ac3 * simplified parameters for parse routines
kabi
parents: 118
diff changeset
2272 MOVContext *mov = (MOVContext *) s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2273 for(i=0; i<mov->total_streams; i++)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2274 mov_free_stream_context(mov->streams[i]);
130
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
2275 /* free color tabs */
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
2276 for(i=0; i<mov->ctab_size; i++)
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
2277 av_freep(&mov->ctab[i]);
f607ed6aa365 * support for AAC audio (esds decoding - using extradata)
kabi
parents: 129
diff changeset
2278 av_freep(&mov->ctab);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2279 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2280 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2281
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2282 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
2283 "mov,mp4,m4a,3gp,3g2",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2284 "QuickTime/MPEG4 format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2285 sizeof(MOVContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2286 mov_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2287 mov_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2288 mov_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2289 mov_read_close,
491
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2290 #if defined(MOV_SPLIT_CHUNKS) && defined(MOV_SEEK)
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2291 mov_read_seek,
4cf46e9a1bb8 Seeking in .mov/.mp4 files
michael
parents: 489
diff changeset
2292 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2293 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2294
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2295 int mov_init(void)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2296 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2297 av_register_input_format(&mov_iformat);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2298 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2299 }