annotate mov.c @ 1628:421c130983da libavformat

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