annotate libmpdemux/demux_mov.c @ 36316:139f2b064ef9

Don't subsequently calculate original_aspect from last movie_aspect. Instead, differentiate between the original aspect ratio stored in or determined from the video file and the forced, i.e. current, aspect ratio (e.g. forced by command line override). This enables multiple independent instances of vd.c again which has been broken by introducing a static variable in r36401. Without the subsequent calculation of original_aspect it now contains nothing but the pure video file aspect ratio which makes it possible to use movie_aspect -1 to set the original aspect ratio which explains the changes in command.c and gui/dialog/menu.c. The changes in vd_mpegpes due to the impact of original_aspect will fix a bug there at the same time where the condition in order to call mpcodecs_config_vo() should only trigger once when the encoded aspect changes. So far, the forced, i.e. current, aspect has been checked. The whole is related to enabling special argument -1 to switch_ratio started in r36391.
author ib
date Wed, 07 Aug 2013 20:41:34 +0000
parents 425467b5be98
children 689594b793f7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
29238
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
1 /*
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
2 * QuickTime MOV file parser
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
3 * copyright(c) 2001 A'rpi
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
4 * additional work by Atmos
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
5 * based on TOOLS/movinfo.c by A'rpi & Al3x
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
6 * compressed header support from moov.c of the openquicktime lib.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
7 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
8 * references: http://openquicktime.sf.net/, http://www.heroinewarrior.com/
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
9 * http://www.geocities.com/SiliconValley/Lakes/2160/fformats/files/mov.pdf
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
10 * (above URL no longer works, file mirrored somewhere? ::atmos)
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
11 * The QuickTime File Format PDF from Apple:
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
12 * http://developer.apple.com/techpubs/quicktime/qtdevdocs/PDF/QTFileFormat.pdf
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
13 * (Complete list of documentation at http://developer.apple.com/quicktime/)
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
14 * MP4-Lib sources from http://mpeg4ip.sf.net/ might be useful for .mp4
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
15 * as well as .mov specific stuff.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
16 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
17 * All sort of Stuff about MPEG4:
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
18 * http://www.cmlab.csie.ntu.edu.tw/~pkhsiao/thesis.html
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
19 * I really recommend N4270-1.doc and N4270-2.doc which are exact specs
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
20 * of the MP4-File Format and the MPEG4 Specific extensions. ::atmos
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
21 * TSGS#15(02)0088
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
22 * http://www.3gpp.org/ftp/tsg_sa/TSG_SA/TSGS_15/Docs/pdf/SP-020088.pdf
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
23 * http://www.3gpp2.org/Public_html/specs/C.S0050-0_v1.0_121503.pdf
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
24 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
25 * This file is part of MPlayer.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
26 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
27 * MPlayer is free software; you can redistribute it and/or modify
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
28 * it under the terms of the GNU General Public License as published by
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
29 * the Free Software Foundation; either version 2 of the License, or
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
30 * (at your option) any later version.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
31 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
32 * MPlayer is distributed in the hope that it will be useful,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
33 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
34 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
35 * GNU General Public License for more details.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
36 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
37 * You should have received a copy of the GNU General Public License along
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
38 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
39 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28844
diff changeset
40 */
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
41
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
42 #include <stdio.h>
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
43 #include <stdlib.h>
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
44 #include <unistd.h>
21354
072d3248d309 Fix 2 header bugs introduced by nplourde's previous commit:
uau
parents: 21353
diff changeset
45 #include <inttypes.h>
072d3248d309 Fix 2 header bugs introduced by nplourde's previous commit:
uau
parents: 21353
diff changeset
46
072d3248d309 Fix 2 header bugs introduced by nplourde's previous commit:
uau
parents: 21353
diff changeset
47 #include "config.h"
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
48
27388
ac03760f7fcc Rename all preprocessor directives related to Apple / Mac OS X.
diego
parents: 27341
diff changeset
49 #ifdef CONFIG_QUICKTIME
21353
a965ca17debc reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 21032
diff changeset
50 #include <QuickTime/QuickTime.h>
a965ca17debc reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 21032
diff changeset
51 #include <QuickTime/ImageCompression.h>
a965ca17debc reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 21032
diff changeset
52 #include <QuickTime/ImageCodec.h>
a965ca17debc reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 21032
diff changeset
53 #else
a965ca17debc reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 21032
diff changeset
54 #include "loader/qtx/qtxsdk/components.h"
a965ca17debc reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 21032
diff changeset
55 #endif
a965ca17debc reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 21032
diff changeset
56
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1490
diff changeset
57 #include "mp_msg.h"
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1567
diff changeset
58 #include "help_mp.h"
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
59
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 22464
diff changeset
60 #include "stream/stream.h"
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
61 #include "demuxer.h"
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
62 #include "stheader.h"
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
63
25359
4bb08145bf66 Set correct image format for 24bit "raw " in mov files.
cehoyos
parents: 24358
diff changeset
64 #include "libmpcodecs/img_format.h"
28441
669df097f203 Fix a couple of unused variable warnings through the av_unused attribute.
diego
parents: 28440
diff changeset
65 #include "libavutil/common.h"
25931
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
66 #include "libavutil/intreadwrite.h"
25359
4bb08145bf66 Set correct image format for 24bit "raw " in mov files.
cehoyos
parents: 24358
diff changeset
67
32467
fbe5c829c69b Move libvo/sub.[ch] from libvo to sub.
cigaes
parents: 32105
diff changeset
68 #include "sub/sub.h"
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
69
30580
a25d16882312 Add header file for store_ughvlc(); avoids forward declarations.
diego
parents: 30571
diff changeset
70 #include "demux_mov.h"
4332
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
71 #include "qtpalette.h"
6612
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
72 #include "parse_mp4.h" // .MP4 specific stuff
4332
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
73
28440
2218218264cb Convert CONFIG_ZLIB into a 0/1 option.
diego
parents: 27388
diff changeset
74 #if CONFIG_ZLIB
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
75 #include <zlib.h>
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
76 #endif
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
77
9951
82f6240091a8 Avoid including a header file twice to prevent Cygwin gcc 2.95.3-10 from
diego
parents: 9590
diff changeset
78 #ifndef _FCNTL_H
2786
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
79 #include <fcntl.h>
6334
5becd843ff47 cygwin & darwin fixes by Joey Parrish <joey@yunamusic.com>
arpi
parents: 6139
diff changeset
80 #endif
2786
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
81
25931
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
82 #define char2short(x,y) AV_RB16(&(x)[(y)])
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
83 #define char2int(x,y) AV_RB32(&(x)[(y)])
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
84
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
85 typedef struct {
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
86 unsigned int pts; // duration
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
87 unsigned int size;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
88 off_t pos;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
89 } mov_sample_t;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
90
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
91 typedef struct {
2546
c9485365537d added edit atom (edit list), some comments and typos fixes
alex
parents: 2545
diff changeset
92 unsigned int sample; // number of the first sample in the chunk
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
93 unsigned int size; // number of samples in the chunk
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
94 int desc; // for multiple codecs mode - not used
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
95 off_t pos;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
96 } mov_chunk_t;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
97
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
98 typedef struct {
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
99 unsigned int first;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
100 unsigned int spc;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
101 unsigned int sdid;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
102 } mov_chunkmap_t;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
103
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
104 typedef struct {
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
105 unsigned int num;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
106 unsigned int dur;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
107 } mov_durmap_t;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
108
6664
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
109 typedef struct {
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
110 unsigned int dur;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
111 unsigned int pos;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
112 int speed;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
113 //
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
114 int frames;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
115 int start_sample;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
116 int start_frame;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
117 int pts_offset;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
118 } mov_editlist_t;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
119
4624
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
120 #define MOV_TRAK_UNKNOWN 0
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
121 #define MOV_TRAK_VIDEO 1
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
122 #define MOV_TRAK_AUDIO 2
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
123 #define MOV_TRAK_FLASH 3
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
124 #define MOV_TRAK_GENERIC 4
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
125 #define MOV_TRAK_CODE 5
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
126
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
127 typedef struct {
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
128 int id;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
129 int type;
3999
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
130 off_t pos;
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
131 //
8314
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
132 unsigned int media_handler;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
133 unsigned int data_handler;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
134 //
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
135 int timescale;
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
136 unsigned int length;
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
137 int samplesize; // 0 = variable
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
138 int duration; // 0 = variable
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
139 int width,height; // for video
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
140 unsigned int fourcc;
14279
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
141 unsigned int nchannels;
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
142 unsigned int samplebytes;
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
143 //
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
144 int tkdata_len; // track data
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
145 unsigned char* tkdata;
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
146 int stdata_len; // stream data
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
147 unsigned char* stdata;
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
148 //
5252
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
149 unsigned char* stream_header;
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
150 int stream_header_len; // if >0, this header should be sent before the 1st frame
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
151 //
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
152 int samples_size;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
153 mov_sample_t* samples;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
154 int chunks_size;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
155 mov_chunk_t* chunks;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
156 int chunkmap_size;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
157 mov_chunkmap_t* chunkmap;
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
158 int durmap_size;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
159 mov_durmap_t* durmap;
2544
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
160 int keyframes_size;
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
161 unsigned int* keyframes;
6664
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
162 int editlist_size;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
163 mov_editlist_t* editlist;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
164 int editlist_pos;
5372
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
165 //
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
166 void* desc; // image/sound/etc description (pointer to ImageDescription etc)
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
167 } mov_track_t;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
168
30571
7031b2cf61ca Mark mov_build_index() as static; it is not used outside of the file.
diego
parents: 29598
diff changeset
169 static void mov_build_index(mov_track_t* trak,int timescale){
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
170 int i,j,s;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
171 int last=trak->chunks_size;
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
172 unsigned int pts=0;
3652
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
173
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
174 #if 0
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
175 if (trak->chunks_size <= 0)
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
176 {
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
177 mp_msg(MSGT_DEMUX, MSGL_WARN, "No chunk offset table, trying to build one!\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
178
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
179 trak->chunks_size = trak->samples_size; /* XXX: FIXME ! */
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18491
diff changeset
180 // audit: this code will be vulnerable if it is reenabled (currently #if 0)
3652
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
181 trak->chunks = realloc(trak->chunks, sizeof(mov_chunk_t)*trak->chunks_size);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
182
3652
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
183 for (i=0; i < trak->chunks_size; i++)
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
184 trak->chunks[i].pos = -1;
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
185 }
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
186 #endif
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
187
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
188 mp_msg(MSGT_DEMUX, MSGL_V, "MOV track #%d: %d chunks, %d samples\n",trak->id,trak->chunks_size,trak->samples_size);
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
189 mp_msg(MSGT_DEMUX, MSGL_V, "pts=%d scale=%d time=%5.3f\n",trak->length,trak->timescale,(float)trak->length/(float)trak->timescale);
2546
c9485365537d added edit atom (edit list), some comments and typos fixes
alex
parents: 2545
diff changeset
190
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
191 // process chunkmap:
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
192 i=trak->chunkmap_size;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
193 while(i>0){
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
194 --i;
27248
f45c38163037 Change a broken check. FFMAX does not work as intended because trak->chunkmap[i].first
reimar
parents: 27234
diff changeset
195 j=trak->chunkmap[i].first;
f45c38163037 Change a broken check. FFMAX does not work as intended because trak->chunkmap[i].first
reimar
parents: 27234
diff changeset
196 for(;j>=0 && j<last;j++){
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
197 trak->chunks[j].desc=trak->chunkmap[i].sdid;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
198 trak->chunks[j].size=trak->chunkmap[i].spc;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
199 }
25892
68a400e63e67 Make sure chunkmap values are within bounds when using them.
reimar
parents: 25891
diff changeset
200 last=FFMIN(trak->chunkmap[i].first, trak->chunks_size);
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
201 }
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
202
3652
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
203 #if 0
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
204 for (i=0; i < trak->chunks_size; i++)
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
205 {
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
206 /* fixup position */
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
207 if (trak->chunks[i].pos == -1)
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
208 if (i > 0)
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
209 trak->chunks[i].pos = trak->chunks[i-1].pos + trak->chunks[i-1].size;
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
210 else
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
211 trak->chunks[i].pos = 0; /* FIXME: set initial pos */
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
212 #endif
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
213
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
214 // calc pts of chunks:
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
215 s=0;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
216 for(j=0;j<trak->chunks_size;j++){
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
217 trak->chunks[j].sample=s;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
218 s+=trak->chunks[j].size;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
219 }
16320
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
220 i = 0;
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
221 for (j = 0; j < trak->durmap_size; j++)
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
222 i += trak->durmap[j].num;
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
223 if (i != s) {
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
224 mp_msg(MSGT_DEMUX, MSGL_WARN,
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
225 "MOV: durmap and chunkmap sample count differ (%i vs %i)\n", i, s);
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
226 if (i > s) s = i;
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
227 }
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
228
4624
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
229 // workaround for fixed-size video frames (dv and uncompressed)
8314
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
230 if(!trak->samples_size && trak->type!=MOV_TRAK_AUDIO){
18444
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
231 trak->samples=calloc(s, sizeof(mov_sample_t));
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
232 trak->samples_size=trak->samples ? s : 0;
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
233 for(i=0;i<trak->samples_size;i++)
4624
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
234 trak->samples[i].size=trak->samplesize;
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
235 trak->samplesize=0;
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
236 }
080882dddb2e fixedsize video samples fixed (dvntsc-qt.mov)
arpi
parents: 4533
diff changeset
237
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
238 if(!trak->samples_size){
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
239 // constant sampesize
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
240 if(trak->durmap_size==1 || (trak->durmap_size==2 && trak->durmap[1].num==1)){
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
241 trak->duration=trak->durmap[0].dur;
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
242 } else mp_msg(MSGT_DEMUX, MSGL_ERR, "*** constant samplesize & variable duration not yet supported! ***\nContact the author if you have such sample file!\n");
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
243 return;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
244 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
245
16320
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
246 if (trak->samples_size < s) {
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
247 mp_msg(MSGT_DEMUX, MSGL_WARN,
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
248 "MOV: durmap or chunkmap bigger than sample count (%i vs %i)\n",
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
249 s, trak->samples_size);
32616
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
250 free(trak->samples);
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
251 trak->samples = calloc(s, sizeof(mov_sample_t));
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
252 trak->samples_size = trak->samples ? s : 0;
16320
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
253 }
2b6430db786a extra size checks for samples array to avoid crashes in some rare cases.
reimar
parents: 16175
diff changeset
254
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
255 // calc pts:
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
256 s=0;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
257 for(j=0;j<trak->durmap_size;j++){
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
258 for(i=0;i<trak->durmap[j].num;i++){
25893
638493dc056e Check that index is still within bounds of samples array.
reimar
parents: 25892
diff changeset
259 if (s >= trak->samples_size)
638493dc056e Check that index is still within bounds of samples array.
reimar
parents: 25892
diff changeset
260 break;
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
261 trak->samples[s].pts=pts;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
262 ++s;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
263 pts+=trak->durmap[j].dur;
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
264 }
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
265 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
266
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
267 // calc sample offsets
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
268 s=0;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
269 for(j=0;j<trak->chunks_size;j++){
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
270 off_t pos=trak->chunks[j].pos;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
271 for(i=0;i<trak->chunks[j].size;i++){
25893
638493dc056e Check that index is still within bounds of samples array.
reimar
parents: 25892
diff changeset
272 if (s >= trak->samples_size)
638493dc056e Check that index is still within bounds of samples array.
reimar
parents: 25892
diff changeset
273 break;
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
274 trak->samples[s].pos=pos;
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
275 mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d off=0x%08X size=%d\n",s,
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
276 trak->samples[s].pts,
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
277 (int)trak->samples[s].pos,
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
278 trak->samples[s].size);
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
279 pos+=trak->samples[s].size;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
280 ++s;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
281 }
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
282 }
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
283
6664
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
284 // precalc editlist entries
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
285 if(trak->editlist_size>0){
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
286 int frame=0;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
287 int e_pts=0;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
288 for(i=0;i<trak->editlist_size;i++){
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
289 mov_editlist_t* el=&trak->editlist[i];
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
290 int sample=0;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
291 int pts=el->pos;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
292 el->start_frame=frame;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
293 if(pts<0){
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
294 // skip!
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
295 el->frames=0; continue;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
296 }
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
297 // find start sample
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
298 for(;sample<trak->samples_size;sample++){
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
299 if(pts<=trak->samples[sample].pts) break;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
300 }
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
301 el->start_sample=sample;
7441
13716c8114a8 fixing edit-list playback (it uses the mvhd-timescale instead of the mdhd-one)
arpi
parents: 6928
diff changeset
302 el->pts_offset=((long long)e_pts*(long long)trak->timescale)/(long long)timescale-trak->samples[sample].pts;
13716c8114a8 fixing edit-list playback (it uses the mvhd-timescale instead of the mdhd-one)
arpi
parents: 6928
diff changeset
303 pts+=((long long)el->dur*(long long)trak->timescale)/(long long)timescale;
6664
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
304 e_pts+=el->dur;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
305 // find end sample
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
306 for(;sample<trak->samples_size;sample++){
16496
cca6a74cf898 Wrong editlist handling: end pts must be included.
reimar
parents: 16346
diff changeset
307 if(pts<trak->samples[sample].pts) break;
6664
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
308 }
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
309 el->frames=sample-el->start_sample;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
310 frame+=el->frames;
7514
d71300143887 dump processed edit list data
arpi
parents: 7472
diff changeset
311 mp_msg(MSGT_DEMUX,MSGL_V,"EL#%d: pts=%d 1st_sample=%d frames=%d (%5.3fs) pts_offs=%d\n",i,
d71300143887 dump processed edit list data
arpi
parents: 7472
diff changeset
312 el->pos,el->start_sample, el->frames,
d71300143887 dump processed edit list data
arpi
parents: 7472
diff changeset
313 (float)(el->dur)/(float)timescale, el->pts_offset);
6664
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
314 }
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
315 }
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
316
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
317 }
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
318
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
319 #define MOV_MAX_TRACKS 256
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
320 #define MOV_MAX_SUBLEN 1024
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
321
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
322 typedef struct {
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
323 off_t moov_start;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
324 off_t moov_end;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
325 off_t mdat_start;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
326 off_t mdat_end;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
327 int track_db;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
328 mov_track_t* tracks[MOV_MAX_TRACKS];
7441
13716c8114a8 fixing edit-list playback (it uses the mvhd-timescale instead of the mdhd-one)
arpi
parents: 6928
diff changeset
329 int timescale; // movie timescale
13716c8114a8 fixing edit-list playback (it uses the mvhd-timescale instead of the mdhd-one)
arpi
parents: 6928
diff changeset
330 int duration; // movie duration (in movie timescale units)
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
331 subtitle subs;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
332 char subtext[MOV_MAX_SUBLEN + 1];
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
333 int current_sub;
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
334 } mov_priv_t;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
335
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
336 #define MOV_FOURCC(a,b,c,d) ((a<<24)|(b<<16)|(c<<8)|(d))
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
337
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
338 static int mov_check_file(demuxer_t* demuxer){
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
339 int flags=0;
2879
a3410c946b54 ignore mov detection if first chunk bad
arpi
parents: 2786
diff changeset
340 int no=0;
32102
52f920e9c540 Replace malloc+memset by calloc.
reimar
parents: 31609
diff changeset
341 mov_priv_t* priv=calloc(1, sizeof(mov_priv_t));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
342
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1490
diff changeset
343 mp_msg(MSGT_DEMUX,MSGL_V,"Checking for MOV\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
344
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
345 priv->current_sub = -1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
346
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
347 while(1){
8315
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
348 int i;
3999
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
349 int skipped=8;
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
350 off_t len=stream_read_dword(demuxer->stream);
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
351 unsigned int id=stream_read_dword(demuxer->stream);
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
352 if(stream_eof(demuxer->stream)) break; // EOF
3999
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
353 if (len == 1) /* real size is 64bits - cjb */
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
354 {
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
355 #ifndef _LARGEFILE_SOURCE
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
356 if (stream_read_dword(demuxer->stream) != 0)
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
357 mp_msg(MSGT_DEMUX, MSGL_WARN, "64bit file, but you've compiled MPlayer without LARGEFILE support!\n");
3999
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
358 len = stream_read_dword(demuxer->stream);
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
359 #else
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
360 len = stream_read_qword(demuxer->stream);
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
361 #endif
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
362 skipped += 8;
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
363 }
5241
126d5fd76a70 temporary disabled len=0 code due to reported loop errors
alex
parents: 5236
diff changeset
364 #if 0
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
365 else if (len == 0) /* deleted chunk */
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
366 {
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
367 /* XXX: CJB! is this right? - alex */
5243
34c706ab6f6f argh 0.5l
atmos4
parents: 5242
diff changeset
368 goto skip_chunk;
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
369 }
5241
126d5fd76a70 temporary disabled len=0 code due to reported loop errors
alex
parents: 5236
diff changeset
370 #endif
32621
b6636da71bea len < 8 is also invalid for 64-bit codec chunk size.
reimar
parents: 32616
diff changeset
371 if(len<8) break; // invalid chunk
3999
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
372
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
373 switch(id){
5257
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
374 case MOV_FOURCC('f','t','y','p'): {
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
375 unsigned int tmp;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
376 // File Type Box (ftyp):
5257
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
377 // char[4] major_brand (eg. 'isom')
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
378 // int minor_version (eg. 0x00000000)
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
379 // char[4] compatible_brands[] (eg. 'mp41')
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
380 // compatible_brands list spans to the end of box
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
381 #if 1
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
382 tmp = stream_read_dword(demuxer->stream);
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
383 switch(tmp) {
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
384 case MOV_FOURCC('i','s','o','m'):
11810
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
385 mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Major Brand: ISO Base Media\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
386 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
387 case MOV_FOURCC('m','p','4','1'):
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
388 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: ISO/IEC 14496-1 (MPEG-4 system) v1\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
389 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
390 case MOV_FOURCC('m','p','4','2'):
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
391 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: ISO/IEC 14496-1 (MPEG-4 system) v2\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
392 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
393 case MOV_FOURCC('M','4','A',' '):
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
394 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: Apple iTunes AAC-LC Audio\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
395 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
396 case MOV_FOURCC('M','4','P',' '):
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
397 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: Apple iTunes AAC-LC Protected Audio\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
398 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
399 case MOV_FOURCC('q','t',' ',' '):
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
400 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: Original QuickTime\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
401 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
402 case MOV_FOURCC('3','g','p','1'):
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
403 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: 3GPP Profile 1\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
404 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
405 case MOV_FOURCC('3','g','p','2'):
15286
1e8305fffa79 Also '3g2a' can be used for 3GPP Profile 2
rtognimp
parents: 15022
diff changeset
406 case MOV_FOURCC('3','g','2','a'):
11810
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
407 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: 3GPP Profile 2\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
408 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
409 case MOV_FOURCC('3','g','p','3'):
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
410 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: 3GPP Profile 3\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
411 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
412 case MOV_FOURCC('3','g','p','4'):
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
413 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: 3GPP Profile 4\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
414 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
415 case MOV_FOURCC('3','g','p','5'):
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
416 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: 3GPP Profile 5\n");
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
417 break;
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
418 case MOV_FOURCC('m','m','p','4'):
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
419 mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: Mobile ISO/IEC 14496-1 (MPEG-4 system)\n");
5257
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
420 break;
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
421 default:
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
422 tmp = be2me_32(tmp);
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
423 mp_msg(MSGT_DEMUX,MSGL_WARN,"ISO: Unknown File Type Major Brand: %.4s\n",(char *)&tmp);
5257
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
424 }
11810
8cce53dd235f Have the MOV demuxer recognize and display (via MPINFO) registered ISO
diego
parents: 11399
diff changeset
425 mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Minor Version: %d\n",
5257
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
426 stream_read_dword(demuxer->stream));
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
427 skipped += 8;
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
428 // List all compatible brands
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
429 for(i = 0; i < ((len-16)/4); i++) {
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
430 tmp = be2me_32(stream_read_dword(demuxer->stream));
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
431 mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Compatible Brand #%d: %.4s\n",i,(char *)&tmp);
5257
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
432 skipped += 4;
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
433 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
434 #endif
5257
1823c7dff423 Add Parsing off ftyp box and some more docs ref
atmos4
parents: 5254
diff changeset
435 } break;
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
436 case MOV_FOURCC('m','o','o','v'):
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
437 // case MOV_FOURCC('c','m','o','v'):
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1490
diff changeset
438 mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Movie header found!\n");
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
439 priv->moov_start=(off_t)stream_tell(demuxer->stream);
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
440 priv->moov_end=(off_t)priv->moov_start+len-skipped;
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
441 mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie header: start: %"PRIx64" end: %"PRIx64"\n",
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
442 (int64_t)priv->moov_start, (int64_t)priv->moov_end);
8315
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
443 skipped+=8;
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
444 i = stream_read_dword(demuxer->stream)-8;
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
445 if(stream_read_dword(demuxer->stream)==MOV_FOURCC('r','m','r','a')){
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
446 skipped+=i;
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
447 mp_msg(MSGT_DEMUX,MSGL_INFO,"MOV: Reference Media file!!!\n");
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
448 //set demuxer type to playlist ...
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
449 demuxer->type=DEMUXER_TYPE_PLAYLIST;
8315
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
450 while(i>0){
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
451 int len=stream_read_dword(demuxer->stream)-8;
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
452 int fcc=stream_read_dword(demuxer->stream);
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
453 if(len<0) break; // EOF!?
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
454 i-=8;
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
455 // printf("i=%d len=%d\n",i,len);
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
456 switch(fcc){
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
457 case MOV_FOURCC('r','m','d','a'):
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
458 continue;
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
459 case MOV_FOURCC('r','d','r','f'): {
28441
669df097f203 Fix a couple of unused variable warnings through the av_unused attribute.
diego
parents: 28440
diff changeset
460 av_unused int tmp=stream_read_dword(demuxer->stream);
669df097f203 Fix a couple of unused variable warnings through the av_unused attribute.
diego
parents: 28440
diff changeset
461 av_unused int type=stream_read_dword_le(demuxer->stream);
8315
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
462 int slen=stream_read_dword(demuxer->stream);
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
463 //char* s=malloc(slen+1);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
464 //stream_read(demuxer->stream,s,slen);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
465
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
466 //FIXME: also store type & data_rate ?
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
467 ds_read_packet(demuxer->video,
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
468 demuxer->stream,
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
469 slen,
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
470 0,
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
471 stream_tell(demuxer->stream),
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
472 0 // no flags
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
473 );
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
474 flags|=4;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
475 mp_msg(MSGT_DEMUX,MSGL_V,"Added reference to playlist\n");
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
476 //s[slen]=0;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
477 //mp_msg(MSGT_DEMUX,MSGL_INFO,"REF: [%.4s] %s\n",&type,s);
8315
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
478 len-=12+slen;i-=12+slen; break;
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
479 }
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
480 case MOV_FOURCC('r','m','d','r'): {
28441
669df097f203 Fix a couple of unused variable warnings through the av_unused attribute.
diego
parents: 28440
diff changeset
481 av_unused int flags=stream_read_dword(demuxer->stream);
8315
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
482 int rate=stream_read_dword(demuxer->stream);
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
483 mp_msg(MSGT_DEMUX,MSGL_V," min. data rate: %d bits/sec\n",rate);
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
484 len-=8; i-=8; break;
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
485 }
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
486 case MOV_FOURCC('r','m','q','u'): {
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
487 int q=stream_read_dword(demuxer->stream);
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
488 mp_msg(MSGT_DEMUX,MSGL_V," quality index: %d\n",q);
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
489 len-=4; i-=4; break;
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
490 }
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
491 }
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
492 i-=len;stream_skip(demuxer->stream,len);
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
493 }
51165bda4b5b dump URL references
arpi
parents: 8314
diff changeset
494 }
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
495 flags|=1;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
496 break;
5680
7bd2883ee0ec 'wide' may contain 'mdat'
arpi
parents: 5630
diff changeset
497 case MOV_FOURCC('w','i','d','e'):
7bd2883ee0ec 'wide' may contain 'mdat'
arpi
parents: 5630
diff changeset
498 mp_msg(MSGT_DEMUX,MSGL_V,"MOV: 'WIDE' chunk found!\n");
7bd2883ee0ec 'wide' may contain 'mdat'
arpi
parents: 5630
diff changeset
499 if(flags&2) break;
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
500 case MOV_FOURCC('m','d','a','t'):
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1490
diff changeset
501 mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Movie DATA found!\n");
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
502 priv->mdat_start=stream_tell(demuxer->stream);
3999
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
503 priv->mdat_end=priv->mdat_start+len-skipped;
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
504 mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie data: start: %"PRIx64" end: %"PRIx64"\n",
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
505 (int64_t)priv->mdat_start, (int64_t)priv->mdat_end);
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
506 flags|=2;
8928
c82c8144cef9 (hopefully) fixed .mov streaming
arpi
parents: 8830
diff changeset
507 if(flags==3){
c82c8144cef9 (hopefully) fixed .mov streaming
arpi
parents: 8830
diff changeset
508 // if we're over the headers, then we can stop parsing here!
c82c8144cef9 (hopefully) fixed .mov streaming
arpi
parents: 8830
diff changeset
509 demuxer->priv=priv;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
510 return DEMUXER_TYPE_MOV;
8928
c82c8144cef9 (hopefully) fixed .mov streaming
arpi
parents: 8830
diff changeset
511 }
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
512 break;
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
513 case MOV_FOURCC('f','r','e','e'):
2942
89b3dd86b50b added skip atom to support .mp4 files
alex
parents: 2879
diff changeset
514 case MOV_FOURCC('s','k','i','p'):
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
515 case MOV_FOURCC('j','u','n','k'):
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
516 mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: free space (len: %"PRId64")\n", (int64_t)len);
2546
c9485365537d added edit atom (edit list), some comments and typos fixes
alex
parents: 2545
diff changeset
517 /* unused, if you edit a mov, you can use space provided by free atoms (redefining it) */
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
518 break;
6865
0ab18e1433c4 skip 'pnot' and 'PICT' - fixes incoming/1.mov
arpi
parents: 6718
diff changeset
519 case MOV_FOURCC('p','n','o','t'):
0ab18e1433c4 skip 'pnot' and 'PICT' - fixes incoming/1.mov
arpi
parents: 6718
diff changeset
520 case MOV_FOURCC('P','I','C','T'):
0ab18e1433c4 skip 'pnot' and 'PICT' - fixes incoming/1.mov
arpi
parents: 6718
diff changeset
521 /* dunno what, but we shoudl ignore it */
0ab18e1433c4 skip 'pnot' and 'PICT' - fixes incoming/1.mov
arpi
parents: 6718
diff changeset
522 break;
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
523 default:
7759
d4f1dca113d9 memleak fix (found by valgrind)
arpi
parents: 7754
diff changeset
524 if(no==0){ free(priv); return 0;} // first chunk is bad!
4903
d8b465e3fd88 fixed some endian issues, like changing bswap_32() -> be2me_32(), and
melanson
parents: 4646
diff changeset
525 id = be2me_32(id);
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
526 mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",(char *)&id,(int)len);
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
527 }
24358
7e5e6eff5a4f warning fix:
diego
parents: 24182
diff changeset
528 //skip_chunk:
3999
3c6b061ec033 mov_check_file 64bit support by Chris Bednar. also fixed co64 chunk and added warnings for 64bit files reading without largefiles support
alex
parents: 3652
diff changeset
529 if(!stream_skip(demuxer->stream,len-skipped)) break;
2879
a3410c946b54 ignore mov detection if first chunk bad
arpi
parents: 2786
diff changeset
530 ++no;
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
531 }
7759
d4f1dca113d9 memleak fix (found by valgrind)
arpi
parents: 7754
diff changeset
532
d4f1dca113d9 memleak fix (found by valgrind)
arpi
parents: 7754
diff changeset
533 if(flags==3){
d4f1dca113d9 memleak fix (found by valgrind)
arpi
parents: 7754
diff changeset
534 demuxer->priv=priv;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
535 return DEMUXER_TYPE_MOV;
7759
d4f1dca113d9 memleak fix (found by valgrind)
arpi
parents: 7754
diff changeset
536 }
d4f1dca113d9 memleak fix (found by valgrind)
arpi
parents: 7754
diff changeset
537 free(priv);
d4f1dca113d9 memleak fix (found by valgrind)
arpi
parents: 7754
diff changeset
538
9125
61ec44e2f406 Attached PATCH fixes the case, when data-flag and reference flags are set and
arpi
parents: 9113
diff changeset
539 if ((flags==5) || (flags==7)) // reference & header sent
16326
88b9c7b0e773 Fix move playlists (control must be returned to mplayer.c, with the demuxer
reimar
parents: 16320
diff changeset
540 return DEMUXER_TYPE_PLAYLIST;
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8928
diff changeset
541
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
542 if(flags==1)
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
543 mp_msg(MSGT_DEMUX,MSGL_WARN,"MOV: missing data (mdat) chunk! Maybe broken file...\n");
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
544 else if(flags==2)
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
545 mp_msg(MSGT_DEMUX,MSGL_WARN,"MOV: missing header (moov/cmov) chunk! Maybe broken file...\n");
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
546
7759
d4f1dca113d9 memleak fix (found by valgrind)
arpi
parents: 7754
diff changeset
547 return 0;
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
548 }
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
549
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
550 static void demux_close_mov(demuxer_t *demuxer) {
15780
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
551 mov_priv_t* priv = demuxer->priv;
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
552 int i;
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
553 if (!priv)
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
554 return;
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
555 for (i = 0; i < MOV_MAX_TRACKS; i++) {
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
556 mov_track_t *track = priv->tracks[i];
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
557 if (track) {
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
558 free(track->tkdata);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
559 free(track->stdata);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
560 free(track->stream_header);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
561 free(track->samples);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
562 free(track->chunks);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
563 free(track->chunkmap);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
564 free(track->durmap);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
565 free(track->keyframes);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
566 free(track->editlist);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
567 free(track->desc);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
568 free(track);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
569 }
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
570 }
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
571 free(priv);
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
572 }
490dff9ee43f fix memleak when playing mov files
reimar
parents: 15508
diff changeset
573
19326
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
574 unsigned int store_ughvlc(unsigned char *s, unsigned int v){
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
575 unsigned int n = 0;
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
576
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
577 while(v >= 0xff) {
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
578 *s++ = 0xff;
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
579 v -= 0xff;
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
580 n++;
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
581 }
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
582 *s = v;
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
583 n++;
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
584
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
585 return n;
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
586 }
f399b52a985a Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
diego
parents: 19325
diff changeset
587
20979
7909e90e01c1 Try reading palette for vobsub
reimar
parents: 20976
diff changeset
588 static void init_vobsub(sh_sub_t *sh, mov_track_t *trak) {
7909e90e01c1 Try reading palette for vobsub
reimar
parents: 20976
diff changeset
589 sh->type = 'v';
7909e90e01c1 Try reading palette for vobsub
reimar
parents: 20976
diff changeset
590 if (trak->stdata_len < 106)
7909e90e01c1 Try reading palette for vobsub
reimar
parents: 20976
diff changeset
591 return;
25845
ae814d807d40 Simplify init_vobsub: pass palette via extradata.
reimar
parents: 25707
diff changeset
592 sh->extradata_len = 16*4;
ae814d807d40 Simplify init_vobsub: pass palette via extradata.
reimar
parents: 25707
diff changeset
593 sh->extradata = malloc(sh->extradata_len);
ae814d807d40 Simplify init_vobsub: pass palette via extradata.
reimar
parents: 25707
diff changeset
594 memcpy(sh->extradata, trak->stdata + 42, sh->extradata_len);
20979
7909e90e01c1 Try reading palette for vobsub
reimar
parents: 20976
diff changeset
595 }
7909e90e01c1 Try reading palette for vobsub
reimar
parents: 20976
diff changeset
596
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
597 static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id,
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
598 off_t pos, off_t len, mov_track_t* trak);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
599
24182
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
600 static int gen_sh_audio(sh_audio_t* sh, mov_track_t* trak, int timescale) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
601 #if 0
5206
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
602 struct {
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
603 int16_t version; // 0 or 1 (version 1 is qt3.0+)
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
604 int16_t revision; // 0
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
605 int32_t vendor_id; // 0
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
606 int16_t channels; // 1 or 2 (Mono/Stereo)
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
607 int16_t samplesize; // 8 or 16 (8Bit/16Bit)
5206
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
608 int16_t compression_id; // if version 0 then 0
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
609 // if version 1 and vbr then -2 else 0
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
610 int16_t packet_size; // 0
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
611 uint16_t sample_rate; // samplerate (Hz)
5206
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
612 // qt3.0+ (version == 1)
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
613 uint32_t samples_per_packet; // 0 or num uncompressed samples in a packet
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
614 // if 0 below three values are also 0
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
615 uint32_t bytes_per_packet; // 0 or num compressed bytes for one channel
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
616 uint32_t bytes_per_frame; // 0 or num compressed bytes for all channels
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
617 // (channels * bytes_per_packet)
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
618 uint32_t bytes_per_sample; // 0 or size of uncompressed sample
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
619 // if samples_per_packet and bytes_per_packet are constant (CBR)
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
620 // then bytes_per_frame and bytes_per_sample must be 0 (else is VBR)
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
621 // ---
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
622 // optional additional atom-based fields
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
623 // ([int32_t size,int32_t type,some data ],repeat)
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
624 } my_stdata;
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
625 #endif
17283
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
626 int version, adjust;
18667
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
627 int is_vorbis = 0;
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
628 sh->format=trak->fourcc;
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
629
19170
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
630 // crude audio delay from editlist0 hack ::atm
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
631 if(trak->editlist_size>=1) {
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
632 if(trak->editlist[0].pos == -1) {
24182
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
633 sh->stream_delay = (float)trak->editlist[0].dur/(float)timescale;
19170
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
634 mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Initial Audio-Delay: %.3f sec\n", sh->stream_delay);
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
635 }
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
636 }
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
637
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
638
14279
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
639 switch( sh->format ) {
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
640 case 0x726D6173: /* samr */
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
641 /* amr narrowband */
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
642 trak->samplebytes=sh->samplesize=1;
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
643 trak->nchannels=sh->channels=1;
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
644 sh->samplerate=8000;
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
645 break;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
646
14279
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
647 case 0x62776173: /* sawb */
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
648 /* amr wideband */
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
649 trak->samplebytes=sh->samplesize=1;
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
650 trak->nchannels=sh->channels=1;
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
651 sh->samplerate=16000;
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
652 break;
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
653
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
654 default:
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
655
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
656 // assumptions for below table: short is 16bit, int is 32bit, intfp is 16bit
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
657 // XXX: 32bit fixed point numbers (intfp) are only 2 Byte!
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
658 // short values are usually one byte leftpadded by zero
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
659 // int values are usually two byte leftpadded by zero
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
660 // stdata[]:
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
661 // 8 short version
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
662 // 10 short revision
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
663 // 12 int vendor_id
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
664 // 16 short channels
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
665 // 18 short samplesize
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
666 // 20 short compression_id
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
667 // 22 short packet_size (==0)
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
668 // 24 intfp sample_rate
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
669 // (26 short) unknown (==0)
6612
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
670 // ---- qt3.0+ (version>=1)
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
671 // 28 int samples_per_packet
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
672 // 32 int bytes_per_packet
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
673 // 36 int bytes_per_frame
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
674 // 40 int bytes_per_sample
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
675 // there may be additional atoms following at 28 (version 0)
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
676 // or 44 (version 1), eg. esds atom of .MP4 files
5206
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
677 // esds atom:
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
678 // 28 int atom size (bytes of int size, int type and data)
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
679 // 32 char[4] atom type (fourc charater code -> esds)
5307
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
680 // 36 char[] atom data (len=size-8)
5206
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
681
16611
9574fb378080 Sanity-check codecdata_len, fixes crash in libfaad due to failed malloc for
reimar
parents: 16496
diff changeset
682 // TODO: fix parsing for files using version 2.
27162
045b7646abb2 Check stdata_len before accessing stdata. Fixes bug #1125
reimar
parents: 27110
diff changeset
683 if (trak->stdata_len < 26) {
045b7646abb2 Check stdata_len before accessing stdata. Fixes bug #1125
reimar
parents: 27110
diff changeset
684 mp_msg(MSGT_DEMUX, MSGL_WARN, "MOV: broken (too small) sound atom!\n");
045b7646abb2 Check stdata_len before accessing stdata. Fixes bug #1125
reimar
parents: 27110
diff changeset
685 return 0;
045b7646abb2 Check stdata_len before accessing stdata. Fixes bug #1125
reimar
parents: 27110
diff changeset
686 }
17283
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
687 version=char2short(trak->stdata,8);
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
688 if (version > 1)
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
689 mp_msg(MSGT_DEMUX, MSGL_WARN, "MOV: version %d sound atom may not parse correctly!\n", version);
14279
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
690 trak->samplebytes=sh->samplesize=char2short(trak->stdata,18)/8;
17283
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
691
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
692 /* I can't find documentation, but so far this is the case. -Corey */
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
693 switch (char2short(trak->stdata,16)) {
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
694 case 1:
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
695 trak->nchannels = 1; break;
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
696 case 2:
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
697 trak->nchannels = 2; break;
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
698 case 3:
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
699 trak->nchannels = 6; break;
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
700 default:
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
701 mp_msg(MSGT_DEMUX, MSGL_WARN,
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
702 "MOV: unable to determine audio channels, assuming 2 (got %d)\n",
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
703 char2short(trak->stdata,16));
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
704 trak->nchannels = 2;
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
705 }
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
706 sh->channels = trak->nchannels;
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
707
5212
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
708 /*printf("MOV: timescale: %d samplerate: %d durmap: %d (%d) -> %d (%d)\n",
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
709 trak->timescale, char2short(trak->stdata,24), trak->durmap[0].dur,
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
710 trak->durmap[0].num, trak->timescale/trak->durmap[0].dur,
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
711 char2short(trak->stdata,24)/trak->durmap[0].dur);*/
5206
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
712 sh->samplerate=char2short(trak->stdata,24);
22464
ba459e2e1187 Fix audio samplerates below 7000 Hz.
uau
parents: 22315
diff changeset
713 if((sh->samplerate < 7000) && trak->durmap && trak->durmap[0].dur > 1) {
5212
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
714 switch(char2short(trak->stdata,24)/trak->durmap[0].dur) {
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
715 // TODO: add more cases.
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
716 case 31:
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
717 sh->samplerate = 32000; break;
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
718 case 43:
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
719 sh->samplerate = 44100; break;
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
720 case 47:
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
721 sh->samplerate = 48000; break;
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
722 default:
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
723 mp_msg(MSGT_DEMUX, MSGL_WARN,
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
724 "MOV: unable to determine audio samplerate, "
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
725 "assuming 44.1kHz (got %d)\n",
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
726 char2short(trak->stdata,24)/trak->durmap[0].dur);
12f7cbbe7022 add alternative samplerate calculation for files with timescale\!=samplerate
atmos4
parents: 5206
diff changeset
727 sh->samplerate = 44100;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
728 }
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
729 }
14279
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
730 }
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
731 mp_msg(MSGT_DEMUX, MSGL_V, "Audio bits: %d chans: %d rate: %d\n",
14279
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
732 sh->samplesize*8,sh->channels,sh->samplerate);
6612
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
733
8003
6e48ba1cd342 pass audio codecdata
arpi
parents: 7759
diff changeset
734 if(trak->stdata_len >= 44 && trak->stdata[9]>=1){
6612
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
735 mp_msg(MSGT_DEMUX,MSGL_V,"Audio header: samp/pack=%d bytes/pack=%d bytes/frame=%d bytes/samp=%d \n",
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
736 char2int(trak->stdata,28),
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
737 char2int(trak->stdata,32),
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
738 char2int(trak->stdata,36),
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
739 char2int(trak->stdata,40));
8003
6e48ba1cd342 pass audio codecdata
arpi
parents: 7759
diff changeset
740 if(trak->stdata_len>=44+8){
6e48ba1cd342 pass audio codecdata
arpi
parents: 7759
diff changeset
741 int len=char2int(trak->stdata,44);
6e48ba1cd342 pass audio codecdata
arpi
parents: 7759
diff changeset
742 int fcc=char2int(trak->stdata,48);
6e48ba1cd342 pass audio codecdata
arpi
parents: 7759
diff changeset
743 // we have extra audio headers!!!
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
744 mp_msg(MSGT_DEMUX,MSGL_V,"Audio extra header: len=%d fcc=0x%X\n",len,fcc);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
745 if((len >= 4) &&
15022
17915d97622d Fix alac from QTpro (in standard mov file, not in m4a file)
rtognimp
parents: 14922
diff changeset
746 (char2int(trak->stdata,52) >= 12) &&
17858
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
747 (char2int(trak->stdata,52+4) == MOV_FOURCC('f','r','m','a'))) {
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
748 switch(char2int(trak->stdata,52+8)) {
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
749 case MOV_FOURCC('a','l','a','c'):
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
750 if (len >= 36 + char2int(trak->stdata,52)) {
15022
17915d97622d Fix alac from QTpro (in standard mov file, not in m4a file)
rtognimp
parents: 14922
diff changeset
751 sh->codecdata_len = char2int(trak->stdata,52+char2int(trak->stdata,52));
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
752 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found alac atom (%d)!\n", sh->codecdata_len);
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18958
diff changeset
753 sh->codecdata = malloc(sh->codecdata_len);
15022
17915d97622d Fix alac from QTpro (in standard mov file, not in m4a file)
rtognimp
parents: 14922
diff changeset
754 memcpy(sh->codecdata, &trak->stdata[52+char2int(trak->stdata,52)], sh->codecdata_len);
17858
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
755 }
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
756 break;
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
757 case MOV_FOURCC('i','n','2','4'):
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
758 case MOV_FOURCC('i','n','3','2'):
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
759 case MOV_FOURCC('f','l','3','2'):
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
760 case MOV_FOURCC('f','l','6','4'):
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
761 if ((len >= 22) &&
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
762 (char2int(trak->stdata,52+16)==MOV_FOURCC('e','n','d','a')) &&
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
763 (char2short(trak->stdata,52+20))) {
17860
d11c23749503 le2me_32 is not necessary, tested by Diego on BE machine
rathann
parents: 17858
diff changeset
764 sh->format=char2int(trak->stdata,52+8);
17858
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
765 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found little endian PCM data, reversed fourcc:%04x\n", sh->format);
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
766 }
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
767 break;
17982
c28298d1cbf7 Fix passing qdm2 extradata to lavc decoder
rtognimp
parents: 17932
diff changeset
768 default:
c28298d1cbf7 Fix passing qdm2 extradata to lavc decoder
rtognimp
parents: 17932
diff changeset
769 if (len > 8 && len + 44 <= trak->stdata_len) {
c28298d1cbf7 Fix passing qdm2 extradata to lavc decoder
rtognimp
parents: 17932
diff changeset
770 sh->codecdata_len = len-8;
25630
bdb0a9df0025 Codecdata must always be malloc'd, fixes free being called with an
reimar
parents: 25360
diff changeset
771 sh->codecdata = malloc(sh->codecdata_len);
bdb0a9df0025 Codecdata must always be malloc'd, fixes free being called with an
reimar
parents: 25360
diff changeset
772 memcpy(sh->codecdata, trak->stdata+44+8, sh->codecdata_len);
17982
c28298d1cbf7 Fix passing qdm2 extradata to lavc decoder
rtognimp
parents: 17932
diff changeset
773 }
17858
996e419c1671 in24/in32/fl32 little/big-endian QuickTime PCM audio support
rathann
parents: 17756
diff changeset
774 }
15022
17915d97622d Fix alac from QTpro (in standard mov file, not in m4a file)
rtognimp
parents: 14922
diff changeset
775 } else {
16679
66ce674de624 10l, off by one error in last patch (codecdata length sanity check),
reimar
parents: 16613
diff changeset
776 if (len > 8 && len + 44 <= trak->stdata_len) {
8003
6e48ba1cd342 pass audio codecdata
arpi
parents: 7759
diff changeset
777 sh->codecdata_len = len-8;
25630
bdb0a9df0025 Codecdata must always be malloc'd, fixes free being called with an
reimar
parents: 25360
diff changeset
778 sh->codecdata = malloc(sh->codecdata_len);
bdb0a9df0025 Codecdata must always be malloc'd, fixes free being called with an
reimar
parents: 25360
diff changeset
779 memcpy(sh->codecdata, trak->stdata+44+8, sh->codecdata_len);
16611
9574fb378080 Sanity-check codecdata_len, fixes crash in libfaad due to failed malloc for
reimar
parents: 16496
diff changeset
780 }
15022
17915d97622d Fix alac from QTpro (in standard mov file, not in m4a file)
rtognimp
parents: 14922
diff changeset
781 }
8003
6e48ba1cd342 pass audio codecdata
arpi
parents: 7759
diff changeset
782 }
6e48ba1cd342 pass audio codecdata
arpi
parents: 7759
diff changeset
783 }
6612
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
784
17283
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
785 switch (version) {
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
786 case 0:
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
787 adjust = 0; break;
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
788 case 1:
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
789 adjust = 48; break;
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
790 case 2:
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
791 adjust = 68; break;
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
792 default:
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
793 mp_msg(MSGT_DEMUX, MSGL_WARN, "MOV: unknown sound atom version (%d); may not work!\n", version);
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
794 adjust = 68;
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
795 }
4fea216307d2 Partial support for QuickTime sound atom version 2.
corey
parents: 17012
diff changeset
796 if (trak->stdata_len >= 36 + adjust) {
9590
ad8223e04c4f Animatrix AAC fix, patch by <dimakar(at)yahoo.com>. (This is the right patch)
rtognimp
parents: 9575
diff changeset
797 int atom_len = char2int(trak->stdata,28+adjust);
27232
606f30477d18 Add atom_len sanity check to mov demuxer.
reimar
parents: 27231
diff changeset
798 if (atom_len < 0 || atom_len > trak->stdata_len - 28 - adjust) atom_len = trak->stdata_len - 28 - adjust;
9590
ad8223e04c4f Animatrix AAC fix, patch by <dimakar(at)yahoo.com>. (This is the right patch)
rtognimp
parents: 9575
diff changeset
799 switch(char2int(trak->stdata,32+adjust)) { // atom type
5301
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5257
diff changeset
800 case MOV_FOURCC('e','s','d','s'): {
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
801 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found MPEG4 audio Elementary Stream Descriptor atom (%d)!\n", atom_len);
5307
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
802 if(atom_len > 8) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
803 esds_t esds;
9590
ad8223e04c4f Animatrix AAC fix, patch by <dimakar(at)yahoo.com>. (This is the right patch)
rtognimp
parents: 9575
diff changeset
804 if(!mp4_parse_esds(&trak->stdata[36+adjust], atom_len-8, &esds)) {
19363
2e3981fa938c Add support for 13k Voice (Qclp) in 3g2 files
rtogni
parents: 19343
diff changeset
805 /* 0xdd is a "user private" id, not an official allocated id (see http://www.mp4ra.org/object.html),
2e3981fa938c Add support for 13k Voice (Qclp) in 3g2 files
rtogni
parents: 19343
diff changeset
806 so perform some extra checks to be sure that this is really vorbis audio */
2e3981fa938c Add support for 13k Voice (Qclp) in 3g2 files
rtogni
parents: 19343
diff changeset
807 if(esds.objectTypeId==0xdd && esds.streamType==0x15 && sh->format==0x6134706D && esds.decoderConfigLen > 8)
18667
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
808 {
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
809 //vorbis audio
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
810 unsigned char *buf[3];
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
811 unsigned short sizes[3];
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
812 int offset, len, k;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
813 unsigned char *ptr = esds.decoderConfig;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
814
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
815 if(ptr[0] != 0 || ptr[1] != 30) goto quit_vorbis_block; //wrong extradata layout
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
816
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
817 offset = len = 0;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
818 for(k = 0; k < 3; k++)
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
819 {
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
820 sizes[k] = (ptr[offset]<<8) | ptr[offset+1];
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
821 len += sizes[k];
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
822 offset += 2;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
823 if(offset + sizes[k] > esds.decoderConfigLen)
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
824 {
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
825 mp_msg(MSGT_DEMUX, MSGL_FATAL, "MOV: ERROR!, not enough vorbis extradata to read: offset = %d, k=%d, size=%d, len: %d\n", offset, k, sizes[k], esds.decoderConfigLen);
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
826 goto quit_vorbis_block;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
827 }
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
828 buf[k] = malloc(sizes[k]);
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
829 if(!buf[k]) goto quit_vorbis_block;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
830 memcpy(buf[k], &ptr[offset], sizes[k]);
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
831 offset += sizes[k];
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
832 }
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
833
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
834 sh->codecdata_len = len + len/255 + 64;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
835 sh->codecdata = malloc(sh->codecdata_len);
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
836 ptr = sh->codecdata;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
837
18667
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
838 ptr[0] = 2;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
839 offset = 1;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
840 offset += store_ughvlc(&ptr[offset], sizes[0]);
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
841 offset += store_ughvlc(&ptr[offset], sizes[1]);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
842 for(k = 0; k < 3; k++)
18667
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
843 {
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
844 memcpy(&ptr[offset], buf[k], sizes[k]);
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
845 offset += sizes[k];
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
846 }
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
847
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
848 sh->codecdata_len = offset;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
849 sh->codecdata = realloc(sh->codecdata, offset);
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
850 mp_msg(MSGT_DEMUX,MSGL_V, "demux_mov, vorbis extradata size: %d\n", offset);
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
851 is_vorbis = 1;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
852 quit_vorbis_block:
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
853 sh->format = mmioFOURCC('v', 'r', 'b', 's');
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
854 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
855 sh->i_bps = esds.avgBitrate/8;
5301
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5257
diff changeset
856
6928
668ab67dce8f support for .mp4 with .mp3 audio
arpi
parents: 6865
diff changeset
857 // printf("######## audio format = %d ########\n",esds.objectTypeId);
13954
7dfda76015c8 Extended support for other object type IDs in the ESDS. This enables e.g. MPEG2 video in the MP4 container.
mosu
parents: 13333
diff changeset
858 if(esds.objectTypeId==MP4OTI_MPEG1Audio || esds.objectTypeId==MP4OTI_MPEG2AudioPart3)
6928
668ab67dce8f support for .mp4 with .mp3 audio
arpi
parents: 6865
diff changeset
859 sh->format=0x55; // .mp3
668ab67dce8f support for .mp4 with .mp3 audio
arpi
parents: 6865
diff changeset
860
19363
2e3981fa938c Add support for 13k Voice (Qclp) in 3g2 files
rtogni
parents: 19343
diff changeset
861 if(esds.objectTypeId==MP4OTI_13kVoice) { // 13K Voice, defined by 3GPP2
2e3981fa938c Add support for 13k Voice (Qclp) in 3g2 files
rtogni
parents: 19343
diff changeset
862 sh->format=mmioFOURCC('Q', 'c', 'l', 'p');
2e3981fa938c Add support for 13k Voice (Qclp) in 3g2 files
rtogni
parents: 19343
diff changeset
863 trak->nchannels=sh->channels=1;
2e3981fa938c Add support for 13k Voice (Qclp) in 3g2 files
rtogni
parents: 19343
diff changeset
864 trak->samplebytes=sh->samplesize=1;
2e3981fa938c Add support for 13k Voice (Qclp) in 3g2 files
rtogni
parents: 19343
diff changeset
865 }
2e3981fa938c Add support for 13k Voice (Qclp) in 3g2 files
rtogni
parents: 19343
diff changeset
866
5301
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5257
diff changeset
867 // dump away the codec specific configuration for the AAC decoder
6928
668ab67dce8f support for .mp4 with .mp3 audio
arpi
parents: 6865
diff changeset
868 if(esds.decoderConfigLen){
14706
127c30674725 Mp3On4 demuxer support
rtognimp
parents: 14581
diff changeset
869 if( (esds.decoderConfig[0]>>3) == 29 )
127c30674725 Mp3On4 demuxer support
rtognimp
parents: 14581
diff changeset
870 sh->format = 0x1d61346d; // request multi-channel mp3 decoder
18667
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
871 if(!is_vorbis)
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
872 {
5305
77ac28af44ec - Add parsing of Sync Layer Descriptor
atmos4
parents: 5303
diff changeset
873 sh->codecdata_len = esds.decoderConfigLen;
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18958
diff changeset
874 sh->codecdata = malloc(sh->codecdata_len);
5305
77ac28af44ec - Add parsing of Sync Layer Descriptor
atmos4
parents: 5303
diff changeset
875 memcpy(sh->codecdata, esds.decoderConfig, sh->codecdata_len);
6928
668ab67dce8f support for .mp4 with .mp3 audio
arpi
parents: 6865
diff changeset
876 }
18667
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
877 }
5301
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5257
diff changeset
878 }
5305
77ac28af44ec - Add parsing of Sync Layer Descriptor
atmos4
parents: 5303
diff changeset
879 mp4_free_esds(&esds); // freeup esds mem
5301
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5257
diff changeset
880 #if 0
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5257
diff changeset
881 { FILE* f=fopen("esds.dat","wb");
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5257
diff changeset
882 fwrite(&trak->stdata[36],atom_len-8,1,f);
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5257
diff changeset
883 fclose(f); }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
884 #endif
5301
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5257
diff changeset
885 }
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5257
diff changeset
886 } break;
14922
ed06939c5217 alac support via lavc decoder
rtognimp
parents: 14877
diff changeset
887 case MOV_FOURCC('a','l','a','c'): {
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
888 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found alac atom (%d)!\n", atom_len);
14922
ed06939c5217 alac support via lavc decoder
rtognimp
parents: 14877
diff changeset
889 if(atom_len > 8) {
ed06939c5217 alac support via lavc decoder
rtognimp
parents: 14877
diff changeset
890 // copy all the atom (not only payload) for lavc alac decoder
ed06939c5217 alac support via lavc decoder
rtognimp
parents: 14877
diff changeset
891 sh->codecdata_len = atom_len;
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18958
diff changeset
892 sh->codecdata = malloc(sh->codecdata_len);
14922
ed06939c5217 alac support via lavc decoder
rtognimp
parents: 14877
diff changeset
893 memcpy(sh->codecdata, &trak->stdata[28], sh->codecdata_len);
ed06939c5217 alac support via lavc decoder
rtognimp
parents: 14877
diff changeset
894 }
ed06939c5217 alac support via lavc decoder
rtognimp
parents: 14877
diff changeset
895 } break;
15356
94ff994b4f37 Decode "d263" and "damr" atoms in 3gp files
rtognimp
parents: 15286
diff changeset
896 case MOV_FOURCC('d','a','m','r'):
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
897 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found AMR audio atom %c%c%c%c (%d)!\n", trak->stdata[32+adjust],trak->stdata[33+adjust],trak->stdata[34+adjust],trak->stdata[35+adjust], atom_len);
15356
94ff994b4f37 Decode "d263" and "damr" atoms in 3gp files
rtognimp
parents: 15286
diff changeset
898 if (atom_len>14) {
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
899 mp_msg(MSGT_DEMUX, MSGL_V, "mov: vendor: %c%c%c%c Version: %d\n",trak->stdata[36+adjust],trak->stdata[37+adjust],trak->stdata[38+adjust], trak->stdata[39+adjust],trak->stdata[40+adjust]);
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
900 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Modes set: %02x%02x\n",trak->stdata[41+adjust],trak->stdata[42+adjust]);
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
901 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Mode change period: %d Frames per sample: %d\n",trak->stdata[43+adjust],trak->stdata[44+adjust]);
15356
94ff994b4f37 Decode "d263" and "damr" atoms in 3gp files
rtognimp
parents: 15286
diff changeset
902 }
94ff994b4f37 Decode "d263" and "damr" atoms in 3gp files
rtognimp
parents: 15286
diff changeset
903 break;
5206
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
904 default:
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
905 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found unknown audio atom %c%c%c%c (%d)!\n",
9590
ad8223e04c4f Animatrix AAC fix, patch by <dimakar(at)yahoo.com>. (This is the right patch)
rtognimp
parents: 9575
diff changeset
906 trak->stdata[32+adjust],trak->stdata[33+adjust],trak->stdata[34+adjust],trak->stdata[35+adjust],
5206
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
907 atom_len);
2ca5a9bfaa98 allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header
atmos4
parents: 5085
diff changeset
908 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
909 }
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
910 mp_msg(MSGT_DEMUX, MSGL_V, "Fourcc: %.4s\n",(char *)&trak->fourcc);
2543
a28b5e54f5a6 cbr audio fix
arpi
parents: 2542
diff changeset
911 #if 0
a28b5e54f5a6 cbr audio fix
arpi
parents: 2542
diff changeset
912 { FILE* f=fopen("stdata.dat","wb");
a28b5e54f5a6 cbr audio fix
arpi
parents: 2542
diff changeset
913 fwrite(trak->stdata,trak->stdata_len,1,f);
a28b5e54f5a6 cbr audio fix
arpi
parents: 2542
diff changeset
914 fclose(f); }
a28b5e54f5a6 cbr audio fix
arpi
parents: 2542
diff changeset
915 { FILE* f=fopen("tkdata.dat","wb");
a28b5e54f5a6 cbr audio fix
arpi
parents: 2542
diff changeset
916 fwrite(trak->tkdata,trak->tkdata_len,1,f);
a28b5e54f5a6 cbr audio fix
arpi
parents: 2542
diff changeset
917 fclose(f); }
a28b5e54f5a6 cbr audio fix
arpi
parents: 2542
diff changeset
918 #endif
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
919 // Emulate WAVEFORMATEX struct:
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 32102
diff changeset
920 sh->wf=calloc(1, sizeof(*sh->wf) + (is_vorbis ? sh->codecdata_len : 0));
14279
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
921 sh->wf->nChannels=sh->channels;
2543
a28b5e54f5a6 cbr audio fix
arpi
parents: 2542
diff changeset
922 sh->wf->wBitsPerSample=(trak->stdata[18]<<8)+trak->stdata[19];
a28b5e54f5a6 cbr audio fix
arpi
parents: 2542
diff changeset
923 // sh->wf->nSamplesPerSec=trak->timescale;
15357
9bebc73be6fa Fix audio playback for no-sound-3gp.3gp (amr nb)
rtognimp
parents: 15356
diff changeset
924 sh->wf->nSamplesPerSec=sh->samplerate;
8061
dc7565b29e0a fix possible sig8 - found by Alex
arpi
parents: 8009
diff changeset
925 if(trak->stdata_len >= 44 && trak->stdata[9]>=1 && char2int(trak->stdata,28)>0){
8009
302708769c69 set up nBlockAlign, nBytesPerSec correctly if extended audio header avail.
arpi
parents: 8003
diff changeset
926 //Audio header: samp/pack=4096 bytes/pack=743 bytes/frame=1486 bytes/samp=2
302708769c69 set up nBlockAlign, nBytesPerSec correctly if extended audio header avail.
arpi
parents: 8003
diff changeset
927 sh->wf->nAvgBytesPerSec=(sh->wf->nChannels*sh->wf->nSamplesPerSec*
302708769c69 set up nBlockAlign, nBytesPerSec correctly if extended audio header avail.
arpi
parents: 8003
diff changeset
928 char2int(trak->stdata,32)+char2int(trak->stdata,28)/2)
302708769c69 set up nBlockAlign, nBytesPerSec correctly if extended audio header avail.
arpi
parents: 8003
diff changeset
929 /char2int(trak->stdata,28);
302708769c69 set up nBlockAlign, nBytesPerSec correctly if extended audio header avail.
arpi
parents: 8003
diff changeset
930 sh->wf->nBlockAlign=char2int(trak->stdata,36);
302708769c69 set up nBlockAlign, nBytesPerSec correctly if extended audio header avail.
arpi
parents: 8003
diff changeset
931 } else {
302708769c69 set up nBlockAlign, nBytesPerSec correctly if extended audio header avail.
arpi
parents: 8003
diff changeset
932 sh->wf->nAvgBytesPerSec=sh->wf->nChannels*sh->wf->wBitsPerSample*sh->wf->nSamplesPerSec/8;
8105
057c9c3f3312 workaround for ms11 ima4
alex
parents: 8061
diff changeset
933 // workaround for ms11 ima4
057c9c3f3312 workaround for ms11 ima4
alex
parents: 8061
diff changeset
934 if (sh->format == 0x1100736d && trak->stdata_len >= 36)
057c9c3f3312 workaround for ms11 ima4
alex
parents: 8061
diff changeset
935 sh->wf->nBlockAlign=char2int(trak->stdata,36);
8009
302708769c69 set up nBlockAlign, nBytesPerSec correctly if extended audio header avail.
arpi
parents: 8003
diff changeset
936 }
18667
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
937
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
938 if(is_vorbis && sh->codecdata_len)
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
939 {
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
940 memcpy(sh->wf+1, sh->codecdata, sh->codecdata_len);
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
941 sh->wf->cbSize = sh->codecdata_len;
495142cba779 support for vorbis in mp4/mov
nicodvb
parents: 18583
diff changeset
942 }
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
943 // Selection:
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
944 // if(demuxer->audio->id==-1 || demuxer->audio->id==priv->track_db){
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
945 // // (auto)selected audio track:
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
946 // demuxer->audio->id=priv->track_db;
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
947 // demuxer->audio->sh=sh; sh->ds=demuxer->audio;
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
948 // }
24182
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
949 return 1;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
950 }
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
951
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
952 static int gen_sh_video(sh_video_t* sh, mov_track_t* trak, int timescale) {
23089
7b313a20939f Declarations and code should not be mixed.
diego
parents: 23010
diff changeset
953 int depth, i, entry;
10796
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
954 int flag, start, count_flag, end, palette_count, gray;
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
955 int hdr_ptr = 76; // the byte just after depth
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
956 unsigned char *palette_map;
25359
4bb08145bf66 Set correct image format for 24bit "raw " in mov files.
cehoyos
parents: 24358
diff changeset
957
25360
574ff7687644 Cosmetics: Fix indentation.
cehoyos
parents: 25359
diff changeset
958 sh->format=trak->fourcc;
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
959
19170
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
960 // crude video delay from editlist0 hack ::atm
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
961 if(trak->editlist_size>=1) {
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
962 if(trak->editlist[0].pos == -1) {
24182
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
963 sh->stream_delay = (float)trak->editlist[0].dur/(float)timescale;
19170
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
964 mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Initial Video-Delay: %.3f sec\n", sh->stream_delay);
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
965 }
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
966 }
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
967
7e689bb31c07 Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
atmos4
parents: 19062
diff changeset
968
15949
0ad9bf13b72b Add missing range/length check for video trak desc (fixes bug #335).
reimar
parents: 15948
diff changeset
969 if (trak->stdata_len < 78) {
0ad9bf13b72b Add missing range/length check for video trak desc (fixes bug #335).
reimar
parents: 15948
diff changeset
970 mp_msg(MSGT_DEMUXER, MSGL_WARN,
0ad9bf13b72b Add missing range/length check for video trak desc (fixes bug #335).
reimar
parents: 15948
diff changeset
971 "MOV: Invalid (%d bytes instead of >= 78) video trak desc\n",
0ad9bf13b72b Add missing range/length check for video trak desc (fixes bug #335).
reimar
parents: 15948
diff changeset
972 trak->stdata_len);
24182
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
973 return 0;
15949
0ad9bf13b72b Add missing range/length check for video trak desc (fixes bug #335).
reimar
parents: 15948
diff changeset
974 }
27110
f83be44e1faf Do not use stdata before checking its length
reimar
parents: 26217
diff changeset
975
f83be44e1faf Do not use stdata before checking its length
reimar
parents: 26217
diff changeset
976 depth = trak->stdata[75] | (trak->stdata[74] << 8);
f83be44e1faf Do not use stdata before checking its length
reimar
parents: 26217
diff changeset
977 if (trak->fourcc == mmioFOURCC('r', 'a', 'w', ' '))
f83be44e1faf Do not use stdata before checking its length
reimar
parents: 26217
diff changeset
978 sh->format = IMGFMT_RGB | depth;
f83be44e1faf Do not use stdata before checking its length
reimar
parents: 26217
diff changeset
979
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
980 // stdata[]:
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
981 // 8 short version
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
982 // 10 short revision
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
983 // 12 int vendor_id
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
984 // 16 int temporal_quality
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
985 // 20 int spatial_quality
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
986 // 24 short width
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
987 // 26 short height
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
988 // 28 int h_dpi
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
989 // 32 int v_dpi
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
990 // 36 int 0
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
991 // 40 short frames_per_sample
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
992 // 42 char[4] compressor_name
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
993 // 74 short depth
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
994 // 76 short color_table_id
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
995 // additional atoms may follow,
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
996 // eg esds atom from .MP4 files
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
997 // 78 int atom size
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
998 // 82 char[4] atom type
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
999 // 86 ... atom data
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
1000
18444
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1001 { ImageDescription* id=malloc(8+trak->stdata_len); // safe
5372
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1002 trak->desc=id;
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1003 id->idSize=8+trak->stdata_len;
10087
a4b17539f908 ffsvq3 fix, dunno if this is the correct fix
michael
parents: 9951
diff changeset
1004 // id->cType=bswap_32(trak->fourcc);
a4b17539f908 ffsvq3 fix, dunno if this is the correct fix
michael
parents: 9951
diff changeset
1005 id->cType=le2me_32(trak->fourcc);
5372
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1006 id->version=char2short(trak->stdata,8);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1007 id->revisionLevel=char2short(trak->stdata,10);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1008 id->vendor=char2int(trak->stdata,12);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1009 id->temporalQuality=char2int(trak->stdata,16);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1010 id->spatialQuality=char2int(trak->stdata,20);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1011 id->width=char2short(trak->stdata,24);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1012 id->height=char2short(trak->stdata,26);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1013 id->hRes=char2int(trak->stdata,28);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1014 id->vRes=char2int(trak->stdata,32);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1015 id->dataSize=char2int(trak->stdata,36);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1016 id->frameCount=char2short(trak->stdata,40);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1017 memcpy(&id->name,trak->stdata+42,32);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1018 id->depth=char2short(trak->stdata,74);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1019 id->clutID=char2short(trak->stdata,76);
8314
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
1020 if(trak->stdata_len>78) memcpy(((char*)&id->clutID)+2,trak->stdata+78,trak->stdata_len-78);
8158
bffdd162d034 export imagedescription for qt video codecs
arpi
parents: 8105
diff changeset
1021 sh->ImageDesc=id;
bffdd162d034 export imagedescription for qt video codecs
arpi
parents: 8105
diff changeset
1022 #if 0
5372
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1023 { FILE *f=fopen("ImageDescription","wb");
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1024 fwrite(id,id->idSize,1,f);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1025 fclose(f);
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1026 }
8158
bffdd162d034 export imagedescription for qt video codecs
arpi
parents: 8105
diff changeset
1027 #endif
5372
ee9dd55ef383 some under-devel code, will be required for qtx codecs
arpi
parents: 5307
diff changeset
1028 }
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1029
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1030 if(trak->stdata_len >= 86) { // extra atoms found
5250
e26352c3fa9b support multiple video header extension chunks
arpi
parents: 5243
diff changeset
1031 int pos=78;
5251
arpi
parents: 5250
diff changeset
1032 int atom_len;
5250
e26352c3fa9b support multiple video header extension chunks
arpi
parents: 5243
diff changeset
1033 while(pos+8<=trak->stdata_len &&
e26352c3fa9b support multiple video header extension chunks
arpi
parents: 5243
diff changeset
1034 (pos+(atom_len=char2int(trak->stdata,pos)))<=trak->stdata_len){
e26352c3fa9b support multiple video header extension chunks
arpi
parents: 5243
diff changeset
1035 switch(char2int(trak->stdata,pos+4)) { // switch atom type
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1036 case MOV_FOURCC('g','a','m','a'):
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1037 // intfp with gamma value at which movie was captured
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1038 // can be used to gamma correct movie display
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1039 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found unsupported Gamma-Correction movie atom (%d)!\n",
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1040 atom_len);
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1041 break;
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1042 case MOV_FOURCC('f','i','e','l'):
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1043 // 2 char-values (8bit int) that specify field handling
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1044 // see the Apple's QuickTime Fileformat PDF for more info
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1045 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found unsupported Field-Handling movie atom (%d)!\n",
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1046 atom_len);
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1047 break;
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1048 case MOV_FOURCC('m','j','q','t'):
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1049 // Motion-JPEG default quantization table
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1050 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found unsupported MJPEG-Quantization movie atom (%d)!\n",
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1051 atom_len);
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1052 break;
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1053 case MOV_FOURCC('m','j','h','t'):
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1054 // Motion-JPEG default huffman table
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1055 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found unsupported MJPEG-Huffman movie atom (%d)!\n",
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1056 atom_len);
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1057 break;
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1058 case MOV_FOURCC('e','s','d','s'):
5242
d4ffcbe9ed3d Recognize and skip ftype chunk used by some .mp4 files and
atmos4
parents: 5241
diff changeset
1059 // MPEG4 Elementary Stream Descriptor header
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1060 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found MPEG4 movie Elementary Stream Descriptor atom (%d)!\n", atom_len);
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1061 // add code here to save esds header of length atom_len-8
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1062 // beginning at stdata[86] to some variable to pass it
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1063 // on to the decoder ::atmos
5307
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
1064 if(atom_len > 8) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1065 esds_t esds;
5307
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
1066 if(!mp4_parse_esds(trak->stdata+pos+8, atom_len-8, &esds)) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1067
13954
7dfda76015c8 Extended support for other object type IDs in the ESDS. This enables e.g. MPEG2 video in the MP4 container.
mosu
parents: 13333
diff changeset
1068 if(esds.objectTypeId==MP4OTI_MPEG2VisualSimple || esds.objectTypeId==MP4OTI_MPEG2VisualMain ||
7dfda76015c8 Extended support for other object type IDs in the ESDS. This enables e.g. MPEG2 video in the MP4 container.
mosu
parents: 13333
diff changeset
1069 esds.objectTypeId==MP4OTI_MPEG2VisualSNR || esds.objectTypeId==MP4OTI_MPEG2VisualSpatial ||
7dfda76015c8 Extended support for other object type IDs in the ESDS. This enables e.g. MPEG2 video in the MP4 container.
mosu
parents: 13333
diff changeset
1070 esds.objectTypeId==MP4OTI_MPEG2VisualHigh || esds.objectTypeId==MP4OTI_MPEG2Visual422)
7dfda76015c8 Extended support for other object type IDs in the ESDS. This enables e.g. MPEG2 video in the MP4 container.
mosu
parents: 13333
diff changeset
1071 sh->format=mmioFOURCC('m', 'p', 'g', '2');
7dfda76015c8 Extended support for other object type IDs in the ESDS. This enables e.g. MPEG2 video in the MP4 container.
mosu
parents: 13333
diff changeset
1072 else if(esds.objectTypeId==MP4OTI_MPEG1Visual)
7dfda76015c8 Extended support for other object type IDs in the ESDS. This enables e.g. MPEG2 video in the MP4 container.
mosu
parents: 13333
diff changeset
1073 sh->format=mmioFOURCC('m', 'p', 'g', '1');
7dfda76015c8 Extended support for other object type IDs in the ESDS. This enables e.g. MPEG2 video in the MP4 container.
mosu
parents: 13333
diff changeset
1074
5307
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
1075 // dump away the codec specific configuration for the AAC decoder
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
1076 trak->stream_header_len = esds.decoderConfigLen;
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18958
diff changeset
1077 trak->stream_header = malloc(trak->stream_header_len);
5307
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
1078 memcpy(trak->stream_header, esds.decoderConfig, trak->stream_header_len);
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
1079 }
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
1080 mp4_free_esds(&esds); // freeup esds mem
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1081 }
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1082 break;
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1083 case MOV_FOURCC('a','v','c','C'):
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1084 // AVC decoder configuration record
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1085 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: AVC decoder configuration record atom (%d)!\n", atom_len);
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1086 if(atom_len > 8) {
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1087 int i, poffs, cnt;
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1088 // Parse some parts of avcC, just for fun :)
13333
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1089 // real parsing is done by avc1 decoder
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1090 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: avcC version: %d\n", *(trak->stdata+pos+8));
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1091 if (*(trak->stdata+pos+8) != 1)
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1092 mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: unknown avcC version (%d). Expexct problems.\n", *(trak->stdata+pos+9));
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1093 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: avcC profile: %d\n", *(trak->stdata+pos+9));
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1094 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: avcC profile compatibility: %d\n", *(trak->stdata+pos+10));
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1095 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: avcC level: %d\n", *(trak->stdata+pos+11));
13333
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1096 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: avcC nal length size: %d\n", ((*(trak->stdata+pos+12))&0x03)+1);
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1097 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: avcC number of sequence param sets: %d\n", cnt = (*(trak->stdata+pos+13) & 0x1f));
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1098 poffs = pos + 14;
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1099 for (i = 0; i < cnt; i++) {
25931
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
1100 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: avcC sps %d have length %d\n", i, AV_RB16(trak->stdata+poffs));
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
1101 poffs += AV_RB16(trak->stdata+poffs) + 2;
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1102 }
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1103 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: avcC number of picture param sets: %d\n", *(trak->stdata+poffs));
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1104 poffs++;
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1105 for (i = 0; i < cnt; i++) {
25931
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
1106 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: avcC pps %d have length %d\n", i, AV_RB16(trak->stdata+poffs));
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
1107 poffs += AV_RB16(trak->stdata+poffs) + 2;
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1108 }
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1109 // Copy avcC for the AVC decoder
13333
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1110 // This data will be put in extradata below, where BITMAPINFOHEADER is created
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1111 trak->stream_header_len = atom_len-8;
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18958
diff changeset
1112 trak->stream_header = malloc(trak->stream_header_len);
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1113 memcpy(trak->stream_header, trak->stdata+pos+8, trak->stream_header_len);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1114 }
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 12708
diff changeset
1115 break;
15356
94ff994b4f37 Decode "d263" and "damr" atoms in 3gp files
rtognimp
parents: 15286
diff changeset
1116 case MOV_FOURCC('d','2','6','3'):
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1117 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found H.263 decoder atom %c%c%c%c (%d)!\n", trak->stdata[pos+4],trak->stdata[pos+5],trak->stdata[pos+6],trak->stdata[pos+7],atom_len);
15356
94ff994b4f37 Decode "d263" and "damr" atoms in 3gp files
rtognimp
parents: 15286
diff changeset
1118 if (atom_len>10)
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1119 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Vendor: %c%c%c%c H.263 level: %d H.263 profile: %d \n", trak->stdata[pos+8],trak->stdata[pos+9],trak->stdata[pos+10],trak->stdata[pos+11],trak->stdata[pos+12],trak->stdata[pos+13]);
15356
94ff994b4f37 Decode "d263" and "damr" atoms in 3gp files
rtognimp
parents: 15286
diff changeset
1120 break;
6655
9eefcaf88e56 fixed endless 'unknown chunk' and doublespeed ima4 audio bugs
arpi
parents: 6612
diff changeset
1121 case 0:
9eefcaf88e56 fixed endless 'unknown chunk' and doublespeed ima4 audio bugs
arpi
parents: 6612
diff changeset
1122 break;
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1123 default:
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1124 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: Found unknown movie atom %c%c%c%c (%d)!\n",
5250
e26352c3fa9b support multiple video header extension chunks
arpi
parents: 5243
diff changeset
1125 trak->stdata[pos+4],trak->stdata[pos+5],trak->stdata[pos+6],trak->stdata[pos+7],
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1126 atom_len);
5250
e26352c3fa9b support multiple video header extension chunks
arpi
parents: 5243
diff changeset
1127 }
6655
9eefcaf88e56 fixed endless 'unknown chunk' and doublespeed ima4 audio bugs
arpi
parents: 6612
diff changeset
1128 if(atom_len<8) break;
5250
e26352c3fa9b support multiple video header extension chunks
arpi
parents: 5243
diff changeset
1129 pos+=atom_len;
5252
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
1130 // printf("pos=%d max=%d\n",pos,trak->stdata_len);
5236
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1131 }
f8a00b2c9c39 Add some atom parsing to movie trak and a bit cosmetics ;), Michael can now write esds movie header whereever he wants.
atmos4
parents: 5212
diff changeset
1132 }
5630
dfc219577da6 FPS calculation fixed
arpi
parents: 5628
diff changeset
1133 sh->fps=trak->timescale/
dfc219577da6 FPS calculation fixed
arpi
parents: 5628
diff changeset
1134 ((trak->durmap_size>=1)?(float)trak->durmap[0].dur:1);
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
1135 sh->frametime=1.0f/sh->fps;
5242
d4ffcbe9ed3d Recognize and skip ftype chunk used by some .mp4 files and
atmos4
parents: 5241
diff changeset
1136
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
1137 sh->disp_w=trak->stdata[25]|(trak->stdata[24]<<8);
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
1138 sh->disp_h=trak->stdata[27]|(trak->stdata[26]<<8);
27233
8c5ec96a0bc7 Check size of tkdata before using it in mov demuxer.
reimar
parents: 27232
diff changeset
1139 if(trak->tkdata_len>81) {
27234
fe1be13f3aed Reindent after last commit
reimar
parents: 27233
diff changeset
1140 // if image size is zero, fallback to display size
fe1be13f3aed Reindent after last commit
reimar
parents: 27233
diff changeset
1141 if(!sh->disp_w && !sh->disp_h) {
fe1be13f3aed Reindent after last commit
reimar
parents: 27233
diff changeset
1142 sh->disp_w=trak->tkdata[77]|(trak->tkdata[76]<<8);
fe1be13f3aed Reindent after last commit
reimar
parents: 27233
diff changeset
1143 sh->disp_h=trak->tkdata[81]|(trak->tkdata[80]<<8);
fe1be13f3aed Reindent after last commit
reimar
parents: 27233
diff changeset
1144 } else if(sh->disp_w!=(trak->tkdata[77]|(trak->tkdata[76]<<8))){
fe1be13f3aed Reindent after last commit
reimar
parents: 27233
diff changeset
1145 // codec and display width differ... use display one for aspect
36316
139f2b064ef9 Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents: 35223
diff changeset
1146 sh->original_aspect=trak->tkdata[77]|(trak->tkdata[76]<<8);
139f2b064ef9 Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents: 35223
diff changeset
1147 sh->original_aspect/=trak->tkdata[81]|(trak->tkdata[80]<<8);
27234
fe1be13f3aed Reindent after last commit
reimar
parents: 27233
diff changeset
1148 }
27233
8c5ec96a0bc7 Check size of tkdata before using it in mov demuxer.
reimar
parents: 27232
diff changeset
1149 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1150
18176
f72bc5754209 Part3 of Otvos Attila's oattila AT chello-hu mp_msg changes, with lots of modifications as usual
reynaldo
parents: 17982
diff changeset
1151 if(depth>32+8) mp_msg(MSGT_DEMUX, MSGL_INFO,"*** depth = 0x%X\n",depth);
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
1152
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1153 // palettized?
10796
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1154 gray = 0;
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1155 if (depth > 32) { depth&=31; gray = 1; } // depth > 32 means grayscale
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
1156 if ((depth == 2) || (depth == 4) || (depth == 8))
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
1157 palette_count = (1 << depth);
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1158 else
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1159 palette_count = 0;
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1160
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
1161 // emulate BITMAPINFOHEADER:
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1162 if (palette_count)
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1163 {
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 32102
diff changeset
1164 sh->bih=calloc(1, sizeof(*sh->bih) + palette_count * 4);
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1165 sh->bih->biSize=40 + palette_count * 4;
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1166 // fetch the relevant fields
25931
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
1167 flag = AV_RB16(&trak->stdata[hdr_ptr]);
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1168 hdr_ptr += 2;
25931
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
1169 start = AV_RB32(&trak->stdata[hdr_ptr]);
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1170 hdr_ptr += 4;
25931
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
1171 count_flag = AV_RB16(&trak->stdata[hdr_ptr]);
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1172 hdr_ptr += 2;
25931
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
1173 end = AV_RB16(&trak->stdata[hdr_ptr]);
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1174 hdr_ptr += 2;
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1175 palette_map = (unsigned char *)sh->bih + 40;
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1176 mp_msg(MSGT_DEMUX, MSGL_V, "Allocated %d entries for palette\n",
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1177 palette_count);
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1178 mp_msg(MSGT_DEMUX, MSGL_DBG2, "QT palette: start: %x, end: %x, count flag: %d, flags: %x\n",
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1179 start, end, count_flag, flag);
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1180
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1181 /* XXX: problems with sample (statunit6.mov) with flag&0x4 set! - alex*/
4332
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1182
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1183 // load default palette
4646
59eb588c7115 reinstated original palette decision logic from XAnim (was the QT spec
melanson
parents: 4645
diff changeset
1184 if (flag & 0x08)
4332
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1185 {
10796
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1186 if (gray)
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1187 {
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1188 mp_msg(MSGT_DEMUX, MSGL_V, "Using default QT grayscale palette\n");
10796
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1189 if (palette_count == 16)
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1190 memcpy(palette_map, qt_default_grayscale_palette_16, 16 * 4);
12708
a7e80ffdd89e Negate default palette for grayscale cvid
rtognimp
parents: 12651
diff changeset
1191 else if (palette_count == 256) {
10796
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1192 memcpy(palette_map, qt_default_grayscale_palette_256, 256 * 4);
12708
a7e80ffdd89e Negate default palette for grayscale cvid
rtognimp
parents: 12651
diff changeset
1193 if (trak->fourcc == mmioFOURCC('c','v','i','d')) {
a7e80ffdd89e Negate default palette for grayscale cvid
rtognimp
parents: 12651
diff changeset
1194 int i;
a7e80ffdd89e Negate default palette for grayscale cvid
rtognimp
parents: 12651
diff changeset
1195 // Hack for grayscale CVID, negative palette
a7e80ffdd89e Negate default palette for grayscale cvid
rtognimp
parents: 12651
diff changeset
1196 // If you have samples where this is not required contact me (rxt)
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1197 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: greyscale cvid with default palette,"
12708
a7e80ffdd89e Negate default palette for grayscale cvid
rtognimp
parents: 12651
diff changeset
1198 " enabling negative palette hack.\n");
a7e80ffdd89e Negate default palette for grayscale cvid
rtognimp
parents: 12651
diff changeset
1199 for (i = 0; i < 256 * 4; i++)
a7e80ffdd89e Negate default palette for grayscale cvid
rtognimp
parents: 12651
diff changeset
1200 palette_map[i] = palette_map[i] ^ 0xff;
a7e80ffdd89e Negate default palette for grayscale cvid
rtognimp
parents: 12651
diff changeset
1201 }
a7e80ffdd89e Negate default palette for grayscale cvid
rtognimp
parents: 12651
diff changeset
1202 }
10796
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1203 }
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1204 else
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1205 {
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1206 mp_msg(MSGT_DEMUX, MSGL_V, "Using default QT colour palette\n");
10796
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1207 if (palette_count == 4)
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1208 memcpy(palette_map, qt_default_palette_4, 4 * 4);
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1209 else if (palette_count == 16)
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1210 memcpy(palette_map, qt_default_palette_16, 16 * 4);
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1211 else if (palette_count == 256)
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1212 memcpy(palette_map, qt_default_palette_256, 256 * 4);
266bf4b596a3 Support for grayscale paletted files. Patch by Dima K <dimakar@yahoo.com>
mosu
parents: 10087
diff changeset
1213 }
4332
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1214 }
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1215 // load palette from file
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1216 else
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1217 {
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1218 mp_msg(MSGT_DEMUX, MSGL_V, "Loading palette from file\n");
4332
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1219 for (i = start; i <= end; i++)
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1220 {
25931
775b1e902c32 Use AV_RB*, reduces x86_64 code size by almost 1kB.
reimar
parents: 25893
diff changeset
1221 entry = AV_RB16(&trak->stdata[hdr_ptr]);
4332
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1222 hdr_ptr += 2;
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1223 // apparently, if count_flag is set, entry is same as i
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1224 if (count_flag & 0x8000)
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1225 entry = i;
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1226 // only care about top 8 bits of 16-bit R, G, or B value
35223
425467b5be98 Fix off-by-one error in range check.
reimar
parents: 32621
diff changeset
1227 if (entry < palette_count && entry >= 0)
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1228 {
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1229 palette_map[entry * 4 + 2] = trak->stdata[hdr_ptr + 0];
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1230 palette_map[entry * 4 + 1] = trak->stdata[hdr_ptr + 2];
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1231 palette_map[entry * 4 + 0] = trak->stdata[hdr_ptr + 4];
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1232 mp_dbg(MSGT_DEMUX, MSGL_DBG2, "QT palette: added entry: %d of %d (colors: R:%x G:%x B:%x)\n",
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1233 entry, palette_count,
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1234 palette_map[entry * 4 + 2],
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1235 palette_map[entry * 4 + 1],
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1236 palette_map[entry * 4 + 0]);
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1237 }
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1238 else
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1239 mp_msg(MSGT_DEMUX, MSGL_V, "QT palette: skipped entry (out of count): %d of %d\n",
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1240 entry, palette_count);
4332
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1241 hdr_ptr += 6;
ae889abf93cd QT demuxer now supports the default QT palettes
melanson
parents: 4129
diff changeset
1242 }
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1243 }
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1244 }
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1245 else
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1246 {
13333
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1247 if (trak->fourcc == mmioFOURCC('a','v','c','1')) {
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 32102
diff changeset
1248 if (trak->stream_header_len > 0xffffffff - sizeof(*sh->bih)) {
18491
20a1aa4c4e0c missing argument for mp_msg, fixes:
rathann
parents: 18444
diff changeset
1249 mp_msg(MSGT_DEMUXER, MSGL_ERR, "Invalid extradata size %d, skipping\n",trak->stream_header_len);
18444
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1250 trak->stream_header_len = 0;
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1251 }
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 32102
diff changeset
1252 sh->bih=calloc(1, sizeof(*sh->bih) + trak->stream_header_len);
13333
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1253 sh->bih->biSize=40 + trak->stream_header_len;
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1254 memcpy(((unsigned char *)sh->bih)+40, trak->stream_header, trak->stream_header_len);
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1255 free (trak->stream_header);
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1256 trak->stream_header_len = 0;
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1257 trak->stream_header = NULL;
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1258 } else {
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 32102
diff changeset
1259 sh->bih=calloc(1, sizeof(*sh->bih));
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1260 sh->bih->biSize=40;
13333
5d4910f6aa79 AVC support moved to libavcodec, avcC atom is now passed in extradata
rtognimp
parents: 13190
diff changeset
1261 }
4129
31cd2e0bb961 QT demuxer loads palette information from files that transport palettes in
melanson
parents: 3999
diff changeset
1262 }
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
1263 sh->bih->biWidth=sh->disp_w;
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
1264 sh->bih->biHeight=sh->disp_h;
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
1265 sh->bih->biPlanes=0;
3652
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
1266 sh->bih->biBitCount=depth;
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
1267 sh->bih->biCompression=trak->fourcc;
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
1268 sh->bih->biSizeImage=sh->bih->biWidth*sh->bih->biHeight;
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
1269
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1270 mp_msg(MSGT_DEMUX, MSGL_V, "Image size: %d x %d (%d bpp)\n",sh->disp_w,sh->disp_h,sh->bih->biBitCount);
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
1271 if(trak->tkdata_len>81)
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1272 mp_msg(MSGT_DEMUX, MSGL_V, "Display size: %d x %d\n",
5067
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
1273 trak->tkdata[77]|(trak->tkdata[76]<<8),
54fe37e1f1a7 some cleanup, fixes for video header parsing. finally we get the coded size instead of display size\!
arpi
parents: 4903
diff changeset
1274 trak->tkdata[81]|(trak->tkdata[80]<<8));
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1275 mp_msg(MSGT_DEMUX, MSGL_V, "Fourcc: %.4s Codec: '%.*s'\n",(char *)&trak->fourcc,trak->stdata[42]&31,trak->stdata+43);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1276
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1277 // if(demuxer->video->id==-1 || demuxer->video->id==priv->track_db){
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1278 // // (auto)selected video track:
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1279 // demuxer->video->id=priv->track_db;
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1280 // demuxer->video->sh=sh; sh->ds=demuxer->video;
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1281 // }
24182
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1282 return 1;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1283 }
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1284
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1285 static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak){
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1286 mov_priv_t* priv=demuxer->priv;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1287 // printf("lschunks (level=%d,endpos=%x)\n", level, endpos);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1288 while(1){
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1289 off_t pos;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1290 off_t len;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1291 unsigned int id;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1292 //
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1293 pos=stream_tell(demuxer->stream);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1294 // printf("stream_tell==%d\n",pos);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1295 if(pos>=endpos) return; // END
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1296 len=stream_read_dword(demuxer->stream);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1297 // printf("len==%d\n",len);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1298 if(len<8) return; // error
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1299 len-=8;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1300 id=stream_read_dword(demuxer->stream);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1301 //
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1302 mp_msg(MSGT_DEMUX,MSGL_DBG2,"lschunks %.4s %d\n",(char *)&id,(int)len);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1303 //
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1304 if(trak){
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1305 if (lschunks_intrak(demuxer, level, id, pos, len, trak) < 0)
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1306 return;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1307 } else { /* not in track */
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1308 switch(id) {
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1309 case MOV_FOURCC('m','v','h','d'): {
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1310 int version = stream_read_char(demuxer->stream);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1311 stream_skip(demuxer->stream, (version == 1) ? 19 : 11);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1312 priv->timescale=stream_read_dword(demuxer->stream);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1313 if (version == 1)
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1314 priv->duration=stream_read_qword(demuxer->stream);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1315 else
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1316 priv->duration=stream_read_dword(demuxer->stream);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1317 mp_msg(MSGT_DEMUX, MSGL_V,"MOV: %*sMovie header (%d bytes): tscale=%d dur=%d\n",level,"",(int)len,
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1318 (int)priv->timescale,(int)priv->duration);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1319 break;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1320 }
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1321 case MOV_FOURCC('t','r','a','k'): {
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1322 // if(trak) printf("MOV: Warning! trak in trak?\n");
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1323 if(priv->track_db>=MOV_MAX_TRACKS){
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1324 mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_MOVtooManyTrk);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1325 return;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1326 }
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1327 if(!priv->track_db) mp_msg(MSGT_DEMUX, MSGL_V, "--------------\n");
32102
52f920e9c540 Replace malloc+memset by calloc.
reimar
parents: 31609
diff changeset
1328 trak=calloc(1, sizeof(mov_track_t));
24182
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1329 mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Track #%d:\n",priv->track_db);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1330 trak->id=priv->track_db;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1331 priv->tracks[priv->track_db]=trak;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1332 lschunks(demuxer,level+1,pos+len,trak);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1333 mov_build_index(trak,priv->timescale);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1334 switch(trak->type){
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1335 case MOV_TRAK_AUDIO: {
31609
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 30580
diff changeset
1336 sh_audio_t* sh=new_sh_audio(demuxer,priv->track_db, NULL);
24182
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1337 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "mov", priv->track_db);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1338 gen_sh_audio(sh, trak, priv->timescale);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1339 break;
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1340 }
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1341 case MOV_TRAK_VIDEO: {
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1342 sh_video_t* sh=new_sh_video(demuxer,priv->track_db);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1343 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "mov", priv->track_db);
8d6ad131c010 Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
reimar
parents: 24172
diff changeset
1344 gen_sh_video(sh, trak, priv->timescale);
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
1345 break;
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
1346 }
2786
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1347 case MOV_TRAK_GENERIC:
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
1348 if (trak->fourcc == mmioFOURCC('m','p','4','s') ||
20976
99d7c6cb0f81 Pseudo-support for subtitles in http://samples.mplayerhq.hu/sub/jpn_engSUB_sample.3gp
reimar
parents: 20907
diff changeset
1349 trak->fourcc == mmioFOURCC('t','x','3','g') ||
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
1350 trak->fourcc == mmioFOURCC('t','e','x','t')) {
31609
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 30580
diff changeset
1351 sh_sub_t *sh = new_sh_sub(demuxer, priv->track_db, NULL);
23010
74efb0fa8a0b with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
nicodvb
parents: 22605
diff changeset
1352 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_SubtitleID, "mov", priv->track_db);
20979
7909e90e01c1 Try reading palette for vobsub
reimar
parents: 20976
diff changeset
1353 if (trak->fourcc == mmioFOURCC('m','p','4','s'))
7909e90e01c1 Try reading palette for vobsub
reimar
parents: 20976
diff changeset
1354 init_vobsub(sh, trak);
25855
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25845
diff changeset
1355 else {
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25845
diff changeset
1356 sh->type = 'm';
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25845
diff changeset
1357 sub_utf8 = 1;
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25845
diff changeset
1358 }
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
1359 } else
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1360 mp_msg(MSGT_DEMUX, MSGL_V, "Generic track - not completely understood! (id: %d)\n",
2786
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1361 trak->id);
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1362 /* XXX: Also this contains the FLASH data */
8314
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
1363
2786
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1364 #if 0
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1365 {
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1366 int pos = stream_tell(demuxer->stream);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1367 int i;
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1368 int fd;
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1369 char name[20];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1370
2786
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1371 for (i=0; i<trak->samples_size; i++)
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1372 {
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1373 char buf[trak->samples[i].size];
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1374 stream_seek(demuxer->stream, trak->samples[i].pos);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1375 snprintf((char *)&name[0], 20, "samp%d", i);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1376 fd = open((char *)&name[0], O_CREAT|O_WRONLY);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1377 stream_read(demuxer->stream, &buf[0], trak->samples[i].size);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1378 write(fd, &buf[0], trak->samples[i].size);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1379 close(fd);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1380 }
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1381 for (i=0; i<trak->chunks_size; i++)
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1382 {
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1383 char buf[trak->length];
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1384 stream_seek(demuxer->stream, trak->chunks[i].pos);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1385 snprintf((char *)&name[0], 20, "chunk%d", i);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1386 fd = open((char *)&name[0], O_CREAT|O_WRONLY);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1387 stream_read(demuxer->stream, &buf[0], trak->length);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1388 write(fd, &buf[0], trak->length);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1389 close(fd);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1390 }
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1391 if (trak->samplesize > 0)
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1392 {
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1393 char *buf;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1394
2786
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1395 buf = malloc(trak->samplesize);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1396 stream_seek(demuxer->stream, trak->chunks[0].pos);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1397 snprintf((char *)&name[0], 20, "trak%d", trak->id);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1398 fd = open((char *)&name[0], O_CREAT|O_WRONLY);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1399 stream_read(demuxer->stream, buf, trak->samplesize);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1400 write(fd, buf, trak->samplesize);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1401 close(fd);
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1402 }
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1403 stream_seek(demuxer->stream, pos);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1404 }
2786
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1405 #endif
1907e5771e81 added pre-flash detecting support ;)
alex
parents: 2555
diff changeset
1406 break;
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1407 default:
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1408 mp_msg(MSGT_DEMUX, MSGL_V, "Unknown track type found (type: %d)\n", trak->type);
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1409 break;
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
1410 }
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1411 mp_msg(MSGT_DEMUX, MSGL_V, "--------------\n");
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
1412 priv->track_db++;
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1413 trak=NULL;
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1414 break;
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1415 }
28440
2218218264cb Convert CONFIG_ZLIB into a 0/1 option.
diego
parents: 27388
diff changeset
1416 #if !CONFIG_ZLIB
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1417 case MOV_FOURCC('c','m','o','v'): {
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1567
diff changeset
1418 mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVcomprhdr);
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1419 return;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1420 }
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1421 #else
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1422 case MOV_FOURCC('m','o','o','v'):
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1423 case MOV_FOURCC('c','m','o','v'): {
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1424 // mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVcomprhdr);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1425 lschunks(demuxer,level+1,pos+len,NULL);
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1426 break;
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1427 }
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1428 case MOV_FOURCC('d','c','o','m'): {
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1429 // int temp=stream_read_dword(demuxer->stream);
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1430 unsigned int algo=be2me_32(stream_read_dword(demuxer->stream));
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1431 mp_msg(MSGT_DEMUX, MSGL_V, "Compressed header uses %.4s algo!\n",(char *)&algo);
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1432 break;
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1433 }
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1434 case MOV_FOURCC('c','m','v','d'): {
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1435 // int temp=stream_read_dword(demuxer->stream);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1436 unsigned int moov_sz=stream_read_dword(demuxer->stream);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1437 unsigned int cmov_sz=len-4;
18444
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1438 unsigned char* cmov_buf;
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1439 unsigned char* moov_buf;
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1440 int zret;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1441 z_stream zstrm;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1442 stream_t* backup;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1443
29598
8f54d278fd50 100l, SIZE_MAX must be UINT_MAX to prevent an integer overflow later on,
reimar
parents: 29288
diff changeset
1444 if (moov_sz > UINT_MAX - 16) {
18444
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1445 mp_msg(MSGT_DEMUX, MSGL_ERR, "Invalid cmvd atom size %d\n", moov_sz);
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1446 break;
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1447 }
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1448 cmov_buf=malloc(cmov_sz);
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1449 moov_buf=malloc(moov_sz+16);
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1450 mp_msg(MSGT_DEMUX, MSGL_V, "Compressed header size: %d / %d\n",cmov_sz,moov_sz);
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1451
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1452 stream_read(demuxer->stream,cmov_buf,cmov_sz);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1453
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1454 zstrm.zalloc = (alloc_func)0;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1455 zstrm.zfree = (free_func)0;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1456 zstrm.opaque = (voidpf)0;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1457 zstrm.next_in = cmov_buf;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1458 zstrm.avail_in = cmov_sz;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1459 zstrm.next_out = moov_buf;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1460 zstrm.avail_out = moov_sz;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1461
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1462 zret = inflateInit(&zstrm);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1463 if (zret != Z_OK)
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1464 { mp_msg(MSGT_DEMUX, MSGL_ERR, "QT cmov: inflateInit err %d\n",zret);
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1465 return;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1466 }
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1467 zret = inflate(&zstrm, Z_NO_FLUSH);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1468 if ((zret != Z_OK) && (zret != Z_STREAM_END))
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1469 { mp_msg(MSGT_DEMUX, MSGL_ERR, "QT cmov inflate: ERR %d\n",zret);
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1470 return;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1471 }
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1472 #if 0
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1473 else {
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1474 FILE *DecOut;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1475 DecOut = fopen("Out.bin", "w");
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1476 fwrite(moov_buf, 1, moov_sz, DecOut);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1477 fclose(DecOut);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1478 }
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1479 #endif
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1480 if(moov_sz != zstrm.total_out)
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1481 mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! moov size differs cmov: %d zlib: %ld\n",moov_sz,zstrm.total_out);
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1482 zret = inflateEnd(&zstrm);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1483
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1484 backup=demuxer->stream;
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1485 demuxer->stream=new_memory_stream(moov_buf,moov_sz);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1486 stream_skip(demuxer->stream,8);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1487 lschunks(demuxer,level+1,moov_sz,NULL); // parse uncompr. 'moov'
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1488 //free_stream(demuxer->stream);
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1489 demuxer->stream=backup;
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1490 free(cmov_buf);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1491 free(moov_buf);
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1492 break;
2148
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1493 }
0c6cef85d507 compressed headers support
arpi
parents: 2127
diff changeset
1494 #endif
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1495 case MOV_FOURCC('u','d','t','a'):
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1496 {
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1497 unsigned int udta_id;
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1498 off_t udta_len;
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1499 off_t udta_size = len;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1500
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1501 mp_msg(MSGT_DEMUX, MSGL_DBG2, "mov: user data record found\n");
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1502 mp_msg(MSGT_DEMUX, MSGL_V, "Quicktime Clip Info:\n");
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1503
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1504 while((len > 8) && (udta_size > 8))
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1505 {
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1506 udta_len = stream_read_dword(demuxer->stream);
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1507 udta_id = stream_read_dword(demuxer->stream);
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1508 udta_size -= 8;
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1509 mp_msg(MSGT_DEMUX, MSGL_DBG2, "udta_id: %.4s (len: %"PRId64")\n", (char *)&udta_id, (int64_t)udta_len);
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1510 switch (udta_id)
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1511 {
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1512 case MOV_FOURCC(0xa9,'c','p','y'):
2542
146854180531 extended udta record
alex
parents: 2533
diff changeset
1513 case MOV_FOURCC(0xa9,'d','a','y'):
146854180531 extended udta record
alex
parents: 2533
diff changeset
1514 case MOV_FOURCC(0xa9,'d','i','r'):
146854180531 extended udta record
alex
parents: 2533
diff changeset
1515 /* 0xa9,'e','d','1' - '9' : edit timestamps */
146854180531 extended udta record
alex
parents: 2533
diff changeset
1516 case MOV_FOURCC(0xa9,'f','m','t'):
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1517 case MOV_FOURCC(0xa9,'i','n','f'):
2542
146854180531 extended udta record
alex
parents: 2533
diff changeset
1518 case MOV_FOURCC(0xa9,'p','r','d'):
146854180531 extended udta record
alex
parents: 2533
diff changeset
1519 case MOV_FOURCC(0xa9,'p','r','f'):
146854180531 extended udta record
alex
parents: 2533
diff changeset
1520 case MOV_FOURCC(0xa9,'r','e','q'):
146854180531 extended udta record
alex
parents: 2533
diff changeset
1521 case MOV_FOURCC(0xa9,'s','r','c'):
146854180531 extended udta record
alex
parents: 2533
diff changeset
1522 case MOV_FOURCC('n','a','m','e'):
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1523 case MOV_FOURCC(0xa9,'n','a','m'):
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1524 case MOV_FOURCC(0xa9,'A','R','T'):
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1525 case MOV_FOURCC(0xa9,'c','m','t'):
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1526 case MOV_FOURCC(0xa9,'a','u','t'):
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1527 case MOV_FOURCC(0xa9,'s','w','r'):
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1528 {
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1529 off_t text_len = stream_read_word(demuxer->stream);
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1530 char text[text_len+2+1];
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1531 stream_read(demuxer->stream, (char *)&text, text_len+2);
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1532 text[text_len+2] = 0x0;
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1533 switch(udta_id)
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1534 {
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1535 case MOV_FOURCC(0xa9,'a','u','t'):
3071
a5f378f982cc added demux_info
alex
parents: 2942
diff changeset
1536 demux_info_add(demuxer, "author", &text[2]);
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1537 mp_msg(MSGT_DEMUX, MSGL_V, " Author: %s\n", &text[2]);
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1538 break;
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1539 case MOV_FOURCC(0xa9,'c','p','y'):
3071
a5f378f982cc added demux_info
alex
parents: 2942
diff changeset
1540 demux_info_add(demuxer, "copyright", &text[2]);
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1541 mp_msg(MSGT_DEMUX, MSGL_V, " Copyright: %s\n", &text[2]);
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1542 break;
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1543 case MOV_FOURCC(0xa9,'i','n','f'):
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1544 mp_msg(MSGT_DEMUX, MSGL_V, " Info: %s\n", &text[2]);
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1545 break;
2542
146854180531 extended udta record
alex
parents: 2533
diff changeset
1546 case MOV_FOURCC('n','a','m','e'):
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1547 case MOV_FOURCC(0xa9,'n','a','m'):
29288
4a1c217a844b In all demux_info_add calls change "name" to "title".
reimar
parents: 29263
diff changeset
1548 demux_info_add(demuxer, "title", &text[2]);
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1549 mp_msg(MSGT_DEMUX, MSGL_V, " Name: %s\n", &text[2]);
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1550 break;
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1551 case MOV_FOURCC(0xa9,'A','R','T'):
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1552 mp_msg(MSGT_DEMUX, MSGL_V, " Artist: %s\n", &text[2]);
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1553 break;
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1554 case MOV_FOURCC(0xa9,'d','i','r'):
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1555 mp_msg(MSGT_DEMUX, MSGL_V, " Director: %s\n", &text[2]);
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1556 break;
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1557 case MOV_FOURCC(0xa9,'c','m','t'):
3071
a5f378f982cc added demux_info
alex
parents: 2942
diff changeset
1558 demux_info_add(demuxer, "comments", &text[2]);
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1559 mp_msg(MSGT_DEMUX, MSGL_V, " Comment: %s\n", &text[2]);
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1560 break;
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1561 case MOV_FOURCC(0xa9,'r','e','q'):
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1562 mp_msg(MSGT_DEMUX, MSGL_V, " Requirements: %s\n", &text[2]);
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1563 break;
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1564 case MOV_FOURCC(0xa9,'s','w','r'):
3071
a5f378f982cc added demux_info
alex
parents: 2942
diff changeset
1565 demux_info_add(demuxer, "encoder", &text[2]);
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1566 mp_msg(MSGT_DEMUX, MSGL_V, " Software: %s\n", &text[2]);
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1567 break;
2542
146854180531 extended udta record
alex
parents: 2533
diff changeset
1568 case MOV_FOURCC(0xa9,'d','a','y'):
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1569 mp_msg(MSGT_DEMUX, MSGL_V, " Creation timestamp: %s\n", &text[2]);
2542
146854180531 extended udta record
alex
parents: 2533
diff changeset
1570 break;
146854180531 extended udta record
alex
parents: 2533
diff changeset
1571 case MOV_FOURCC(0xa9,'f','m','t'):
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1572 mp_msg(MSGT_DEMUX, MSGL_V, " Format: %s\n", &text[2]);
2542
146854180531 extended udta record
alex
parents: 2533
diff changeset
1573 break;
146854180531 extended udta record
alex
parents: 2533
diff changeset
1574 case MOV_FOURCC(0xa9,'p','r','d'):
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1575 mp_msg(MSGT_DEMUX, MSGL_V, " Producer: %s\n", &text[2]);
2542
146854180531 extended udta record
alex
parents: 2533
diff changeset
1576 break;
146854180531 extended udta record
alex
parents: 2533
diff changeset
1577 case MOV_FOURCC(0xa9,'p','r','f'):
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1578 mp_msg(MSGT_DEMUX, MSGL_V, " Performer(s): %s\n", &text[2]);
2542
146854180531 extended udta record
alex
parents: 2533
diff changeset
1579 break;
146854180531 extended udta record
alex
parents: 2533
diff changeset
1580 case MOV_FOURCC(0xa9,'s','r','c'):
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1581 mp_msg(MSGT_DEMUX, MSGL_V, " Source providers: %s\n", &text[2]);
2542
146854180531 extended udta record
alex
parents: 2533
diff changeset
1582 break;
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1583 }
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1584 udta_size -= 4+text_len;
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1585 break;
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1586 }
2542
146854180531 extended udta record
alex
parents: 2533
diff changeset
1587 /* some other shits: WLOC - window location,
146854180531 extended udta record
alex
parents: 2533
diff changeset
1588 LOOP - looping style,
146854180531 extended udta record
alex
parents: 2533
diff changeset
1589 SelO - play only selected frames
146854180531 extended udta record
alex
parents: 2533
diff changeset
1590 AllF - play all frames
146854180531 extended udta record
alex
parents: 2533
diff changeset
1591 */
146854180531 extended udta record
alex
parents: 2533
diff changeset
1592 case MOV_FOURCC('W','L','O','C'):
146854180531 extended udta record
alex
parents: 2533
diff changeset
1593 case MOV_FOURCC('L','O','O','P'):
146854180531 extended udta record
alex
parents: 2533
diff changeset
1594 case MOV_FOURCC('S','e','l','O'):
146854180531 extended udta record
alex
parents: 2533
diff changeset
1595 case MOV_FOURCC('A','l','l','F'):
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1596 default:
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1597 {
10888
0e940f364a6e Fix for borked .mov files with bogus user data length values. Patch by Marek Zelem.
mosu
parents: 10849
diff changeset
1598 if( udta_len>udta_size)
0e940f364a6e Fix for borked .mov files with bogus user data length values. Patch by Marek Zelem.
mosu
parents: 10849
diff changeset
1599 udta_len=udta_size;
0e940f364a6e Fix for borked .mov files with bogus user data length values. Patch by Marek Zelem.
mosu
parents: 10849
diff changeset
1600 {
25891
d17a6a6d346a Do not pointlessly read data, just skip it.
reimar
parents: 25883
diff changeset
1601 stream_skip(demuxer->stream, udta_len-4-4);
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1602 udta_size -= udta_len;
10888
0e940f364a6e Fix for borked .mov files with bogus user data length values. Patch by Marek Zelem.
mosu
parents: 10849
diff changeset
1603 }
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1604 }
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1605 }
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1606 }
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1607 break;
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1608 } /* eof udta */
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1609 default:
4903
d8b465e3fd88 fixed some endian issues, like changing bswap_32() -> be2me_32(), and
melanson
parents: 4646
diff changeset
1610 id = be2me_32(id);
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1611 mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",(char *)&id,(int)len);
2532
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1612 } /* endof switch */
1adeb4ce84d4 changed if's to switch in lschunks
alex
parents: 2483
diff changeset
1613 } /* endof else */
2429
8d00b25169af handling free chunk (wide needs implementation) and displaying clip info (datas from udta chunk)
alex
parents: 2419
diff changeset
1614
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1615 pos+=len+8;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1616 if(pos>=endpos) break;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1617 if(!stream_seek(demuxer->stream,pos)) break;
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1618 }
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1619 }
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1620
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1621 static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id,
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1622 off_t pos, off_t len, mov_track_t* trak)
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1623 {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1624 switch(id) {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1625 case MOV_FOURCC('m','d','a','t'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1626 mp_msg(MSGT_DEMUX,MSGL_WARN,"Hmm, strange MOV, parsing mdat in lschunks?\n");
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1627 return -1;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1628 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1629 case MOV_FOURCC('f','r','e','e'):
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1630 case MOV_FOURCC('u','d','t','a'):
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1631 /* here not supported :p */
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1632 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1633 case MOV_FOURCC('t','k','h','d'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1634 mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*sTrack header!\n", level, "");
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1635 // read codec data
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1636 trak->tkdata_len = len;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1637 trak->tkdata = malloc(trak->tkdata_len);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1638 stream_read(demuxer->stream, trak->tkdata, trak->tkdata_len);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1639 /*
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1640 0 1 Version
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1641 1 3 Flags
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1642 4 4 Creation time
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1643 8 4 Modification time
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1644 12 4 Track ID
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1645 16 4 Reserved
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1646 20 4 Duration
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1647 24 8 Reserved
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1648 32 2 Layer
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1649 34 2 Alternate group
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1650 36 2 Volume
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1651 38 2 Reserved
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1652 40 36 Matrix structure
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1653 76 4 Track width
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1654 80 4 Track height
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1655 */
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1656 mp_msg(MSGT_DEMUX, MSGL_V,
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1657 "tkhd len=%d ver=%d flags=0x%X id=%d dur=%d lay=%d vol=%d\n",
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1658 trak->tkdata_len, trak->tkdata[0], trak->tkdata[1],
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1659 char2int(trak->tkdata, 12), // id
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1660 char2int(trak->tkdata, 20), // duration
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1661 char2short(trak->tkdata, 32), // layer
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1662 char2short(trak->tkdata, 36)); // volume
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1663 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1664 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1665 case MOV_FOURCC('m','d','h','d'): {
19343
24f2f73f03ca Support for version 1 (64 bit) mvhd and mdhd, taken from libavformat mov demuxer
reimar
parents: 19326
diff changeset
1666 int version = stream_read_char(demuxer->stream);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1667 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sMedia header!\n", level, "");
19343
24f2f73f03ca Support for version 1 (64 bit) mvhd and mdhd, taken from libavformat mov demuxer
reimar
parents: 19326
diff changeset
1668 stream_skip(demuxer->stream, (version == 1) ? 19 : 11);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1669 // read timescale
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1670 trak->timescale = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1671 // read length
19343
24f2f73f03ca Support for version 1 (64 bit) mvhd and mdhd, taken from libavformat mov demuxer
reimar
parents: 19326
diff changeset
1672 if (version == 1)
24f2f73f03ca Support for version 1 (64 bit) mvhd and mdhd, taken from libavformat mov demuxer
reimar
parents: 19326
diff changeset
1673 trak->length = stream_read_qword(demuxer->stream);
24f2f73f03ca Support for version 1 (64 bit) mvhd and mdhd, taken from libavformat mov demuxer
reimar
parents: 19326
diff changeset
1674 else
24f2f73f03ca Support for version 1 (64 bit) mvhd and mdhd, taken from libavformat mov demuxer
reimar
parents: 19326
diff changeset
1675 trak->length = stream_read_dword(demuxer->stream);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1676 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1677 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1678 case MOV_FOURCC('h','d','l','r'): {
28441
669df097f203 Fix a couple of unused variable warnings through the av_unused attribute.
diego
parents: 28440
diff changeset
1679 av_unused unsigned int tmp = stream_read_dword(demuxer->stream);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1680 unsigned int type = stream_read_dword_le(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1681 unsigned int subtype = stream_read_dword_le(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1682 unsigned int manufact = stream_read_dword_le(demuxer->stream);
28441
669df097f203 Fix a couple of unused variable warnings through the av_unused attribute.
diego
parents: 28440
diff changeset
1683 av_unused unsigned int comp_flags = stream_read_dword(demuxer->stream);
669df097f203 Fix a couple of unused variable warnings through the av_unused attribute.
diego
parents: 28440
diff changeset
1684 av_unused unsigned int comp_mask = stream_read_dword(demuxer->stream);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1685 int len = stream_read_char(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1686 char* str = malloc(len + 1);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1687 stream_read(demuxer->stream, str, len);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1688 str[len] = 0;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1689 mp_msg(MSGT_DEMUX, MSGL_V,
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1690 "MOV: %*sHandler header: %.4s/%.4s (%.4s) %s\n", level, "",
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1691 (char *)&type, (char *)&subtype, (char *)&manufact, str);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1692 free(str);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1693 switch(bswap_32(type)) {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1694 case MOV_FOURCC('m','h','l','r'):
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1695 trak->media_handler = bswap_32(subtype);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1696 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1697 case MOV_FOURCC('d','h','l','r'):
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1698 trak->data_handler = bswap_32(subtype);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1699 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1700 default:
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1701 mp_msg(MSGT_DEMUX, MSGL_V,
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1702 "MOV: unknown handler class: 0x%X (%.4s)\n",
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1703 bswap_32(type), (char *)&type);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1704 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1705 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1706 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1707 case MOV_FOURCC('v','m','h','d'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1708 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sVideo header!\n", level, "");
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1709 trak->type = MOV_TRAK_VIDEO;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1710 // read video data
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1711 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1712 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1713 case MOV_FOURCC('s','m','h','d'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1714 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sSound header!\n", level, "");
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1715 trak->type = MOV_TRAK_AUDIO;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1716 // read audio data
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1717 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1718 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1719 case MOV_FOURCC('g','m','h','d'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1720 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sGeneric header!\n", level, "");
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1721 trak->type = MOV_TRAK_GENERIC;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1722 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1723 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1724 case MOV_FOURCC('n','m','h','d'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1725 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sGeneric header!\n", level, "");
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1726 trak->type = MOV_TRAK_GENERIC;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1727 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1728 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1729 case MOV_FOURCC('s','t','s','d'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1730 int i = stream_read_dword(demuxer->stream); // temp!
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1731 int count = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1732 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sDescription list! (cnt:%d)\n",
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1733 level, "", count);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1734 for (i = 0; i < count; i++) {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1735 off_t pos = stream_tell(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1736 off_t len = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1737 unsigned int fourcc = stream_read_dword_le(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1738 /* some files created with Broadcast 2000 (e.g. ilacetest.mov)
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1739 contain raw I420 video but have a yv12 fourcc */
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1740 if (fourcc == mmioFOURCC('y','v','1','2'))
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1741 fourcc = mmioFOURCC('I','4','2','0');
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1742 if (len < 8)
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1743 break; // error
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1744 mp_msg(MSGT_DEMUX, MSGL_V,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1745 "MOV: %*s desc #%d: %.4s (%"PRId64" bytes)\n", level, "",
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1746 i, (char *)&fourcc, (int64_t)len - 16);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1747 if (fourcc != trak->fourcc && i)
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1748 mp_msg(MSGT_DEMUX, MSGL_WARN, MSGTR_MOVvariableFourCC);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1749 // if(!i)
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1750 {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1751 trak->fourcc = fourcc;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1752 // read type specific (audio/video/time/text etc) header
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1753 // NOTE: trak type is not yet known at this point :(((
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1754 trak->stdata_len = len - 8;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1755 trak->stdata = malloc(trak->stdata_len);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1756 stream_read(demuxer->stream, trak->stdata, trak->stdata_len);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1757 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1758 if (!stream_seek(demuxer->stream, pos + len))
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1759 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1760 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1761 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1762 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1763 case MOV_FOURCC('s','t','t','s'): {
28441
669df097f203 Fix a couple of unused variable warnings through the av_unused attribute.
diego
parents: 28440
diff changeset
1764 av_unused int temp = stream_read_dword(demuxer->stream);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1765 int len = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1766 int i;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1767 unsigned int pts = 0;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1768 mp_msg(MSGT_DEMUX, MSGL_V,
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1769 "MOV: %*sSample duration table! (%d blocks)\n", level, "",
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1770 len);
32616
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1771 free(trak->durmap);
18444
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1772 trak->durmap = calloc(len, sizeof(mov_durmap_t));
27272
6d5c1d9bf273 And a 1000l for r27263, swapped a condition, thus setting size to
reimar
parents: 27271
diff changeset
1773 trak->durmap_size = trak->durmap ? len : 0;
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1774 for (i = 0; i < trak->durmap_size; i++) {
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1775 trak->durmap[i].num = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1776 trak->durmap[i].dur = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1777 pts += trak->durmap[i].num * trak->durmap[i].dur;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1778 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1779 if (trak->length != pts)
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1780 mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! pts=%d length=%d\n",
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1781 pts, trak->length);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1782 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1783 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1784 case MOV_FOURCC('s','t','s','c'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1785 int temp = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1786 int len = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1787 int ver = (temp << 24);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1788 int flags = (temp << 16) | (temp << 8) | temp;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1789 int i;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1790 mp_msg(MSGT_DEMUX, MSGL_V,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1791 "MOV: %*sSample->Chunk mapping table! (%d blocks) (ver:%d,flags:%d)\n", level, "",
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1792 len, ver, flags);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1793 // read data:
32616
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1794 free(trak->chunkmap);
18444
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1795 trak->chunkmap = calloc(len, sizeof(mov_chunkmap_t));
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1796 trak->chunkmap_size = trak->chunkmap ? len : 0;
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1797 for (i = 0; i < trak->chunkmap_size; i++) {
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1798 trak->chunkmap[i].first = stream_read_dword(demuxer->stream) - 1;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1799 trak->chunkmap[i].spc = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1800 trak->chunkmap[i].sdid = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1801 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1802 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1803 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1804 case MOV_FOURCC('s','t','s','z'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1805 int temp = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1806 int ss=stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1807 int ver = (temp << 24);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1808 int flags = (temp << 16) | (temp << 8) | temp;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1809 int entries = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1810 int i;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1811 mp_msg(MSGT_DEMUX, MSGL_V,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1812 "MOV: %*sSample size table! (entries=%d ss=%d) (ver:%d,flags:%d)\n", level, "",
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1813 entries, ss, ver, flags);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1814 trak->samplesize = ss;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1815 if (!ss) {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1816 // variable samplesize
32616
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1817 free(trak->samples);
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1818 trak->samples = calloc(entries, sizeof(mov_sample_t));
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1819 trak->samples_size = trak->samples ? entries : 0;
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1820 for (i = 0; i < trak->samples_size; i++)
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1821 trak->samples[i].size = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1822 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1823 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1824 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1825 case MOV_FOURCC('s','t','c','o'): {
28441
669df097f203 Fix a couple of unused variable warnings through the av_unused attribute.
diego
parents: 28440
diff changeset
1826 av_unused int temp = stream_read_dword(demuxer->stream);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1827 int len = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1828 int i;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1829 mp_msg(MSGT_DEMUX, MSGL_V,
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1830 "MOV: %*sChunk offset table! (%d chunks)\n", level, "",
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1831 len);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1832 // extend array if needed:
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1833 if (len > trak->chunks_size) {
32616
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1834 free(trak->chunks);
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1835 trak->chunks = calloc(len, sizeof(mov_chunk_t));
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1836 trak->chunks_size = trak->chunks ? len : 0;
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1837 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1838 // read elements:
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1839 for(i = 0; i < trak->chunks_size; i++)
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1840 trak->chunks[i].pos = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1841 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1842 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1843 case MOV_FOURCC('c','o','6','4'): {
28441
669df097f203 Fix a couple of unused variable warnings through the av_unused attribute.
diego
parents: 28440
diff changeset
1844 av_unused int temp = stream_read_dword(demuxer->stream);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1845 int len = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1846 int i;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1847 mp_msg(MSGT_DEMUX, MSGL_V,
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1848 "MOV: %*s64bit chunk offset table! (%d chunks)\n", level, "",
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1849 len);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1850 // extend array if needed:
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1851 if (len > trak->chunks_size) {
32616
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1852 free(trak->chunks);
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1853 trak->chunks = calloc(len, sizeof(mov_chunk_t));
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1854 trak->chunks_size = trak->chunks ? len : 0;
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1855 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1856 // read elements:
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1857 for (i = 0; i < trak->chunks_size; i++) {
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1858 #ifndef _LARGEFILE_SOURCE
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1859 if (stream_read_dword(demuxer->stream) != 0)
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1860 mp_msg(MSGT_DEMUX, MSGL_WARN, "Chunk %d has got 64bit address, but you've MPlayer compiled without LARGEFILE support!\n", i);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1861 trak->chunks[i].pos = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1862 #else
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1863 trak->chunks[i].pos = stream_read_qword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1864 #endif
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1865 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1866 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1867 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1868 case MOV_FOURCC('s','t','s','s'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1869 int temp = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1870 int entries = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1871 int ver = (temp << 24);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1872 int flags = (temp << 16) | (temp<<8) | temp;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1873 int i;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1874 mp_msg(MSGT_DEMUX, MSGL_V,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1875 "MOV: %*sSyncing samples (keyframes) table! (%d entries) (ver:%d,flags:%d)\n", level, "",
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1876 entries, ver, flags);
32616
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1877 free(trak->keyframes);
18444
fa603193eccf Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
rtognimp
parents: 18218
diff changeset
1878 trak->keyframes = calloc(entries, sizeof(unsigned int));
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1879 trak->keyframes_size = trak->keyframes ? entries : 0;
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1880 for (i = 0; i < trak->keyframes_size; i++)
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1881 trak->keyframes[i] = stream_read_dword(demuxer->stream) - 1;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1882 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1883 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1884 case MOV_FOURCC('m','d','i','a'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1885 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sMedia stream!\n", level, "");
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1886 lschunks(demuxer, level + 1, pos + len, trak);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1887 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1888 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1889 case MOV_FOURCC('m','i','n','f'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1890 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sMedia info!\n", level, "");
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1891 lschunks(demuxer, level + 1 ,pos + len, trak);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1892 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1893 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1894 case MOV_FOURCC('s','t','b','l'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1895 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sSample info!\n", level, "");
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1896 lschunks(demuxer, level + 1, pos + len, trak);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1897 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1898 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1899 case MOV_FOURCC('e','d','t','s'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1900 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sEdit atom!\n", level, "");
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1901 lschunks(demuxer, level + 1, pos + len, trak);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1902 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1903 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1904 case MOV_FOURCC('e','l','s','t'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1905 int temp = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1906 int entries = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1907 int ver = (temp << 24);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1908 int flags = (temp << 16) | (temp << 8) | temp;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1909 int i;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1910 mp_msg(MSGT_DEMUX, MSGL_V,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1911 "MOV: %*sEdit list table (%d entries) (ver:%d,flags:%d)\n", level, "",
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1912 entries, ver, flags);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1913 #if 1
32616
f023e5d1a0fd Fix allocations: always free before overwriting a pointer with a newly
reimar
parents: 32467
diff changeset
1914 free(trak->editlist);
27271
e96d8e20bf69 100l, fix calloc being called with the wrong argument due to reordering
reimar
parents: 27248
diff changeset
1915 trak->editlist = calloc(entries, sizeof(mov_editlist_t));
27231
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1916 trak->editlist_size = trak->editlist ? entries : 0;
f80855a9d336 Quick hack to fix demux_mov crashes where easily possible.
reimar
parents: 27162
diff changeset
1917 for (i = 0; i < trak->editlist_size; i++) {
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1918 int dur = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1919 int mt = stream_read_dword(demuxer->stream);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1920 int mr = stream_read_dword(demuxer->stream); // 16.16fp
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1921 trak->editlist[i].dur = dur;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1922 trak->editlist[i].pos = mt;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1923 trak->editlist[i].speed = mr;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1924 mp_msg(MSGT_DEMUX, MSGL_V,
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1925 "MOV: %*s entry#%d: duration: %d start time: %d speed: %3.1fx\n", level, "",
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1926 i, dur, mt, (float)mr/65536.0f);
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1927 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1928 #endif
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1929 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1930 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1931 case MOV_FOURCC('c','o','d','e'): {
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1932 /* XXX: Implement atom 'code' for FLASH support */
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1933 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1934 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1935 default:
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1936 id = be2me_32(id);
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1937 mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",(char *)&id,(int)len);
15948
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1938 break;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1939 }//switch(id)
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1940 return 0;
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1941 }
8082c89f75c5 cosmetic: split the lschunks function in two.
reimar
parents: 15783
diff changeset
1942
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
1943 static demuxer_t* mov_read_header(demuxer_t* demuxer){
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1944 mov_priv_t* priv=demuxer->priv;
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1945 int t_no;
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1946 int best_a_id=-1, best_a_len=0;
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1947 int best_v_id=-1, best_v_len=0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1948
2483
22bfa362af42 added two new clip info types, all printf's were upgraded to mp_msg
alex
parents: 2429
diff changeset
1949 mp_msg(MSGT_DEMUX, MSGL_DBG3, "mov_read_header!\n");
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1950
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1951 // Parse header:
2100
6f6eb4f8e7a0 finished mov header and index processing
arpi
parents: 1973
diff changeset
1952 stream_reset(demuxer->stream);
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1953 if(!stream_seek(demuxer->stream,priv->moov_start))
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1954 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1955 mp_msg(MSGT_DEMUX,MSGL_ERR,"MOV: Cannot seek to the beginning of the Movie header (0x%"PRIx64")\n",
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
1956 (int64_t)priv->moov_start);
5085
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1957 return 0;
3d558414320f workaround in palette reader for statunit6.mov, needed to implement support for flag&0x4 and small changes to avoid some sig11-places in the badly muxed cinepak pro movs
alex
parents: 5067
diff changeset
1958 }
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1959 lschunks(demuxer, 0, priv->moov_end, NULL);
14581
a9b1c0695a27 Reset stream eof after parsing header, fixes bug #218
reimar
parents: 14279
diff changeset
1960 // just in case we have hit eof while parsing...
a9b1c0695a27 Reset stream eof after parsing header, fixes bug #218
reimar
parents: 14279
diff changeset
1961 demuxer->stream->eof = 0;
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 5776
diff changeset
1962 // mp_msg(MSGT_DEMUX, MSGL_INFO, "--------------\n");
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
1963
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1964 // find the best (longest) streams:
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1965 for(t_no=0;t_no<priv->track_db;t_no++){
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1966 mov_track_t* trak=priv->tracks[t_no];
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1967 int len=(trak->samplesize) ? trak->chunks_size : trak->samples_size;
8830
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1968 if(demuxer->a_streams[t_no]){ // need audio
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1969 if(len>best_a_len){ best_a_len=len; best_a_id=t_no; }
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1970 }
8830
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1971 if(demuxer->v_streams[t_no]){ // need video
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1972 if(len>best_v_len){ best_v_len=len; best_v_id=t_no; }
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1973 }
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1974 }
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
1975 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: longest streams: A: #%d (%d samples) V: #%d (%d samples)\n",
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1976 best_a_id,best_a_len,best_v_id,best_v_len);
8830
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1977 if(demuxer->audio->id==-1 && best_a_id>=0) demuxer->audio->id=best_a_id;
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1978 if(demuxer->video->id==-1 && best_v_id>=0) demuxer->video->id=best_v_id;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
1979
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1980 // setup sh pointers:
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1981 if(demuxer->audio->id>=0){
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1982 sh_audio_t* sh=demuxer->a_streams[demuxer->audio->id];
8830
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1983 if(sh){
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1984 demuxer->audio->sh=sh; sh->ds=demuxer->audio;
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1985 } else {
22201
50d45af133a0 English grammar fix: There is no 's' after "does not exist"
reimar
parents: 22200
diff changeset
1986 mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected audio stream (%d) does not exist\n",demuxer->audio->id);
8830
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1987 demuxer->audio->id=-2;
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1988 }
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1989 }
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1990 if(demuxer->video->id>=0){
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1991 sh_video_t* sh=demuxer->v_streams[demuxer->video->id];
8830
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1992 if(sh){
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1993 demuxer->video->sh=sh; sh->ds=demuxer->video;
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1994 } else {
22201
50d45af133a0 English grammar fix: There is no 's' after "does not exist"
reimar
parents: 22200
diff changeset
1995 mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected video stream (%d) does not exist\n",demuxer->video->id);
8830
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1996 demuxer->video->id=-2;
f4ca727309aa - always print the longest stream in info, not the selected one
arpi
parents: 8451
diff changeset
1997 }
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
1998 }
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
1999 if(demuxer->sub->id>=0){
20907
eb6a62406a20 10l copy&ªªpaste bug in subtitle sh handling
reimar
parents: 20877
diff changeset
2000 sh_sub_t* sh=demuxer->s_streams[demuxer->sub->id];
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2001 if(sh){
20907
eb6a62406a20 10l copy&ªªpaste bug in subtitle sh handling
reimar
parents: 20877
diff changeset
2002 demuxer->sub->sh=sh;
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2003 } else {
22201
50d45af133a0 English grammar fix: There is no 's' after "does not exist"
reimar
parents: 22200
diff changeset
2004 mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected subtitle stream (%d) does not exist\n",demuxer->sub->id);
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2005 demuxer->sub->id=-2;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2006 }
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2007 }
8386
52a4ece3bbe2 find best (longest) streams if not specified (-aid/-vid)
arpi
parents: 8315
diff changeset
2008
19325
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2009 if(demuxer->video->id<0 && demuxer->audio->id<0) {
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2010 /* No AV streams found. Try to find an MPEG stream. */
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2011 for(t_no=0;t_no<priv->track_db;t_no++){
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2012 mov_track_t* trak=priv->tracks[t_no];
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2013 if(trak->media_handler == MOV_FOURCC('M','P','E','G')) {
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2014 stream_t *s;
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2015 demuxer_t *od;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
2016
19325
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2017 demuxer->video->id = t_no;
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2018 s = new_ds_stream(demuxer->video);
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2019 od = demux_open(s, DEMUXER_TYPE_MPEG_PS, -1, -1, -1, NULL);
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2020 if(od) return new_demuxers_demuxer(od, od, od);
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2021 demuxer->video->id = -2; //new linked demuxer couldn't be allocated
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2022 break;
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2023 }
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2024 }
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2025 }
0a78cbf7c24f auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
nicodvb
parents: 19170
diff changeset
2026
18583
b6444dfda51b Disable unsecure dumping of generic track with -v -v -v
rtogni
parents: 18558
diff changeset
2027 #if 0
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17860
diff changeset
2028 if( mp_msg_test(MSGT_DEMUX,MSGL_DBG3) ){
8314
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2029 for(t_no=0;t_no<priv->track_db;t_no++){
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2030 mov_track_t* trak=priv->tracks[t_no];
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2031 if(trak->type==MOV_TRAK_GENERIC){
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2032 int i;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2033 int fd;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2034 char name[20];
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2035 mp_msg(MSGT_DEMUX, MSGL_INFO, "MOV: Track #%d: Extracting %d data chunks to files\n",t_no,trak->samples_size);
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2036 for (i=0; i<trak->samples_size; i++)
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2037 {
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2038 int len=trak->samples[i].size;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2039 char buf[len];
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2040 stream_seek(demuxer->stream, trak->samples[i].pos);
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2041 snprintf(name, 20, "t%02d-s%03d.%s", t_no,i,
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2042 (trak->media_handler==MOV_FOURCC('f','l','s','h')) ?
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2043 "swf":"dump");
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2044 fd = open(name, O_CREAT|O_WRONLY);
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2045 // { int j;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2046 // for(j=0;j<trak->stdata_len-3; j++)
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2047 // printf("stdata[%d]=0x%X ize=0x%X\n",j,char2int(trak->stdata,j),MOV_FOURCC('z','l','i','b'));
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2048 // }
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2049 if( //trak->media_handler==MOV_FOURCC('s','p','r','t') &&
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2050 trak->stdata_len>=16 &&
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
2051 char2int(trak->stdata,12)==MOV_FOURCC('z','l','i','b')
8314
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2052 ){
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2053 int newlen=stream_read_dword(demuxer->stream);
28440
2218218264cb Convert CONFIG_ZLIB into a 0/1 option.
diego
parents: 27388
diff changeset
2054 #if CONFIG_ZLIB
8314
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2055 // unzip:
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2056 z_stream zstrm;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2057 int zret;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2058 char buf2[newlen];
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2059
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2060 len-=4;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2061 stream_read(demuxer->stream, buf, len);
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2062
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2063 zstrm.zalloc = (alloc_func)0;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2064 zstrm.zfree = (free_func)0;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2065 zstrm.opaque = (voidpf)0;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2066 zstrm.next_in = buf;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2067 zstrm.avail_in = len;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2068 zstrm.next_out = buf2;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2069 zstrm.avail_out = newlen;
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2070
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2071 zret = inflateInit(&zstrm);
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2072 zret = inflate(&zstrm, Z_NO_FLUSH);
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2073 if(newlen != zstrm.total_out)
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17283
diff changeset
2074 mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! unzipped frame size differs hdr: %d zlib: %ld\n",newlen,zstrm.total_out);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
2075
8314
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2076 write(fd, buf2, newlen);
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2077 } else {
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2078 #else
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2079 len-=4;
17756
9c1656872e96 Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
diego
parents: 17716
diff changeset
2080 mp_msg(MSGT_DEMUX, MSGL_INFO, "******* ZLIB COMPRESSED SAMPLE!!!!! (%d->%d bytes) *******\n",len,newlen);
8314
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2081 }
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2082 {
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2083 #endif
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2084 stream_read(demuxer->stream, buf, len);
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2085 write(fd, buf, len);
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2086 }
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2087 close(fd);
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2088 }
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2089 }
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2090 }
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2091 }
14581
a9b1c0695a27 Reset stream eof after parsing header, fixes bug #218
reimar
parents: 14279
diff changeset
2092 demuxer->stream->eof = 0;
8314
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2093 #endif
d7ae896c5cde - parsing the handler reference atom (hnlr), save handler fourccs
arpi
parents: 8258
diff changeset
2094
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2095 return demuxer;
1490
71424eb2b282 MOV file support - not works yet
arpi
parents:
diff changeset
2096 }
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2097
14198
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2098 /**
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2099 * \brief return the mov track that belongs to a demuxer stream
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2100 * \param ds the demuxer stream, may be NULL
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2101 * \return the mov track info structure belonging to the stream,
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2102 * NULL if not found
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2103 */
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2104 static mov_track_t *stream_track(mov_priv_t *priv, demux_stream_t *ds) {
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2105 if (ds && (ds->id >= 0) && (ds->id < priv->track_db))
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2106 return priv->tracks[ds->id];
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2107 return NULL;
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2108 }
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2109
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2110 // return value:
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2111 // 0 = EOF or no stream found
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2112 // 1 = successfully read a packet
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2113 static int demux_mov_fill_buffer(demuxer_t *demuxer,demux_stream_t* ds){
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2114 mov_priv_t* priv=demuxer->priv;
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2115 mov_track_t* trak=NULL;
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2116 float pts;
5252
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2117 int x;
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2118 off_t pos;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
2119
16613
465ad78c43c9 Detect eof when seeking and do _not_ restart the video.
reimar
parents: 16611
diff changeset
2120 if (ds->eof) return 0;
14198
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2121 trak = stream_track(priv, ds);
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2122 if (!trak) return 0;
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2123
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
2124 if(trak->samplesize){
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
2125 // read chunk:
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
2126 if(trak->pos>=trak->chunks_size) return 0; // EOF
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
2127 stream_seek(demuxer->stream,trak->chunks[trak->pos].pos);
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
2128 pts=(float)(trak->chunks[trak->pos].sample*trak->duration)/(float)trak->timescale;
3071
a5f378f982cc added demux_info
alex
parents: 2942
diff changeset
2129 if(trak->samplesize!=1)
a5f378f982cc added demux_info
alex
parents: 2942
diff changeset
2130 {
4645
33c2fc18138c added nmhd, added checking for audio trak in demux_mov_fill_buffer
alex
parents: 4624
diff changeset
2131 mp_msg(MSGT_DEMUX, MSGL_DBG2, "WARNING! Samplesize(%d) != 1\n",
3071
a5f378f982cc added demux_info
alex
parents: 2942
diff changeset
2132 trak->samplesize);
18218
a1ad37ef0a30 Partially revert 1.140, restoring the old behaviour for all codecs
rtognimp
parents: 18176
diff changeset
2133 if((trak->fourcc != MOV_FOURCC('t','w','o','s')) && (trak->fourcc != MOV_FOURCC('s','o','w','t')))
a1ad37ef0a30 Partially revert 1.140, restoring the old behaviour for all codecs
rtognimp
parents: 18176
diff changeset
2134 x=trak->chunks[trak->pos].size*trak->samplesize;
a1ad37ef0a30 Partially revert 1.140, restoring the old behaviour for all codecs
rtognimp
parents: 18176
diff changeset
2135 else
a1ad37ef0a30 Partially revert 1.140, restoring the old behaviour for all codecs
rtognimp
parents: 18176
diff changeset
2136 x=trak->chunks[trak->pos].size;
3071
a5f378f982cc added demux_info
alex
parents: 2942
diff changeset
2137 }
18218
a1ad37ef0a30 Partially revert 1.140, restoring the old behaviour for all codecs
rtognimp
parents: 18176
diff changeset
2138 else
3071
a5f378f982cc added demux_info
alex
parents: 2942
diff changeset
2139 x=trak->chunks[trak->pos].size;
3652
65fd971932dc added co64 (64bit chunk offset table) chunk (needed for mov files created with xawtv) and added depth detection in video track (tested with my *.mov files (about 15-20) and worked fine)
alex
parents: 3071
diff changeset
2140 // printf("X = %d\n", x);
4645
33c2fc18138c added nmhd, added checking for audio trak in demux_mov_fill_buffer
alex
parents: 4624
diff changeset
2141 /* the following stuff is audio related */
6612
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
2142 if (trak->type == MOV_TRAK_AUDIO){
6718
872235b50330 workaround for empty version1 audio headers (bugreport by Sascha Sommer)
arpi
parents: 6664
diff changeset
2143 if(trak->stdata_len>=44 && trak->stdata[9]>=1 && char2int(trak->stdata,28)>0){
6612
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
2144 // stsd version 1 - we have audio compression ratio info:
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
2145 x/=char2int(trak->stdata,28); // samples/packet
6655
9eefcaf88e56 fixed endless 'unknown chunk' and doublespeed ima4 audio bugs
arpi
parents: 6612
diff changeset
2146 // x*=char2int(trak->stdata,32); // bytes/packet
9eefcaf88e56 fixed endless 'unknown chunk' and doublespeed ima4 audio bugs
arpi
parents: 6612
diff changeset
2147 x*=char2int(trak->stdata,36); // bytes/frame
6612
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
2148 } else {
7754
0568245deeb8 ss_div/ss_mul defaults to 0
arpi
parents: 7654
diff changeset
2149 if(ds->ss_div && ds->ss_mul){
6612
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
2150 // workaround for buggy files like 7up-high-traffic-areas.mov,
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
2151 // with missing stsd v1 header containing compression rate
2549
3e0204ff3be0 twos pcm audio support
arpi
parents: 2546
diff changeset
2152 x/=ds->ss_div; x*=ds->ss_mul; // compression ratio fix ! HACK !
3e0204ff3be0 twos pcm audio support
arpi
parents: 2546
diff changeset
2153 } else {
14279
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
2154 x*=trak->nchannels;
b4b202086260 Fix channels, sample rate and sample size for 3gp files
rtognimp
parents: 14198
diff changeset
2155 x*=trak->samplebytes;
2549
3e0204ff3be0 twos pcm audio support
arpi
parents: 2546
diff changeset
2156 }
6612
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
2157 }
de59eb5cf6ce CBR audio PTS fixes (using stsd v1 header)
arpi
parents: 6611
diff changeset
2158 mp_msg(MSGT_DEMUX, MSGL_DBG2, "Audio sample %d bytes pts %5.3f\n",trak->chunks[trak->pos].size*trak->samplesize,pts);
4645
33c2fc18138c added nmhd, added checking for audio trak in demux_mov_fill_buffer
alex
parents: 4624
diff changeset
2159 } /* MOV_TRAK_AUDIO */
5252
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2160 pos=trak->chunks[trak->pos].pos;
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
2161 } else {
6664
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2162 int frame=trak->pos;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2163 // editlist support:
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2164 if(trak->type == MOV_TRAK_VIDEO && trak->editlist_size>=1){
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2165 // find the right editlist entry:
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2166 if(frame<trak->editlist[trak->editlist_pos].start_frame)
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2167 trak->editlist_pos=0;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2168 while(trak->editlist_pos<trak->editlist_size-1 &&
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2169 frame>=trak->editlist[trak->editlist_pos+1].start_frame)
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2170 ++trak->editlist_pos;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2171 if(frame>=trak->editlist[trak->editlist_pos].start_frame+
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2172 trak->editlist[trak->editlist_pos].frames) return 0; // EOF
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2173 // calc real frame index:
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2174 frame-=trak->editlist[trak->editlist_pos].start_frame;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2175 frame+=trak->editlist[trak->editlist_pos].start_sample;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2176 // calc pts:
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2177 pts=(float)(trak->samples[frame].pts+
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2178 trak->editlist[trak->editlist_pos].pts_offset)/(float)trak->timescale;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2179 } else {
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2180 if(frame>=trak->samples_size) return 0; // EOF
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2181 pts=(float)trak->samples[frame].pts/(float)trak->timescale;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2182 }
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2183 // read sample:
6664
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2184 stream_seek(demuxer->stream,trak->samples[frame].pos);
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2185 x=trak->samples[frame].size;
b802dd0812f1 edit-list support for video - fixes various A-V sync problems (TODO: seeking)
arpi
parents: 6655
diff changeset
2186 pos=trak->samples[frame].pos;
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
2187 }
5252
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2188 if(trak->pos==0 && trak->stream_header_len>0){
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2189 // we have to append the stream header...
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2190 demux_packet_t* dp=new_demux_packet(x+trak->stream_header_len);
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2191 memcpy(dp->buffer,trak->stream_header,trak->stream_header_len);
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2192 stream_read(demuxer->stream,dp->buffer+trak->stream_header_len,x);
5307
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
2193 free(trak->stream_header);
fb58b4a8fb18 Use esds parser for movie esds atom and only pass decoder specific configuration into the stream_header.
atmos4
parents: 5305
diff changeset
2194 trak->stream_header = NULL;
10849
9c472c2c60fb Fixed seeking in MPEG4 files. Patch by Uwe Reder <Uwe.Reder@3SOFT.de>.
mosu
parents: 10796
diff changeset
2195 trak->stream_header_len = 0;
5252
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2196 dp->pts=pts;
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2197 dp->flags=0;
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2198 dp->pos=pos; // FIXME?
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2199 ds_add_packet(ds,dp);
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2200 } else
5c2a8e6e860c insert mpeg4 video header into the first chunk
arpi
parents: 5251
diff changeset
2201 ds_read_packet(ds,demuxer->stream,x,pts,pos,0);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
2202
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2203 ++trak->pos;
2115
fe1cd4a5109a optimized demuxer for fixed samplesize (raw audio)
arpi
parents: 2103
diff changeset
2204
22315
0a0191bc366d 10l, avoid crash on invalid subtitle id
reimar
parents: 22289
diff changeset
2205 trak = NULL;
0a0191bc366d 10l, avoid crash on invalid subtitle id
reimar
parents: 22289
diff changeset
2206 if (demuxer->sub->id >= 0 && demuxer->sub->id < priv->track_db)
0a0191bc366d 10l, avoid crash on invalid subtitle id
reimar
parents: 22289
diff changeset
2207 trak = priv->tracks[demuxer->sub->id];
0a0191bc366d 10l, avoid crash on invalid subtitle id
reimar
parents: 22289
diff changeset
2208 if (trak) {
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2209 int samplenr = 0;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2210 while (samplenr < trak->samples_size) {
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2211 double subpts = (double)trak->samples[samplenr].pts / (double)trak->timescale;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2212 if (subpts >= pts) break;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2213 samplenr++;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2214 }
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2215 samplenr--;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2216 if (samplenr < 0)
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2217 vo_sub = NULL;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2218 else if (samplenr != priv->current_sub) {
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2219 off_t pos = trak->samples[samplenr].pos;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2220 int len = trak->samples[samplenr].size;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2221 double subpts = (double)trak->samples[samplenr].pts / (double)trak->timescale;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2222 stream_seek(demuxer->stream, pos);
21827
b0bc0d81f91b Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents: 21421
diff changeset
2223 ds_read_packet(demuxer->sub, demuxer->stream, len, subpts, pos, 0);
20877
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2224 priv->current_sub = samplenr;
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2225 }
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2226 }
80f8846c7df0 Incomplete support for vobsub (missing palette support) and
reimar
parents: 19363
diff changeset
2227
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2228 return 1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
2229
2101
4ca146a57d17 implemented simple demuxer
arpi
parents: 2100
diff changeset
2230 }
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2231
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2232 static float mov_seek_track(mov_track_t* trak,float pts,int flags){
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2233
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2234 // printf("MOV track seek called %5.3f \n",pts);
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25855
diff changeset
2235 if(flags&SEEK_FACTOR) pts*=trak->length; else pts*=(float)trak->timescale;
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2236
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2237 if(trak->samplesize){
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2238 int sample=pts/trak->duration;
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2239 // printf("MOV track seek - chunk: %d (pts: %5.3f dur=%d) \n",sample,pts,trak->duration);
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25855
diff changeset
2240 if(!(flags&SEEK_ABSOLUTE)) sample+=trak->chunks[trak->pos].sample; // relative
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2241 trak->pos=0;
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2242 while(trak->pos<trak->chunks_size && trak->chunks[trak->pos].sample<sample) ++trak->pos;
16613
465ad78c43c9 Detect eof when seeking and do _not_ restart the video.
reimar
parents: 16611
diff changeset
2243 if (trak->pos == trak->chunks_size) return -1;
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2244 pts=(float)(trak->chunks[trak->pos].sample*trak->duration)/(float)trak->timescale;
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2245 } else {
2545
89e3bf3c0c4e seek ebfore begin of the movie fixed
arpi
parents: 2544
diff changeset
2246 unsigned int ipts;
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25855
diff changeset
2247 if(!(flags&SEEK_ABSOLUTE)) pts+=trak->samples[trak->pos].pts;
2545
89e3bf3c0c4e seek ebfore begin of the movie fixed
arpi
parents: 2544
diff changeset
2248 if(pts<0) pts=0;
89e3bf3c0c4e seek ebfore begin of the movie fixed
arpi
parents: 2544
diff changeset
2249 ipts=pts;
89e3bf3c0c4e seek ebfore begin of the movie fixed
arpi
parents: 2544
diff changeset
2250 //printf("MOV track seek - sample: %d \n",ipts);
2544
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2251 for(trak->pos=0;trak->pos<trak->samples_size;++trak->pos){
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2252 if(trak->samples[trak->pos].pts>=ipts) break; // found it!
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2253 }
16613
465ad78c43c9 Detect eof when seeking and do _not_ restart the video.
reimar
parents: 16611
diff changeset
2254 if (trak->pos == trak->samples_size) return -1;
2544
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2255 if(trak->keyframes_size){
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2256 // find nearest keyframe
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2257 int i;
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2258 for(i=0;i<trak->keyframes_size;i++){
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2259 if(trak->keyframes[i]>=trak->pos) break;
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2260 }
16613
465ad78c43c9 Detect eof when seeking and do _not_ restart the video.
reimar
parents: 16611
diff changeset
2261 if (i == trak->keyframes_size) return -1;
2546
c9485365537d added edit atom (edit list), some comments and typos fixes
alex
parents: 2545
diff changeset
2262 if(i>0 && (trak->keyframes[i]-trak->pos) > (trak->pos-trak->keyframes[i-1]))
c9485365537d added edit atom (edit list), some comments and typos fixes
alex
parents: 2545
diff changeset
2263 --i;
2544
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2264 trak->pos=trak->keyframes[i];
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2265 // printf("nearest keyframe: %d \n",trak->pos);
fd48f0d813b6 using keyframe info for seeking
arpi
parents: 2543
diff changeset
2266 }
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2267 pts=(float)trak->samples[trak->pos].pts/(float)trak->timescale;
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2268 }
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2269
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2270 // printf("MOV track seek done: %5.3f \n",pts);
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2271
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2272 return pts;
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2273 }
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2274
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
2275 static void demux_seek_mov(demuxer_t *demuxer,float pts,float audio_delay,int flags){
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2276 mov_priv_t* priv=demuxer->priv;
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2277 demux_stream_t* ds;
14198
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2278 mov_track_t* trak;
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2279
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2280 // printf("MOV seek called %5.3f flag=%d \n",pts,flags);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
2281
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2282 ds=demuxer->video;
14198
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2283 trak = stream_track(priv, ds);
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2284 if (trak) {
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2285 //if(flags&2) pts*=(float)trak->length/(float)trak->timescale;
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2286 //if(!(flags&1)) pts+=ds->pts;
16613
465ad78c43c9 Detect eof when seeking and do _not_ restart the video.
reimar
parents: 16611
diff changeset
2287 ds->pts=mov_seek_track(trak,pts,flags);
465ad78c43c9 Detect eof when seeking and do _not_ restart the video.
reimar
parents: 16611
diff changeset
2288 if (ds->pts < 0) ds->eof = 1;
465ad78c43c9 Detect eof when seeking and do _not_ restart the video.
reimar
parents: 16611
diff changeset
2289 else pts = ds->pts;
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2290 flags=1; // absolute seconds
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2291 }
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2292
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2293 ds=demuxer->audio;
14198
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2294 trak = stream_track(priv, ds);
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2295 if (trak) {
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2296 //if(flags&2) pts*=(float)trak->length/(float)trak->timescale;
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2297 //if(!(flags&1)) pts+=ds->pts;
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2298 ds->pts=mov_seek_track(trak,pts,flags);
16613
465ad78c43c9 Detect eof when seeking and do _not_ restart the video.
reimar
parents: 16611
diff changeset
2299 if (ds->pts < 0) ds->eof = 1;
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2300 }
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2301
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2302 }
10b279d72a8f mov seeking implemented
arpi
parents: 2148
diff changeset
2303
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2304 static int demux_mov_control(demuxer_t *demuxer, int cmd, void *arg){
14198
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2305 mov_track_t* track;
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2306
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2307 // try the video track
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2308 track = stream_track(demuxer->priv, demuxer->video);
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2309 if (!track || !track->length)
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2310 // otherwise try to get the info from the audio track
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2311 track = stream_track(demuxer->priv, demuxer->audio);
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2312
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2313 if (!track || !track->length)
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2314 return DEMUXER_CTRL_DONTKNOW;
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2315
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2316 switch(cmd) {
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2317 case DEMUXER_CTRL_GET_TIME_LENGTH:
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2318 if (!track->timescale)
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2319 return DEMUXER_CTRL_DONTKNOW;
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16326
diff changeset
2320 *((double *)arg) = (double)track->length / track->timescale;
14198
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2321 return DEMUXER_CTRL_OK;
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2322
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2323 case DEMUXER_CTRL_GET_PERCENT_POS:
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2324 {
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2325 off_t pos = track->pos;
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2326 if (track->durmap_size >= 1)
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2327 pos *= track->durmap[0].dur;
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2328 *((int *)arg) = (int)(100 * pos / track->length);
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2329 return DEMUXER_CTRL_OK;
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2330 }
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2331 }
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2332 return DEMUXER_CTRL_NOTIMPL;
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2333 }
5558b7dfb4b1 fix position bar and length display for mov files
reimar
parents: 14179
diff changeset
2334
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2335
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25630
diff changeset
2336 const demuxer_desc_t demuxer_desc_mov = {
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2337 "Quicktime/MP4 demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2338 "mov",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2339 "Quicktime/MOV",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2340 "Arpi, Al3x, Atmos, others",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2341 "Handles Quicktime, MP4, 3GP",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2342 DEMUXER_TYPE_MOV,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2343 0, // slow autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2344 mov_check_file,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2345 demux_mov_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2346 mov_read_header,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2347 demux_close_mov,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2348 demux_seek_mov,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2349 demux_mov_control
6b86089c2edd Demuxer modularization
rtognimp
parents: 15949
diff changeset
2350 };