annotate mov.c @ 4030:c7354edc3496 libavformat

Reindent after r15833.
author rbultje
date Sat, 15 Nov 2008 20:42:41 +0000
parents 7d6ed3692203
children 836e25632f0b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1 /*
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
2 * MOV demuxer
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
3 * Copyright (c) 2001 Fabrice Bellard.
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
4 *
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
5 * This file is part of FFmpeg.
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
6 *
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
11 *
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
15 * Lesser General Public License for more details.
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
16 *
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
20 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
21
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
22 #include <limits.h>
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
23
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
24 //#define DEBUG
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
25
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
26 #include "avformat.h"
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
27 #include "riff.h"
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
28 #include "isom.h"
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
29 #include "dv.h"
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3267
diff changeset
30 #include "libavcodec/mpeg4audio.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3267
diff changeset
31 #include "libavcodec/mpegaudiodata.h"
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
32
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
33 #ifdef CONFIG_ZLIB
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
34 #include <zlib.h>
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
35 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
36
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
37 /*
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
38 * First version by Francois Revol revol@free.fr
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
39 * Seek function by Gael Chardon gael.dev@4now.net
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
40 *
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
41 * Features and limitations:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
42 * - reads most of the QT files I have (at least the structure),
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
43 * Sample QuickTime files with mp3 audio can be found at: http://www.3ivx.com/showcase.html
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
44 * - the code is quite ugly... maybe I won't do it recursive next time :-)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
45 *
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
46 * Funny I didn't know about http://sourceforge.net/projects/qt-ffmpeg/
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
47 * when coding this :) (it's a writer anyway)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
48 *
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
49 * Reference documents:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
50 * http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
51 * Apple:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
52 * http://developer.apple.com/documentation/QuickTime/QTFF/
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
53 * http://developer.apple.com/documentation/QuickTime/QTFF/qtff.pdf
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
54 * QuickTime is a trademark of Apple (AFAIK :))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
55 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
56
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
57 #include "qtpalette.h"
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
58
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
59
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
60 #undef NDEBUG
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
61 #include <assert.h>
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
62
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
63 /* the QuickTime file format is quite convoluted...
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
64 * it has lots of index tables, each indexing something in another one...
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
65 * Here we just use what is needed to read the chunks
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
66 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
67
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
68 typedef struct {
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
69 int first;
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
70 int count;
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
71 int id;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
72 } MOV_stsc_t;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
73
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
74 typedef struct {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
75 uint32_t type;
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
76 char *path;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
77 } MOV_dref_t;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
78
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
79 typedef struct {
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
80 uint32_t type;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
81 int64_t offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
82 int64_t size; /* total size (excluding the size and type fields) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
83 } MOV_atom_t;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
84
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
85 struct MOVParseTableEntry;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
86
3169
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
87 typedef struct {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
88 unsigned track_id;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
89 uint64_t base_data_offset;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
90 uint64_t moof_offset;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
91 unsigned stsd_id;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
92 unsigned duration;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
93 unsigned size;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
94 unsigned flags;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
95 } MOVFragment;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
96
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
97 typedef struct {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
98 unsigned track_id;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
99 unsigned stsd_id;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
100 unsigned duration;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
101 unsigned size;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
102 unsigned flags;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
103 } MOVTrackExt;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
104
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
105 typedef struct MOVStreamContext {
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
106 ByteIOContext *pb;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
107 int ffindex; /* the ffmpeg stream id */
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
108 int next_chunk;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
109 unsigned int chunk_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
110 int64_t *chunk_offsets;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
111 unsigned int stts_count;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
112 MOV_stts_t *stts_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
113 unsigned int ctts_count;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
114 MOV_stts_t *ctts_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
115 unsigned int edit_count; /* number of 'edit' (elst atom) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
116 unsigned int sample_to_chunk_sz;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
117 MOV_stsc_t *sample_to_chunk;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
118 int sample_to_ctime_index;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
119 int sample_to_ctime_sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
120 unsigned int sample_size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
121 unsigned int sample_count;
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
122 int *sample_sizes;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
123 unsigned int keyframe_count;
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
124 int *keyframes;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
125 int time_scale;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
126 int time_rate;
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
127 int current_sample;
1940
1a7f66384792 cosmetics, sample_size_v1 -> bytes_per_frame / samples_per_frame
bcoudurier
parents: 1939
diff changeset
128 unsigned int bytes_per_frame;
1a7f66384792 cosmetics, sample_size_v1 -> bytes_per_frame / samples_per_frame
bcoudurier
parents: 1939
diff changeset
129 unsigned int samples_per_frame;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
130 int dv_audio_container;
3299
80a497804aa8 demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451
bcoudurier
parents: 3286
diff changeset
131 int pseudo_stream_id; ///< -1 means demux all ids
3029
10abe8748ec2 use correct demux mechanism when audio compression id is -2, dv audio does not matter, demux partially qt_dv_pal_test.mov which does NOT use cid -2
bcoudurier
parents: 3027
diff changeset
132 int16_t audio_cid; ///< stsd audio compression id
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
133 unsigned drefs_count;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
134 MOV_dref_t *drefs;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
135 int dref_id;
3956
8bdecea89071 support negative ctts in some way, unset wrong dts
bcoudurier
parents: 3935
diff changeset
136 int wrong_dts; ///< dts are wrong due to negative ctts
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
137 } MOVStreamContext;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
138
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
139 typedef struct MOVContext {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
140 AVFormatContext *fc;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
141 int time_scale;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
142 int64_t duration; /* duration of the longest track */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
143 int found_moov; /* when both 'moov' and 'mdat' sections has been found */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
144 int found_mdat; /* we suppose we have enough data to read the file */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
145 AVPaletteControl palette_control;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
146 DVDemuxContext *dv_demux;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
147 AVFormatContext *dv_fctx;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
148 int isom; /* 1 if file is ISO Media (mp4/3gp) */
3169
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
149 MOVFragment fragment; ///< current fragment in moof atom
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
150 MOVTrackExt *trex_data;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
151 unsigned trex_count;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
152 } MOVContext;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
153
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
154
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
155 /* XXX: it's the first time I make a recursive parser I think... sorry if it's ugly :P */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
156
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
157 /* those functions parse an atom */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
158 /* return code:
3160
1306bdb603c3 indentation
bcoudurier
parents: 3156
diff changeset
159 0: continue to parse next atom
3175
55ce214a13ea typo: occured --> occurred
diego
parents: 3173
diff changeset
160 <0: error occurred, exit
3160
1306bdb603c3 indentation
bcoudurier
parents: 3156
diff changeset
161 */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
162 /* links atom IDs to parse functions */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
163 typedef struct MOVParseTableEntry {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
164 uint32_t type;
2822
bdb887c3e9e9 cosmetics: func -> parse, remove useless parenthesis
bcoudurier
parents: 2821
diff changeset
165 int (*parse)(MOVContext *ctx, ByteIOContext *pb, MOV_atom_t atom);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
166 } MOVParseTableEntry;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
167
2820
95ce00ad6f3e save pointer to parse table, it is unlikely to change
bcoudurier
parents: 2819
diff changeset
168 static const MOVParseTableEntry mov_default_parse_table[];
95ce00ad6f3e save pointer to parse table, it is unlikely to change
bcoudurier
parents: 2819
diff changeset
169
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
170 static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
171 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
172 int64_t total_size = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
173 MOV_atom_t a;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
174 int i;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
175 int err = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
176
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
177 a.offset = atom.offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
178
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
179 if (atom.size < 0)
2026
2e2c2dbb511d use INT64_MAX
bcoudurier
parents: 2023
diff changeset
180 atom.size = INT64_MAX;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
181 while(((total_size + 8) < atom.size) && !url_feof(pb) && !err) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
182 a.size = atom.size;
2826
24ad70087e67 useless 0L here
bcoudurier
parents: 2825
diff changeset
183 a.type=0;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
184 if(atom.size >= 8) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
185 a.size = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
186 a.type = get_le32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
187 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
188 total_size += 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
189 a.offset += 8;
2902
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
190 dprintf(c->fc, "type: %08x %.4s sz: %"PRIx64" %"PRIx64" %"PRIx64"\n",
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
191 a.type, (char*)&a.type, a.size, atom.size, total_size);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
192 if (a.size == 1) { /* 64 bit extended size */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
193 a.size = get_be64(pb) - 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
194 a.offset += 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
195 total_size += 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
196 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
197 if (a.size == 0) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
198 a.size = atom.size - total_size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
199 if (a.size <= 8)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
200 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
201 }
1964
4571a481081d move atom size check before parsing function search
bcoudurier
parents: 1963
diff changeset
202 a.size -= 8;
2660
022174d849d5 fix issue 225, instead of stoping when wrong atom size is found,
bcoudurier
parents: 2589
diff changeset
203 if(a.size < 0)
1964
4571a481081d move atom size check before parsing function search
bcoudurier
parents: 1963
diff changeset
204 break;
2665
9645f395842d use FFMIN
bcoudurier
parents: 2660
diff changeset
205 a.size = FFMIN(a.size, atom.size - total_size);
1964
4571a481081d move atom size check before parsing function search
bcoudurier
parents: 1963
diff changeset
206
2826
24ad70087e67 useless 0L here
bcoudurier
parents: 2825
diff changeset
207 for (i = 0; mov_default_parse_table[i].type != 0
2820
95ce00ad6f3e save pointer to parse table, it is unlikely to change
bcoudurier
parents: 2819
diff changeset
208 && mov_default_parse_table[i].type != a.type; i++)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
209 /* empty */;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
210
2820
95ce00ad6f3e save pointer to parse table, it is unlikely to change
bcoudurier
parents: 2819
diff changeset
211 if (mov_default_parse_table[i].type == 0) { /* skip leaf atoms data */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
212 url_fskip(pb, a.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
213 } else {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3967
diff changeset
214 int64_t start_pos = url_ftell(pb);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
215 int64_t left;
2822
bdb887c3e9e9 cosmetics: func -> parse, remove useless parenthesis
bcoudurier
parents: 2821
diff changeset
216 err = mov_default_parse_table[i].parse(c, pb, a);
3166
c082ee7573b2 simplify, and only stop parsing when non streamable
bcoudurier
parents: 3164
diff changeset
217 if (url_is_streamed(pb) && c->found_moov && c->found_mdat)
2817
b1b21255bbbb support streamed mov/mp4
bcoudurier
parents: 2814
diff changeset
218 break;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
219 left = a.size - url_ftell(pb) + start_pos;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
220 if (left > 0) /* skip garbage at atom end */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
221 url_fskip(pb, left);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
222 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
223
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
224 a.offset += a.size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
225 total_size += a.size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
226 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
227
3181
50b9615fbfd6 cosmetics, useless braces
bcoudurier
parents: 3180
diff changeset
228 if (!err && total_size < atom.size && atom.size < 0x7ffff)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
229 url_fskip(pb, atom.size - total_size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
230
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
231 return err;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
232 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
233
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
234 static int mov_read_dref(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
235 {
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
236 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
237 MOVStreamContext *sc = st->priv_data;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
238 int entries, i, j;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
239
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
240 get_be32(pb); // version + flags
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
241 entries = get_be32(pb);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
242 if (entries >= UINT_MAX / sizeof(*sc->drefs))
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
243 return -1;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
244 sc->drefs_count = entries;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
245 sc->drefs = av_mallocz(entries * sizeof(*sc->drefs));
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
246
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
247 for (i = 0; i < sc->drefs_count; i++) {
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
248 MOV_dref_t *dref = &sc->drefs[i];
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
249 uint32_t size = get_be32(pb);
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3967
diff changeset
250 int64_t next = url_ftell(pb) + size - 4;
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
251
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
252 dref->type = get_le32(pb);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
253 get_be32(pb); // version + flags
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
254 dprintf(c->fc, "type %.4s size %d\n", (char*)&dref->type, size);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
255
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
256 if (dref->type == MKTAG('a','l','i','s') && size > 150) {
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
257 /* macintosh alias record */
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
258 uint16_t volume_len, len;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
259 char volume[28];
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
260 int16_t type;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
261
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
262 url_fskip(pb, 10);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
263
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
264 volume_len = get_byte(pb);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
265 volume_len = FFMIN(volume_len, 27);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
266 get_buffer(pb, volume, 27);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
267 volume[volume_len] = 0;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
268 av_log(c->fc, AV_LOG_DEBUG, "volume %s, len %d\n", volume, volume_len);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
269
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
270 url_fskip(pb, 112);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
271
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
272 for (type = 0; type != -1 && url_ftell(pb) < next; ) {
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
273 type = get_be16(pb);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
274 len = get_be16(pb);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
275 av_log(c->fc, AV_LOG_DEBUG, "type %d, len %d\n", type, len);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
276 if (len&1)
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
277 len += 1;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
278 if (type == 2) { // absolute path
3092
f9cacbd12145 free in case of multiple type == 2
bcoudurier
parents: 3091
diff changeset
279 av_free(dref->path);
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
280 dref->path = av_mallocz(len+1);
3091
b8df4b5e16d0 return error if malloc fails
bcoudurier
parents: 3090
diff changeset
281 if (!dref->path)
b8df4b5e16d0 return error if malloc fails
bcoudurier
parents: 3090
diff changeset
282 return AVERROR(ENOMEM);
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
283 get_buffer(pb, dref->path, len);
3090
a047cdd6c6b4 fix possible overflow with memmove
bcoudurier
parents: 3086
diff changeset
284 if (len > volume_len && !strncmp(dref->path, volume, volume_len)) {
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
285 len -= volume_len;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
286 memmove(dref->path, dref->path+volume_len, len);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
287 dref->path[len] = 0;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
288 }
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
289 for (j = 0; j < len; j++)
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
290 if (dref->path[j] == ':')
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
291 dref->path[j] = '/';
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
292 av_log(c->fc, AV_LOG_DEBUG, "path %s\n", dref->path);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
293 } else
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
294 url_fskip(pb, len);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
295 }
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
296 }
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
297 url_fseek(pb, next, SEEK_SET);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
298 }
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
299 return 0;
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
300 }
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
301
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
302 static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
303 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
304 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
305 uint32_t type;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
306 uint32_t ctype;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
307
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
308 get_byte(pb); /* version */
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
309 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
310
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
311 /* component type */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
312 ctype = get_le32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
313 type = get_le32(pb); /* component subtype */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
314
2902
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
315 dprintf(c->fc, "ctype= %c%c%c%c (0x%08x)\n", *((char *)&ctype), ((char *)&ctype)[1],
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
316 ((char *)&ctype)[2], ((char *)&ctype)[3], (int) ctype);
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
317 dprintf(c->fc, "stype= %c%c%c%c\n",
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
318 *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
319 if(!ctype)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
320 c->isom = 1;
3254
8fb1e55e0a66 align and remove useless braces
bcoudurier
parents: 3253
diff changeset
321 if (type == MKTAG('v','i','d','e'))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
322 st->codec->codec_type = CODEC_TYPE_VIDEO;
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
323 else if(type == MKTAG('s','o','u','n'))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
324 st->codec->codec_type = CODEC_TYPE_AUDIO;
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
325 else if(type == MKTAG('m','1','a',' '))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
326 st->codec->codec_id = CODEC_ID_MP2;
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
327 else if(type == MKTAG('s','u','b','p')) {
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
328 st->codec->codec_type = CODEC_TYPE_SUBTITLE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
329 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
330 get_be32(pb); /* component manufacture */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
331 get_be32(pb); /* component flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
332 get_be32(pb); /* component flags mask */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
333
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
334 if(atom.size <= 24)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
335 return 0; /* nothing left to read */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
336
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
337 url_fskip(pb, atom.size - (url_ftell(pb) - atom.offset));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
338 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
339 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
340
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
341 static int mp4_read_descr_len(ByteIOContext *pb)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
342 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
343 int len = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
344 int count = 4;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
345 while (count--) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
346 int c = get_byte(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
347 len = (len << 7) | (c & 0x7f);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
348 if (!(c & 0x80))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
349 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
350 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
351 return len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
352 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
353
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
354 static int mp4_read_descr(MOVContext *c, ByteIOContext *pb, int *tag)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
355 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
356 int len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
357 *tag = get_byte(pb);
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
358 len = mp4_read_descr_len(pb);
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
359 dprintf(c->fc, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
360 return len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
361 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
362
2028
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
363 #define MP4ESDescrTag 0x03
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
364 #define MP4DecConfigDescrTag 0x04
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
365 #define MP4DecSpecificDescrTag 0x05
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
366
3261
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
367 static const AVCodecTag mp4_audio_types[] = {
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
368 { CODEC_ID_MP3ON4, 29 }, /* old mp3on4 draft */
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
369 { CODEC_ID_MP3ON4, 32 }, /* layer 1 */
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
370 { CODEC_ID_MP3ON4, 33 }, /* layer 2 */
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
371 { CODEC_ID_MP3ON4, 34 }, /* layer 3 */
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
372 { CODEC_ID_NONE, 0 },
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
373 };
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
374
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
375 static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
376 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
377 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
378 int tag, len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
379
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
380 get_be32(pb); /* version + flags */
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
381 len = mp4_read_descr(c, pb, &tag);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
382 if (tag == MP4ESDescrTag) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
383 get_be16(pb); /* ID */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
384 get_byte(pb); /* priority */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
385 } else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
386 get_be16(pb); /* ID */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
387
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
388 len = mp4_read_descr(c, pb, &tag);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
389 if (tag == MP4DecConfigDescrTag) {
2028
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
390 int object_type_id = get_byte(pb);
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
391 get_byte(pb); /* stream type */
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
392 get_be24(pb); /* buffer size db */
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
393 get_be32(pb); /* max bitrate */
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
394 get_be32(pb); /* avg bitrate */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
395
2028
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
396 st->codec->codec_id= codec_get_id(ff_mp4_obj_type, object_type_id);
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
397 dprintf(c->fc, "esds object type id %d\n", object_type_id);
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
398 len = mp4_read_descr(c, pb, &tag);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
399 if (tag == MP4DecSpecificDescrTag) {
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
400 dprintf(c->fc, "Specific MPEG4 header len=%d\n", len);
3078
099c8f03c62e protect malloc overflow
bcoudurier
parents: 3077
diff changeset
401 if((uint64_t)len > (1<<30))
099c8f03c62e protect malloc overflow
bcoudurier
parents: 3077
diff changeset
402 return -1;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
403 st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
3076
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
404 if (!st->codec->extradata)
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
405 return AVERROR(ENOMEM);
3077
507565d7d611 indentation
bcoudurier
parents: 3076
diff changeset
406 get_buffer(pb, st->codec->extradata, len);
507565d7d611 indentation
bcoudurier
parents: 3076
diff changeset
407 st->codec->extradata_size = len;
3261
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
408 if (st->codec->codec_id == CODEC_ID_AAC) {
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
409 MPEG4AudioConfig cfg;
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
410 ff_mpeg4audio_get_config(&cfg, st->codec->extradata,
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
411 st->codec->extradata_size);
3362
0dfa207c5d69 aac chan config is 0 if bitstream contains program_config_element
bcoudurier
parents: 3313
diff changeset
412 if (cfg.chan_config > 7)
3262
07299732f3b8 set channels and sample rate from mpeg4audio config
bcoudurier
parents: 3261
diff changeset
413 return -1;
07299732f3b8 set channels and sample rate from mpeg4audio config
bcoudurier
parents: 3261
diff changeset
414 st->codec->channels = ff_mpeg4audio_channels[cfg.chan_config];
07299732f3b8 set channels and sample rate from mpeg4audio config
bcoudurier
parents: 3261
diff changeset
415 if (cfg.object_type == 29 && cfg.sampling_index < 3) // old mp3on4
07299732f3b8 set channels and sample rate from mpeg4audio config
bcoudurier
parents: 3261
diff changeset
416 st->codec->sample_rate = ff_mpa_freq_tab[cfg.sampling_index];
07299732f3b8 set channels and sample rate from mpeg4audio config
bcoudurier
parents: 3261
diff changeset
417 else
07299732f3b8 set channels and sample rate from mpeg4audio config
bcoudurier
parents: 3261
diff changeset
418 st->codec->sample_rate = cfg.sample_rate; // ext sample rate ?
07299732f3b8 set channels and sample rate from mpeg4audio config
bcoudurier
parents: 3261
diff changeset
419 dprintf(c->fc, "mp4a config channels %d obj %d ext obj %d "
07299732f3b8 set channels and sample rate from mpeg4audio config
bcoudurier
parents: 3261
diff changeset
420 "sample rate %d ext sample rate %d\n", st->codec->channels,
07299732f3b8 set channels and sample rate from mpeg4audio config
bcoudurier
parents: 3261
diff changeset
421 cfg.object_type, cfg.ext_object_type,
07299732f3b8 set channels and sample rate from mpeg4audio config
bcoudurier
parents: 3261
diff changeset
422 cfg.sample_rate, cfg.ext_sample_rate);
3261
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
423 if (!(st->codec->codec_id = codec_get_id(mp4_audio_types,
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
424 cfg.object_type)))
bf5f112efcff parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents: 3260
diff changeset
425 st->codec->codec_id = CODEC_ID_AAC;
3077
507565d7d611 indentation
bcoudurier
parents: 3076
diff changeset
426 }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
427 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
428 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
429 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
430 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
431
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
432 /* this atom contains actual media data */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
433 static int mov_read_mdat(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
434 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
435 if(atom.size == 0) /* wrong one (MP4) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
436 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
437 c->found_mdat=1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
438 return 0; /* now go for moov */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
439 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
440
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
441 static int mov_read_ftyp(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
442 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
443 uint32_t type = get_le32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
444
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
445 if (type != MKTAG('q','t',' ',' '))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
446 c->isom = 1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
447 av_log(c->fc, AV_LOG_DEBUG, "ISO: File Type Major Brand: %.4s\n",(char *)&type);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
448 get_be32(pb); /* minor version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
449 url_fskip(pb, atom.size - 8);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
450 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
451 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
452
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
453 /* this atom should contain all header atoms */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
454 static int mov_read_moov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
455 {
2806
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
456 if (mov_read_default(c, pb, atom) < 0)
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
457 return -1;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
458 /* we parsed the 'moov' atom, we can terminate the parsing as soon as we find the 'mdat' */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
459 /* so we don't parse the whole file if over a network */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
460 c->found_moov=1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
461 return 0; /* now go for mdat */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
462 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
463
3169
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
464 static int mov_read_moof(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
465 {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
466 c->fragment.moof_offset = url_ftell(pb) - 8;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
467 dprintf(c->fc, "moof offset %llx\n", c->fragment.moof_offset);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
468 return mov_read_default(c, pb, atom);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
469 }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
470
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
471 static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
472 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
473 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
474 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
475 int version = get_byte(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
476 int lang;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
477
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
478 if (version > 1)
3259
2df6f63c4cc5 error is -1
bcoudurier
parents: 3258
diff changeset
479 return -1; /* unsupported */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
480
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
481 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
482 if (version == 1) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
483 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
484 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
485 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
486 get_be32(pb); /* creation time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
487 get_be32(pb); /* modification time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
488 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
489
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
490 sc->time_scale = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
491 st->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
492
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
493 lang = get_be16(pb); /* language */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
494 ff_mov_lang_to_iso639(lang, st->language);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
495 get_be16(pb); /* quality */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
496
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
497 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
498 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
499
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
500 static int mov_read_mvhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
501 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
502 int version = get_byte(pb); /* version */
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
503 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
504
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
505 if (version == 1) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
506 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
507 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
508 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
509 get_be32(pb); /* creation time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
510 get_be32(pb); /* modification time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
511 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
512 c->time_scale = get_be32(pb); /* time scale */
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
513
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
514 dprintf(c->fc, "time scale = %i\n", c->time_scale);
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
515
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
516 c->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
517 get_be32(pb); /* preferred scale */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
518
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
519 get_be16(pb); /* preferred volume */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
520
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
521 url_fskip(pb, 10); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
522
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
523 url_fskip(pb, 36); /* display matrix */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
524
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
525 get_be32(pb); /* preview time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
526 get_be32(pb); /* preview duration */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
527 get_be32(pb); /* poster time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
528 get_be32(pb); /* selection time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
529 get_be32(pb); /* selection duration */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
530 get_be32(pb); /* current time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
531 get_be32(pb); /* next track ID */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
532
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
533 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
534 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
535
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
536 static int mov_read_smi(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
537 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
538 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
539
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
540 if((uint64_t)atom.size > (1<<30))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
541 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
542
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
543 // currently SVQ3 decoder expect full STSD header - so let's fake it
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
544 // this should be fixed and just SMI header should be passed
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
545 av_free(st->codec->extradata);
3076
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
546 st->codec->extradata = av_mallocz(atom.size + 0x5a + FF_INPUT_BUFFER_PADDING_SIZE);
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
547 if (!st->codec->extradata)
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
548 return AVERROR(ENOMEM);
3077
507565d7d611 indentation
bcoudurier
parents: 3076
diff changeset
549 st->codec->extradata_size = 0x5a + atom.size;
507565d7d611 indentation
bcoudurier
parents: 3076
diff changeset
550 memcpy(st->codec->extradata, "SVQ3", 4); // fake
507565d7d611 indentation
bcoudurier
parents: 3076
diff changeset
551 get_buffer(pb, st->codec->extradata + 0x5a, atom.size);
507565d7d611 indentation
bcoudurier
parents: 3076
diff changeset
552 dprintf(c->fc, "Reading SMI %"PRId64" %s\n", atom.size, st->codec->extradata + 0x5a);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
553 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
554 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
555
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
556 static int mov_read_enda(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
557 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
558 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
559 int little_endian = get_be16(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
560
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
561 if (little_endian) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
562 switch (st->codec->codec_id) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
563 case CODEC_ID_PCM_S24BE:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
564 st->codec->codec_id = CODEC_ID_PCM_S24LE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
565 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
566 case CODEC_ID_PCM_S32BE:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
567 st->codec->codec_id = CODEC_ID_PCM_S32LE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
568 break;
3738
0c46eb1cd9b3 Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents: 3626
diff changeset
569 case CODEC_ID_PCM_F32BE:
0c46eb1cd9b3 Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents: 3626
diff changeset
570 st->codec->codec_id = CODEC_ID_PCM_F32LE;
0c46eb1cd9b3 Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents: 3626
diff changeset
571 break;
0c46eb1cd9b3 Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents: 3626
diff changeset
572 case CODEC_ID_PCM_F64BE:
0c46eb1cd9b3 Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents: 3626
diff changeset
573 st->codec->codec_id = CODEC_ID_PCM_F64LE;
0c46eb1cd9b3 Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents: 3626
diff changeset
574 break;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
575 default:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
576 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
577 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
578 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
579 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
580 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
581
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
582 /* FIXME modify qdm2/svq3/h264 decoders to take full atom as extradata */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
583 static int mov_read_extradata(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
584 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
585 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2589
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
586 uint64_t size= (uint64_t)st->codec->extradata_size + atom.size + 8 + FF_INPUT_BUFFER_PADDING_SIZE;
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
587 uint8_t *buf;
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
588 if(size > INT_MAX || (uint64_t)atom.size > INT_MAX)
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
589 return -1;
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
590 buf= av_realloc(st->codec->extradata, size);
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
591 if(!buf)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
592 return -1;
2589
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
593 st->codec->extradata= buf;
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
594 buf+= st->codec->extradata_size;
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
595 st->codec->extradata_size= size - FF_INPUT_BUFFER_PADDING_SIZE;
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
596 AV_WB32( buf , atom.size + 8);
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
597 AV_WL32( buf + 4, atom.type);
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
598 get_buffer(pb, buf + 8, atom.size);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
599 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
600 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
601
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
602 static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
603 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
604 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
605
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
606 if((uint64_t)atom.size > (1<<30))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
607 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
608
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
609 if (st->codec->codec_id == CODEC_ID_QDM2) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
610 // pass all frma atom to codec, needed at least for QDM2
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
611 av_free(st->codec->extradata);
3076
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
612 st->codec->extradata = av_mallocz(atom.size + FF_INPUT_BUFFER_PADDING_SIZE);
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
613 if (!st->codec->extradata)
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
614 return AVERROR(ENOMEM);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
615 st->codec->extradata_size = atom.size;
3076
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
616 get_buffer(pb, st->codec->extradata, atom.size);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
617 } else if (atom.size > 8) { /* to read frma, esds atoms */
2806
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
618 if (mov_read_default(c, pb, atom) < 0)
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
619 return -1;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
620 } else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
621 url_fskip(pb, atom.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
622 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
623 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
624
2837
1caef0e2fb46 supports glbl atom containing generic extradata for all codecs
bcoudurier
parents: 2826
diff changeset
625 /**
1caef0e2fb46 supports glbl atom containing generic extradata for all codecs
bcoudurier
parents: 2826
diff changeset
626 * This function reads atom content and puts data in extradata without tag
1caef0e2fb46 supports glbl atom containing generic extradata for all codecs
bcoudurier
parents: 2826
diff changeset
627 * nor size unlike mov_read_extradata.
1caef0e2fb46 supports glbl atom containing generic extradata for all codecs
bcoudurier
parents: 2826
diff changeset
628 */
1caef0e2fb46 supports glbl atom containing generic extradata for all codecs
bcoudurier
parents: 2826
diff changeset
629 static int mov_read_glbl(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
630 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
631 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
632
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
633 if((uint64_t)atom.size > (1<<30))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
634 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
635
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
636 av_free(st->codec->extradata);
3076
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
637 st->codec->extradata = av_mallocz(atom.size + FF_INPUT_BUFFER_PADDING_SIZE);
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
638 if (!st->codec->extradata)
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
639 return AVERROR(ENOMEM);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
640 st->codec->extradata_size = atom.size;
3076
79fcc3c853d4 fail if extradata cannot be allocated
bcoudurier
parents: 3041
diff changeset
641 get_buffer(pb, st->codec->extradata, atom.size);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
642 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
643 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
644
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
645 static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
646 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
647 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
648 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
649 unsigned int i, entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
650
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
651 get_byte(pb); /* version */
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
652 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
653
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
654 entries = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
655
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
656 if(entries >= UINT_MAX/sizeof(int64_t))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
657 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
658
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
659 sc->chunk_count = entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
660 sc->chunk_offsets = av_malloc(entries * sizeof(int64_t));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
661 if (!sc->chunk_offsets)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
662 return -1;
3254
8fb1e55e0a66 align and remove useless braces
bcoudurier
parents: 3253
diff changeset
663 if (atom.type == MKTAG('s','t','c','o'))
8fb1e55e0a66 align and remove useless braces
bcoudurier
parents: 3253
diff changeset
664 for(i=0; i<entries; i++)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
665 sc->chunk_offsets[i] = get_be32(pb);
3254
8fb1e55e0a66 align and remove useless braces
bcoudurier
parents: 3253
diff changeset
666 else if (atom.type == MKTAG('c','o','6','4'))
8fb1e55e0a66 align and remove useless braces
bcoudurier
parents: 3253
diff changeset
667 for(i=0; i<entries; i++)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
668 sc->chunk_offsets[i] = get_be64(pb);
3254
8fb1e55e0a66 align and remove useless braces
bcoudurier
parents: 3253
diff changeset
669 else
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
670 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
671
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
672 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
673 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
674
3625
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
675 /**
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
676 * Compute codec id for 'lpcm' tag.
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
677 * See CoreAudioTypes and AudioStreamBasicDescription at Apple.
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
678 */
3967
4fd67f05bad9 Use enum typers instead of int.
benoit
parents: 3956
diff changeset
679 static enum CodecID mov_get_lpcm_codec_id(int bps, int flags)
3625
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
680 {
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
681 if (flags & 1) { // floating point
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
682 if (flags & 2) { // big endian
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
683 if (bps == 32) return CODEC_ID_PCM_F32BE;
3751
772eba9f4b30 enable fl32/64 le/be in mov with stsd audio v2
bcoudurier
parents: 3738
diff changeset
684 else if (bps == 64) return CODEC_ID_PCM_F64BE;
3625
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
685 } else {
3751
772eba9f4b30 enable fl32/64 le/be in mov with stsd audio v2
bcoudurier
parents: 3738
diff changeset
686 if (bps == 32) return CODEC_ID_PCM_F32LE;
772eba9f4b30 enable fl32/64 le/be in mov with stsd audio v2
bcoudurier
parents: 3738
diff changeset
687 else if (bps == 64) return CODEC_ID_PCM_F64LE;
3625
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
688 }
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
689 } else {
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
690 if (flags & 2) {
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
691 if (bps == 8)
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
692 // signed integer
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
693 if (flags & 4) return CODEC_ID_PCM_S8;
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
694 else return CODEC_ID_PCM_U8;
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
695 else if (bps == 16) return CODEC_ID_PCM_S16BE;
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
696 else if (bps == 24) return CODEC_ID_PCM_S24BE;
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
697 else if (bps == 32) return CODEC_ID_PCM_S32BE;
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
698 } else {
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
699 if (bps == 8)
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
700 if (flags & 4) return CODEC_ID_PCM_S8;
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
701 else return CODEC_ID_PCM_U8;
3626
3a7f7509bf3c fix if/else case
bcoudurier
parents: 3625
diff changeset
702 else if (bps == 16) return CODEC_ID_PCM_S16LE;
3625
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
703 else if (bps == 24) return CODEC_ID_PCM_S24LE;
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
704 else if (bps == 32) return CODEC_ID_PCM_S32LE;
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
705 }
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
706 }
3967
4fd67f05bad9 Use enum typers instead of int.
benoit
parents: 3956
diff changeset
707 return CODEC_ID_NONE;
3625
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
708 }
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
709
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
710 static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
711 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
712 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
713 MOVStreamContext *sc = st->priv_data;
3263
d9a40edc615a move vars decls where vars are used
bcoudurier
parents: 3262
diff changeset
714 int j, entries, pseudo_stream_id;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
715
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
716 get_byte(pb); /* version */
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
717 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
718
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
719 entries = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
720
3167
125b08d2ad59 cosmetics, split or move too long lines
bcoudurier
parents: 3166
diff changeset
721 for(pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) {
125b08d2ad59 cosmetics, split or move too long lines
bcoudurier
parents: 3166
diff changeset
722 //Parsing Sample description table
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
723 enum CodecID id;
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
724 int dref_id;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
725 MOV_atom_t a = { 0, 0, 0 };
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3967
diff changeset
726 int64_t start_pos = url_ftell(pb);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
727 int size = get_be32(pb); /* size */
3263
d9a40edc615a move vars decls where vars are used
bcoudurier
parents: 3262
diff changeset
728 uint32_t format = get_le32(pb); /* data format */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
729
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
730 get_be32(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
731 get_be16(pb); /* reserved */
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
732 dref_id = get_be16(pb);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
733
3022
800db1ceafc6 Allow the user to select which codec out of several in stsd he wants.
michael
parents: 2974
diff changeset
734 if (st->codec->codec_tag &&
3299
80a497804aa8 demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451
bcoudurier
parents: 3286
diff changeset
735 st->codec->codec_tag != format &&
3022
800db1ceafc6 Allow the user to select which codec out of several in stsd he wants.
michael
parents: 2974
diff changeset
736 (c->fc->video_codec_id ? codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
737 : st->codec->codec_tag != MKTAG('j','p','e','g'))
3022
800db1ceafc6 Allow the user to select which codec out of several in stsd he wants.
michael
parents: 2974
diff changeset
738 ){
3135
cf8df6a00eb5 misc spelling fixes
diego
parents: 3095
diff changeset
739 /* Multiple fourcc, we skip JPEG. This is not correct, we should
cf8df6a00eb5 misc spelling fixes
diego
parents: 3095
diff changeset
740 * export it as a separate AVStream but this needs a few changes
cf8df6a00eb5 misc spelling fixes
diego
parents: 3095
diff changeset
741 * in the MOV demuxer, patch welcome. */
3300
5d77af33c378 warn about multiple fourcc
bcoudurier
parents: 3299
diff changeset
742 av_log(c->fc, AV_LOG_WARNING, "multiple fourcc not supported\n");
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
743 url_fskip(pb, size - (url_ftell(pb) - start_pos));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
744 continue;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
745 }
3299
80a497804aa8 demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451
bcoudurier
parents: 3286
diff changeset
746 sc->pseudo_stream_id = st->codec->codec_tag ? -1 : pseudo_stream_id;
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
747 sc->dref_id= dref_id;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
748
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
749 st->codec->codec_tag = format;
1847
922180a45610 recommit of the change below after reverting earlier cosmetic-functional mix
michael
parents: 1846
diff changeset
750 id = codec_get_id(codec_movaudio_tags, format);
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
751 if (id<=0 && (format&0xFFFF) == 'm'+('s'<<8))
2298
4f946c9ae9b3 detect MS wav codecs
michael
parents: 2296
diff changeset
752 id = codec_get_id(codec_wav_tags, bswap_32(format)&0xFFFF);
4f946c9ae9b3 detect MS wav codecs
michael
parents: 2296
diff changeset
753
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
754 if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
755 st->codec->codec_type = CODEC_TYPE_AUDIO;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
756 } else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
757 format && format != MKTAG('m','p','4','s')) { /* skip old asf mpeg4 tag */
1847
922180a45610 recommit of the change below after reverting earlier cosmetic-functional mix
michael
parents: 1846
diff changeset
758 id = codec_get_id(codec_movvideo_tags, format);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
759 if (id <= 0)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
760 id = codec_get_id(codec_bmp_tags, format);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
761 if (id > 0)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
762 st->codec->codec_type = CODEC_TYPE_VIDEO;
2969
f3a3115a96e4 Set correct codec type and id for text subtitles.
michael
parents: 2968
diff changeset
763 else if(st->codec->codec_type == CODEC_TYPE_DATA){
f3a3115a96e4 Set correct codec type and id for text subtitles.
michael
parents: 2968
diff changeset
764 id = codec_get_id(ff_codec_movsubtitle_tags, format);
f3a3115a96e4 Set correct codec type and id for text subtitles.
michael
parents: 2968
diff changeset
765 if(id > 0)
f3a3115a96e4 Set correct codec type and id for text subtitles.
michael
parents: 2968
diff changeset
766 st->codec->codec_type = CODEC_TYPE_SUBTITLE;
f3a3115a96e4 Set correct codec type and id for text subtitles.
michael
parents: 2968
diff changeset
767 }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
768 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
769
2902
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
770 dprintf(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n", size,
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
771 (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff,
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
772 (format >> 24) & 0xff, st->codec->codec_type);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
773
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
774 if(st->codec->codec_type==CODEC_TYPE_VIDEO) {
3263
d9a40edc615a move vars decls where vars are used
bcoudurier
parents: 3262
diff changeset
775 uint8_t codec_name[32];
d9a40edc615a move vars decls where vars are used
bcoudurier
parents: 3262
diff changeset
776 unsigned int color_depth;
d9a40edc615a move vars decls where vars are used
bcoudurier
parents: 3262
diff changeset
777 int color_greyscale;
d9a40edc615a move vars decls where vars are used
bcoudurier
parents: 3262
diff changeset
778
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
779 st->codec->codec_id = id;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
780 get_be16(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
781 get_be16(pb); /* revision level */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
782 get_be32(pb); /* vendor */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
783 get_be32(pb); /* temporal quality */
2730
7782a46ddbf5 comment typo
diego
parents: 2665
diff changeset
784 get_be32(pb); /* spatial quality */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
785
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
786 st->codec->width = get_be16(pb); /* width */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
787 st->codec->height = get_be16(pb); /* height */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
788
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
789 get_be32(pb); /* horiz resolution */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
790 get_be32(pb); /* vert resolution */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
791 get_be32(pb); /* data size, always 0 */
3264
5eaed4c6b97f remove unneeded variable
bcoudurier
parents: 3263
diff changeset
792 get_be16(pb); /* frames per samples */
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
793
3265
5d2a64fd4496 yes it is true for mp4
bcoudurier
parents: 3264
diff changeset
794 get_buffer(pb, codec_name, 32); /* codec name, pascal string */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
795 if (codec_name[0] <= 31) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
796 memcpy(st->codec->codec_name, &codec_name[1],codec_name[0]);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
797 st->codec->codec_name[codec_name[0]] = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
798 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
799
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
800 st->codec->bits_per_coded_sample = get_be16(pb); /* depth */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
801 st->codec->color_table_id = get_be16(pb); /* colortable id */
3095
da04b574d131 set codec bps to grayscale bits, fix 256grey.mov
bcoudurier
parents: 3093
diff changeset
802 dprintf(c->fc, "depth %d, ctab id %d\n",
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
803 st->codec->bits_per_coded_sample, st->codec->color_table_id);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
804 /* figure out the palette situation */
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
805 color_depth = st->codec->bits_per_coded_sample & 0x1F;
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
806 color_greyscale = st->codec->bits_per_coded_sample & 0x20;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
807
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
808 /* if the depth is 2, 4, or 8 bpp, file is palettized */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
809 if ((color_depth == 2) || (color_depth == 4) ||
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
810 (color_depth == 8)) {
3257
2f5837726057 move vars decls where vars are used
bcoudurier
parents: 3256
diff changeset
811 /* for palette traversal */
2f5837726057 move vars decls where vars are used
bcoudurier
parents: 3256
diff changeset
812 unsigned int color_start, color_count, color_end;
2f5837726057 move vars decls where vars are used
bcoudurier
parents: 3256
diff changeset
813 unsigned char r, g, b;
2f5837726057 move vars decls where vars are used
bcoudurier
parents: 3256
diff changeset
814
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
815 if (color_greyscale) {
3257
2f5837726057 move vars decls where vars are used
bcoudurier
parents: 3256
diff changeset
816 int color_index, color_dec;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
817 /* compute the greyscale palette */
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
818 st->codec->bits_per_coded_sample = color_depth;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
819 color_count = 1 << color_depth;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
820 color_index = 255;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
821 color_dec = 256 / (color_count - 1);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
822 for (j = 0; j < color_count; j++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
823 r = g = b = color_index;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
824 c->palette_control.palette[j] =
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
825 (r << 16) | (g << 8) | (b);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
826 color_index -= color_dec;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
827 if (color_index < 0)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
828 color_index = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
829 }
3179
5f56b694f9bf according to specs, only color table id set to 0, have it in stsd, fix 4colors.mov
bcoudurier
parents: 3178
diff changeset
830 } else if (st->codec->color_table_id) {
3257
2f5837726057 move vars decls where vars are used
bcoudurier
parents: 3256
diff changeset
831 const uint8_t *color_table;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
832 /* if flag bit 3 is set, use the default palette */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
833 color_count = 1 << color_depth;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
834 if (color_depth == 2)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
835 color_table = ff_qt_default_palette_4;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
836 else if (color_depth == 4)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
837 color_table = ff_qt_default_palette_16;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
838 else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
839 color_table = ff_qt_default_palette_256;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
840
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
841 for (j = 0; j < color_count; j++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
842 r = color_table[j * 4 + 0];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
843 g = color_table[j * 4 + 1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
844 b = color_table[j * 4 + 2];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
845 c->palette_control.palette[j] =
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
846 (r << 16) | (g << 8) | (b);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
847 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
848 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
849 /* load the palette from the file */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
850 color_start = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
851 color_count = get_be16(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
852 color_end = get_be16(pb);
2809
17086a526938 Check sanity in the palette loading operation. The addresses a potential security risk in
melanson
parents: 2807
diff changeset
853 if ((color_start <= 255) &&
17086a526938 Check sanity in the palette loading operation. The addresses a potential security risk in
melanson
parents: 2807
diff changeset
854 (color_end <= 255)) {
2810
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
855 for (j = color_start; j <= color_end; j++) {
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
856 /* each R, G, or B component is 16 bits;
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
857 * only use the top 8 bits; skip alpha bytes
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
858 * up front */
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
859 get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
860 get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
861 r = get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
862 get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
863 g = get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
864 get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
865 b = get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
866 get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
867 c->palette_control.palette[j] =
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
868 (r << 16) | (g << 8) | (b);
2809
17086a526938 Check sanity in the palette loading operation. The addresses a potential security risk in
melanson
parents: 2807
diff changeset
869 }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
870 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
871 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
872 st->codec->palctrl = &c->palette_control;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
873 st->codec->palctrl->palette_changed = 1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
874 } else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
875 st->codec->palctrl = NULL;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
876 } else if(st->codec->codec_type==CODEC_TYPE_AUDIO) {
3622
ab0641ec543b support big endian lpcm with audio stsd v2
bcoudurier
parents: 3621
diff changeset
877 int bits_per_sample, flags;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
878 uint16_t version = get_be16(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
879
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
880 st->codec->codec_id = id;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
881 get_be16(pb); /* revision level */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
882 get_be32(pb); /* vendor */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
883
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
884 st->codec->channels = get_be16(pb); /* channel count */
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
885 dprintf(c->fc, "audio channels %d\n", st->codec->channels);
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
886 st->codec->bits_per_coded_sample = get_be16(pb); /* sample size */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
887
3029
10abe8748ec2 use correct demux mechanism when audio compression id is -2, dv audio does not matter, demux partially qt_dv_pal_test.mov which does NOT use cid -2
bcoudurier
parents: 3027
diff changeset
888 sc->audio_cid = get_be16(pb);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
889 get_be16(pb); /* packet size = 0 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
890
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
891 st->codec->sample_rate = ((get_be32(pb) >> 16));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
892
3619
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
893 //Read QT version 1 fields. In version 0 these do not exist.
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
894 dprintf(c->fc, "version =%d, isom =%d\n",version,c->isom);
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
895 if(!c->isom) {
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
896 if(version==1) {
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
897 sc->samples_per_frame = get_be32(pb);
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
898 get_be32(pb); /* bytes per packet */
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
899 sc->bytes_per_frame = get_be32(pb);
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
900 get_be32(pb); /* bytes per sample */
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
901 } else if(version==2) {
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
902 get_be32(pb); /* sizeof struct only */
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
903 st->codec->sample_rate = av_int2dbl(get_be64(pb)); /* float 64 */
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
904 st->codec->channels = get_be32(pb);
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
905 get_be32(pb); /* always 0x7F000000 */
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
906 st->codec->bits_per_coded_sample = get_be32(pb); /* bits per channel if sound is uncompressed */
3622
ab0641ec543b support big endian lpcm with audio stsd v2
bcoudurier
parents: 3621
diff changeset
907 flags = get_be32(pb); /* lcpm format specific flag */
3620
a52f6dd66490 more complete audio stsd v2
bcoudurier
parents: 3619
diff changeset
908 sc->bytes_per_frame = get_be32(pb); /* bytes per audio packet if constant */
a52f6dd66490 more complete audio stsd v2
bcoudurier
parents: 3619
diff changeset
909 sc->samples_per_frame = get_be32(pb); /* lpcm frames per audio packet if constant */
3625
022f5a9504db full lpcm support in mov audio stsd v2
bcoudurier
parents: 3622
diff changeset
910 if (format == MKTAG('l','p','c','m'))
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
911 st->codec->codec_id = mov_get_lpcm_codec_id(st->codec->bits_per_coded_sample, flags);
3619
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
912 }
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
913 }
bd4b7c8fec83 move version specific parsing code before codec specific code, will be needed
bcoudurier
parents: 3615
diff changeset
914
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
915 switch (st->codec->codec_id) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
916 case CODEC_ID_PCM_S8:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
917 case CODEC_ID_PCM_U8:
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
918 if (st->codec->bits_per_coded_sample == 16)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
919 st->codec->codec_id = CODEC_ID_PCM_S16BE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
920 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
921 case CODEC_ID_PCM_S16LE:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
922 case CODEC_ID_PCM_S16BE:
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
923 if (st->codec->bits_per_coded_sample == 8)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
924 st->codec->codec_id = CODEC_ID_PCM_S8;
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
925 else if (st->codec->bits_per_coded_sample == 24)
3621
0415fc41780a keep original codec/fourcc endianness, fix XDCAMHD.mov
bcoudurier
parents: 3620
diff changeset
926 st->codec->codec_id =
0415fc41780a keep original codec/fourcc endianness, fix XDCAMHD.mov
bcoudurier
parents: 3620
diff changeset
927 st->codec->codec_id == CODEC_ID_PCM_S16BE ?
0415fc41780a keep original codec/fourcc endianness, fix XDCAMHD.mov
bcoudurier
parents: 3620
diff changeset
928 CODEC_ID_PCM_S24BE : CODEC_ID_PCM_S24LE;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
929 break;
3036
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
930 /* set values for old format before stsd version 1 appeared */
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
931 case CODEC_ID_MACE3:
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
932 sc->samples_per_frame = 6;
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
933 sc->bytes_per_frame = 2*st->codec->channels;
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
934 break;
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
935 case CODEC_ID_MACE6:
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
936 sc->samples_per_frame = 6;
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
937 sc->bytes_per_frame = 1*st->codec->channels;
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
938 break;
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
939 case CODEC_ID_ADPCM_IMA_QT:
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
940 sc->samples_per_frame = 64;
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
941 sc->bytes_per_frame = 34*st->codec->channels;
62181fbfc128 remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents: 3034
diff changeset
942 break;
3252
f4fcd39c5d7f set gsm default frame size and bytes per frame, needed by old qt format, fix sample-gsm-8000.mov
bcoudurier
parents: 3245
diff changeset
943 case CODEC_ID_GSM:
f4fcd39c5d7f set gsm default frame size and bytes per frame, needed by old qt format, fix sample-gsm-8000.mov
bcoudurier
parents: 3245
diff changeset
944 sc->samples_per_frame = 160;
f4fcd39c5d7f set gsm default frame size and bytes per frame, needed by old qt format, fix sample-gsm-8000.mov
bcoudurier
parents: 3245
diff changeset
945 sc->bytes_per_frame = 33;
f4fcd39c5d7f set gsm default frame size and bytes per frame, needed by old qt format, fix sample-gsm-8000.mov
bcoudurier
parents: 3245
diff changeset
946 break;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
947 default:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
948 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
949 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
950
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
951 bits_per_sample = av_get_bits_per_sample(st->codec->codec_id);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
952 if (bits_per_sample) {
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3796
diff changeset
953 st->codec->bits_per_coded_sample = bits_per_sample;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
954 sc->sample_size = (bits_per_sample >> 3) * st->codec->channels;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
955 }
2972
bc330130bdce Set subtitle codec id correctly, i hope this does not break anything.
michael
parents: 2970
diff changeset
956 } else if(st->codec->codec_type==CODEC_TYPE_SUBTITLE){
bc330130bdce Set subtitle codec id correctly, i hope this does not break anything.
michael
parents: 2970
diff changeset
957 st->codec->codec_id= id;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
958 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
959 /* other codec type, just skip (rtp, mp4s, tmcd ...) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
960 url_fskip(pb, size - (url_ftell(pb) - start_pos));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
961 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
962 /* this will read extra atoms at the end (wave, alac, damr, avcC, SMI ...) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
963 a.size = size - (url_ftell(pb) - start_pos);
2806
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
964 if (a.size > 8) {
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
965 if (mov_read_default(c, pb, a) < 0)
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
966 return -1;
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
967 } else if (a.size > 0)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
968 url_fskip(pb, a.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
969 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
970
3084
1fd2a702fe49 remove useless braces
bcoudurier
parents: 3083
diff changeset
971 if(st->codec->codec_type==CODEC_TYPE_AUDIO && st->codec->sample_rate==0 && sc->time_scale>1)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
972 st->codec->sample_rate= sc->time_scale;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
973
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
974 /* special codec parameters handling */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
975 switch (st->codec->codec_id) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
976 #ifdef CONFIG_DV_DEMUXER
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
977 case CODEC_ID_DVAUDIO:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
978 c->dv_fctx = av_alloc_format_context();
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
979 c->dv_demux = dv_init_demux(c->dv_fctx);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
980 if (!c->dv_demux) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
981 av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n");
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
982 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
983 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
984 sc->dv_audio_container = 1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
985 st->codec->codec_id = CODEC_ID_PCM_S16LE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
986 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
987 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
988 /* no ifdef since parameters are always those */
3245
9f25267bee44 demux qcelp, so this can work with soc decoder and stream copy
bcoudurier
parents: 3242
diff changeset
989 case CODEC_ID_QCELP:
3256
b09eff5b0e89 parser should not be needed anymore, merge cases and set frame size for amr too
bcoudurier
parents: 3255
diff changeset
990 case CODEC_ID_AMR_NB:
3933
4ab8a237c386 merge amr wb case with amr nb and qcelp
bcoudurier
parents: 3932
diff changeset
991 case CODEC_ID_AMR_WB:
3258
6aabf84abeef cosmetics
bcoudurier
parents: 3257
diff changeset
992 st->codec->frame_size= sc->samples_per_frame;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
993 st->codec->channels= 1; /* really needed */
3974
a8383d02c686 set sample rate for amr to allow stream copy since no decoder is present,
bcoudurier
parents: 3973
diff changeset
994 /* force sample rate for amr, stsd in 3gp does not store sample rate */
3989
8b2c1cfecd94 10l, fix amrwb sample rate
bcoudurier
parents: 3974
diff changeset
995 if (st->codec->codec_id == CODEC_ID_AMR_NB)
3974
a8383d02c686 set sample rate for amr to allow stream copy since no decoder is present,
bcoudurier
parents: 3973
diff changeset
996 st->codec->sample_rate = 8000;
3989
8b2c1cfecd94 10l, fix amrwb sample rate
bcoudurier
parents: 3974
diff changeset
997 else if (st->codec->codec_id == CODEC_ID_AMR_WB)
8b2c1cfecd94 10l, fix amrwb sample rate
bcoudurier
parents: 3974
diff changeset
998 st->codec->sample_rate = 16000;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
999 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1000 case CODEC_ID_MP2:
1953
edfd6b33d1f6 activate parser on MP3 id, fix [A-Destiny]_Konjiki_no_Gash_Bell_-_65_[71EE362C].mp4
bcoudurier
parents: 1950
diff changeset
1001 case CODEC_ID_MP3:
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1002 st->codec->codec_type = CODEC_TYPE_AUDIO; /* force type after stsd for m1a hdlr */
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2006
diff changeset
1003 st->need_parsing = AVSTREAM_PARSE_FULL;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1004 break;
3187
5c8fc77cf10a gsm in mov, demux surge-1-16-B-agsm.mov
bcoudurier
parents: 3182
diff changeset
1005 case CODEC_ID_GSM:
2299
fe59c768ecf7 set block align to stsd audio v2 bytes per frame for adpcm ms and ima wav, fix surge-2-16-L-ms11.mov and surge-2-16-L-ms02.mov
bcoudurier
parents: 2298
diff changeset
1006 case CODEC_ID_ADPCM_MS:
fe59c768ecf7 set block align to stsd audio v2 bytes per frame for adpcm ms and ima wav, fix surge-2-16-L-ms11.mov and surge-2-16-L-ms02.mov
bcoudurier
parents: 2298
diff changeset
1007 case CODEC_ID_ADPCM_IMA_WAV:
fe59c768ecf7 set block align to stsd audio v2 bytes per frame for adpcm ms and ima wav, fix surge-2-16-L-ms11.mov and surge-2-16-L-ms02.mov
bcoudurier
parents: 2298
diff changeset
1008 st->codec->block_align = sc->bytes_per_frame;
fe59c768ecf7 set block align to stsd audio v2 bytes per frame for adpcm ms and ima wav, fix surge-2-16-L-ms11.mov and surge-2-16-L-ms02.mov
bcoudurier
parents: 2298
diff changeset
1009 break;
3242
0b65c21ef10f set alac frame size from extradata
bcoudurier
parents: 3224
diff changeset
1010 case CODEC_ID_ALAC:
0b65c21ef10f set alac frame size from extradata
bcoudurier
parents: 3224
diff changeset
1011 if (st->codec->extradata_size == 36)
0b65c21ef10f set alac frame size from extradata
bcoudurier
parents: 3224
diff changeset
1012 st->codec->frame_size = AV_RB32((st->codec->extradata+12));
0b65c21ef10f set alac frame size from extradata
bcoudurier
parents: 3224
diff changeset
1013 break;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1014 default:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1015 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1016 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1017
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1018 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1019 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1020
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1021 static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1022 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1023 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
1024 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1025 unsigned int i, entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1026
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1027 get_byte(pb); /* version */
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
1028 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1029
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1030 entries = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1031
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
1032 if(entries >= UINT_MAX / sizeof(MOV_stsc_t))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1033 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1034
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
1035 dprintf(c->fc, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1, entries);
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
1036
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1037 sc->sample_to_chunk_sz = entries;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
1038 sc->sample_to_chunk = av_malloc(entries * sizeof(MOV_stsc_t));
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1039 if (!sc->sample_to_chunk)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1040 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1041 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1042 sc->sample_to_chunk[i].first = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1043 sc->sample_to_chunk[i].count = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1044 sc->sample_to_chunk[i].id = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1045 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1046 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1047 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1048
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1049 static int mov_read_stss(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1050 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1051 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
1052 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1053 unsigned int i, entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1054
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1055 get_byte(pb); /* version */
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
1056 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1057
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1058 entries = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1059
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
1060 if(entries >= UINT_MAX / sizeof(int))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1061 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1062
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1063 sc->keyframe_count = entries;
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
1064
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
1065 dprintf(c->fc, "keyframe_count = %d\n", sc->keyframe_count);
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
1066
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
1067 sc->keyframes = av_malloc(entries * sizeof(int));
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1068 if (!sc->keyframes)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1069 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1070 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1071 sc->keyframes[i] = get_be32(pb);
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
1072 //dprintf(c->fc, "keyframes[]=%d\n", sc->keyframes[i]);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1073 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1074 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1075 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1076
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1077 static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1078 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1079 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
1080 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1081 unsigned int i, entries, sample_size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1082
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1083 get_byte(pb); /* version */
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
1084 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1085
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1086 sample_size = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1087 if (!sc->sample_size) /* do not overwrite value computed in stsd */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1088 sc->sample_size = sample_size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1089 entries = get_be32(pb);
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
1090 if(entries >= UINT_MAX / sizeof(int))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1091 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1092
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1093 sc->sample_count = entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1094 if (sample_size)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1095 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1096
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
1097 dprintf(c->fc, "sample_size = %d sample_count = %d\n", sc->sample_size, sc->sample_count);
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
1098
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
1099 sc->sample_sizes = av_malloc(entries * sizeof(int));
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1100 if (!sc->sample_sizes)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1101 return -1;
3156
487b1979f195 remove useless debug print since now mov_build_index will do
bcoudurier
parents: 3155
diff changeset
1102 for(i=0; i<entries; i++)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1103 sc->sample_sizes[i] = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1104 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1105 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1106
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1107 static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1108 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1109 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
1110 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1111 unsigned int i, entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1112 int64_t duration=0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1113 int64_t total_sample_count=0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1114
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1115 get_byte(pb); /* version */
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
1116 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1117 entries = get_be32(pb);
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
1118 if(entries >= UINT_MAX / sizeof(MOV_stts_t))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1119 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1120
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1121 sc->stts_count = entries;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
1122 sc->stts_data = av_malloc(entries * sizeof(MOV_stts_t));
2807
5bf4b9df2794 return error if malloc failed, found by takis, fix issue 286
bcoudurier
parents: 2806
diff changeset
1123 if (!sc->stts_data)
5bf4b9df2794 return error if malloc failed, found by takis, fix issue 286
bcoudurier
parents: 2806
diff changeset
1124 return -1;
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
1125 dprintf(c->fc, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1, entries);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1126
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1127 sc->time_rate=0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1128
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1129 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1130 int sample_duration;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1131 int sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1132
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1133 sample_count=get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1134 sample_duration = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1135 sc->stts_data[i].count= sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1136 sc->stts_data[i].duration= sample_duration;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1137
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1138 sc->time_rate= ff_gcd(sc->time_rate, sample_duration);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1139
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1140 dprintf(c->fc, "sample_count=%d, sample_duration=%d\n",sample_count,sample_duration);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1141
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1142 duration+=(int64_t)sample_duration*sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1143 total_sample_count+=sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1144 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1145
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1146 st->nb_frames= total_sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1147 if(duration)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1148 st->duration= duration;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1149 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1150 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1151
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1152 static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1153 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1154 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
1155 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1156 unsigned int i, entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1157
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1158 get_byte(pb); /* version */
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
1159 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1160 entries = get_be32(pb);
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
1161 if(entries >= UINT_MAX / sizeof(MOV_stts_t))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1162 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1163
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1164 sc->ctts_count = entries;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
1165 sc->ctts_data = av_malloc(entries * sizeof(MOV_stts_t));
2807
5bf4b9df2794 return error if malloc failed, found by takis, fix issue 286
bcoudurier
parents: 2806
diff changeset
1166 if (!sc->ctts_data)
5bf4b9df2794 return error if malloc failed, found by takis, fix issue 286
bcoudurier
parents: 2806
diff changeset
1167 return -1;
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1168 dprintf(c->fc, "track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1169
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1170 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1171 int count =get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1172 int duration =get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1173
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1174 if (duration < 0) {
3956
8bdecea89071 support negative ctts in some way, unset wrong dts
bcoudurier
parents: 3935
diff changeset
1175 sc->wrong_dts = 1;
8bdecea89071 support negative ctts in some way, unset wrong dts
bcoudurier
parents: 3935
diff changeset
1176 st->codec->has_b_frames = 1;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1177 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1178 sc->ctts_data[i].count = count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1179 sc->ctts_data[i].duration= duration;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1180
3956
8bdecea89071 support negative ctts in some way, unset wrong dts
bcoudurier
parents: 3935
diff changeset
1181 sc->time_rate= ff_gcd(sc->time_rate, FFABS(duration));
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1182 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1183 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1184 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1185
3154
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1186 static void mov_build_index(MOVContext *mov, AVStream *st)
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1187 {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1188 MOVStreamContext *sc = st->priv_data;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3967
diff changeset
1189 int64_t current_offset;
3154
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1190 int64_t current_dts = 0;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1191 unsigned int stts_index = 0;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1192 unsigned int stsc_index = 0;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1193 unsigned int stss_index = 0;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1194 unsigned int i, j;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1195
3178
73b7ef886091 Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
bcoudurier
parents: 3175
diff changeset
1196 /* only use old uncompressed audio chunk demuxing when stts specifies it */
73b7ef886091 Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
bcoudurier
parents: 3175
diff changeset
1197 if (!(st->codec->codec_type == CODEC_TYPE_AUDIO &&
73b7ef886091 Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
bcoudurier
parents: 3175
diff changeset
1198 sc->stts_count == 1 && sc->stts_data[0].duration == 1)) {
3154
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1199 unsigned int current_sample = 0;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1200 unsigned int stts_sample = 0;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1201 unsigned int keyframe, sample_size;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1202 unsigned int distance = 0;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1203 int key_off = sc->keyframes && sc->keyframes[0] == 1;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1204
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1205 st->nb_frames = sc->sample_count;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1206 for (i = 0; i < sc->chunk_count; i++) {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1207 current_offset = sc->chunk_offsets[i];
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1208 if (stsc_index + 1 < sc->sample_to_chunk_sz &&
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1209 i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1210 stsc_index++;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1211 for (j = 0; j < sc->sample_to_chunk[stsc_index].count; j++) {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1212 if (current_sample >= sc->sample_count) {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1213 av_log(mov->fc, AV_LOG_ERROR, "wrong sample count\n");
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1214 goto out;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1215 }
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1216 keyframe = !sc->keyframe_count || current_sample+key_off == sc->keyframes[stss_index];
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1217 if (keyframe) {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1218 distance = 0;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1219 if (stss_index + 1 < sc->keyframe_count)
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1220 stss_index++;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1221 }
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1222 sample_size = sc->sample_size > 0 ? sc->sample_size : sc->sample_sizes[current_sample];
3299
80a497804aa8 demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451
bcoudurier
parents: 3286
diff changeset
1223 if(sc->pseudo_stream_id == -1 ||
3301
11b6da5ffe78 only print debug info when sample is actually added
bcoudurier
parents: 3300
diff changeset
1224 sc->sample_to_chunk[stsc_index].id - 1 == sc->pseudo_stream_id) {
3154
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1225 av_add_index_entry(st, current_offset, current_dts, sample_size, distance,
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1226 keyframe ? AVINDEX_KEYFRAME : 0);
3301
11b6da5ffe78 only print debug info when sample is actually added
bcoudurier
parents: 3300
diff changeset
1227 dprintf(mov->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
11b6da5ffe78 only print debug info when sample is actually added
bcoudurier
parents: 3300
diff changeset
1228 "size %d, distance %d, keyframe %d\n", st->index, current_sample,
11b6da5ffe78 only print debug info when sample is actually added
bcoudurier
parents: 3300
diff changeset
1229 current_offset, current_dts, sample_size, distance, keyframe);
11b6da5ffe78 only print debug info when sample is actually added
bcoudurier
parents: 3300
diff changeset
1230 }
3154
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1231 current_offset += sample_size;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1232 assert(sc->stts_data[stts_index].duration % sc->time_rate == 0);
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1233 current_dts += sc->stts_data[stts_index].duration / sc->time_rate;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1234 distance++;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1235 stts_sample++;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1236 current_sample++;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1237 if (stts_index + 1 < sc->stts_count && stts_sample == sc->stts_data[stts_index].count) {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1238 stts_sample = 0;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1239 stts_index++;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1240 }
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1241 }
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1242 }
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1243 } else { /* read whole chunk */
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1244 unsigned int chunk_samples, chunk_size, chunk_duration;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1245 unsigned int frames = 1;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1246 for (i = 0; i < sc->chunk_count; i++) {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1247 current_offset = sc->chunk_offsets[i];
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1248 if (stsc_index + 1 < sc->sample_to_chunk_sz &&
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1249 i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1250 stsc_index++;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1251 chunk_samples = sc->sample_to_chunk[stsc_index].count;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1252 /* get chunk size, beware of alaw/ulaw/mace */
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1253 if (sc->samples_per_frame > 0 &&
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1254 (chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0)) {
3255
8e58c03f8e99 lower frame size to split amr/qcelp/gsm frames
bcoudurier
parents: 3254
diff changeset
1255 if (sc->samples_per_frame < 160)
3154
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1256 chunk_size = chunk_samples * sc->bytes_per_frame / sc->samples_per_frame;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1257 else {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1258 chunk_size = sc->bytes_per_frame;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1259 frames = chunk_samples / sc->samples_per_frame;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1260 chunk_samples = sc->samples_per_frame;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1261 }
3173
cb3eb255f80d sample size to 1 might happen for data, fix GMCMidiaASX.mov, fallback is better than failing
bcoudurier
parents: 3170
diff changeset
1262 } else
3154
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1263 chunk_size = chunk_samples * sc->sample_size;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1264 for (j = 0; j < frames; j++) {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1265 av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME);
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1266 /* get chunk duration */
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1267 chunk_duration = 0;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1268 while (chunk_samples > 0) {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1269 if (chunk_samples < sc->stts_data[stts_index].count) {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1270 chunk_duration += sc->stts_data[stts_index].duration * chunk_samples;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1271 sc->stts_data[stts_index].count -= chunk_samples;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1272 break;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1273 } else {
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1274 chunk_duration += sc->stts_data[stts_index].duration * chunk_samples;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1275 chunk_samples -= sc->stts_data[stts_index].count;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1276 if (stts_index + 1 < sc->stts_count)
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1277 stts_index++;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1278 }
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1279 }
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1280 current_offset += sc->bytes_per_frame;
3167
125b08d2ad59 cosmetics, split or move too long lines
bcoudurier
parents: 3166
diff changeset
1281 dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", "
125b08d2ad59 cosmetics, split or move too long lines
bcoudurier
parents: 3166
diff changeset
1282 "size %d, duration %d\n", st->index, i, current_offset, current_dts,
125b08d2ad59 cosmetics, split or move too long lines
bcoudurier
parents: 3166
diff changeset
1283 chunk_size, chunk_duration);
3154
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1284 assert(chunk_duration % sc->time_rate == 0);
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1285 current_dts += chunk_duration / sc->time_rate;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1286 }
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1287 }
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1288 }
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1289 out:
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1290 /* adjust sample count to avindex entries */
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1291 sc->sample_count = st->nb_index_entries;
01f6f3c905db move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents: 3153
diff changeset
1292 }
3153
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1293
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1294 static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1295 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1296 AVStream *st;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1297 MOVStreamContext *sc;
3153
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1298 int ret;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1299
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1300 st = av_new_stream(c->fc, c->fc->nb_streams);
3162
5e03e5577f79 return ENOMEM
bcoudurier
parents: 3161
diff changeset
1301 if (!st) return AVERROR(ENOMEM);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1302 sc = av_mallocz(sizeof(MOVStreamContext));
3161
60be75aa8c47 cannot free AVStream like this, and return ENOMEM
bcoudurier
parents: 3160
diff changeset
1303 if (!sc) return AVERROR(ENOMEM);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1304
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1305 st->priv_data = sc;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1306 st->codec->codec_type = CODEC_TYPE_DATA;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1307 st->start_time = 0; /* XXX: check */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1308
3153
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1309 if ((ret = mov_read_default(c, pb, atom)) < 0)
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1310 return ret;
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1311
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1312 /* sanity checks */
3191
68c7fd8c44ca support mp4 fragmented files without any samples in the moov atom
bcoudurier
parents: 3190
diff changeset
1313 if(sc->chunk_count && (!sc->stts_count || !sc->sample_to_chunk_sz ||
68c7fd8c44ca support mp4 fragmented files without any samples in the moov atom
bcoudurier
parents: 3190
diff changeset
1314 (!sc->sample_size && !sc->sample_count))){
3180
a8fe6b542c6b print stream index in error message
bcoudurier
parents: 3179
diff changeset
1315 av_log(c->fc, AV_LOG_ERROR, "stream %d, missing mandatory atoms, broken header\n",
a8fe6b542c6b print stream index in error message
bcoudurier
parents: 3179
diff changeset
1316 st->index);
3153
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1317 sc->sample_count = 0; //ignore track
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1318 return 0;
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1319 }
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1320 if(!sc->time_rate)
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1321 sc->time_rate=1;
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1322 if(!sc->time_scale)
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1323 sc->time_scale= c->time_scale;
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1324 av_set_pts_info(st, 64, sc->time_rate, sc->time_scale);
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1325
3245
9f25267bee44 demux qcelp, so this can work with soc decoder and stream copy
bcoudurier
parents: 3242
diff changeset
1326 if (st->codec->codec_type == CODEC_TYPE_AUDIO &&
9f25267bee44 demux qcelp, so this can work with soc decoder and stream copy
bcoudurier
parents: 3242
diff changeset
1327 !st->codec->frame_size && sc->stts_count == 1)
3153
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1328 st->codec->frame_size = av_rescale(sc->time_rate, st->codec->sample_rate, sc->time_scale);
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1329
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1330 if(st->duration != AV_NOPTS_VALUE){
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1331 assert(st->duration % sc->time_rate == 0);
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1332 st->duration /= sc->time_rate;
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1333 }
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1334 sc->ffindex = st->index;
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1335 mov_build_index(c, st);
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1336
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1337 if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) {
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1338 if (url_fopen(&sc->pb, sc->drefs[sc->dref_id-1].path, URL_RDONLY) < 0)
3182
3cf24d58a8a9 print essence path in error message
bcoudurier
parents: 3181
diff changeset
1339 av_log(c->fc, AV_LOG_ERROR, "stream %d, error opening file %s: %s\n",
3cf24d58a8a9 print essence path in error message
bcoudurier
parents: 3181
diff changeset
1340 st->index, sc->drefs[sc->dref_id-1].path, strerror(errno));
3153
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1341 } else
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1342 sc->pb = c->fc->pb;
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1343
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1344 switch (st->codec->codec_id) {
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1345 #ifdef CONFIG_H261_DECODER
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1346 case CODEC_ID_H261:
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1347 #endif
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1348 #ifdef CONFIG_H263_DECODER
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1349 case CODEC_ID_H263:
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1350 #endif
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1351 #ifdef CONFIG_MPEG4_DECODER
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1352 case CODEC_ID_MPEG4:
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1353 #endif
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1354 st->codec->width= 0; /* let decoder init width/height */
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1355 st->codec->height= 0;
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1356 break;
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1357 }
3155
e22efe21156d free track data asap
bcoudurier
parents: 3154
diff changeset
1358
e22efe21156d free track data asap
bcoudurier
parents: 3154
diff changeset
1359 /* Do not need those anymore. */
e22efe21156d free track data asap
bcoudurier
parents: 3154
diff changeset
1360 av_freep(&sc->chunk_offsets);
e22efe21156d free track data asap
bcoudurier
parents: 3154
diff changeset
1361 av_freep(&sc->sample_to_chunk);
e22efe21156d free track data asap
bcoudurier
parents: 3154
diff changeset
1362 av_freep(&sc->sample_sizes);
e22efe21156d free track data asap
bcoudurier
parents: 3154
diff changeset
1363 av_freep(&sc->keyframes);
e22efe21156d free track data asap
bcoudurier
parents: 3154
diff changeset
1364 av_freep(&sc->stts_data);
e22efe21156d free track data asap
bcoudurier
parents: 3154
diff changeset
1365
3153
4ded3fdf5c7c move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents: 3145
diff changeset
1366 return 0;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1367 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1368
4028
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1369 static int mov_read_udta_string(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
2296
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1370 {
4028
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1371 char *str = NULL;
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1372 int size;
2296
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1373 uint16_t str_size = get_be16(pb); /* string length */;
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1374
4028
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1375 switch (atom.type) {
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1376 case MKTAG(0xa9,'n','a','m'):
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1377 str = c->fc->title; size = sizeof(c->fc->title); break;
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1378 case MKTAG(0xa9,'w','r','t'):
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1379 str = c->fc->author; size = sizeof(c->fc->author); break;
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1380 case MKTAG(0xa9,'c','p','y'):
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1381 str = c->fc->copyright; size = sizeof(c->fc->copyright); break;
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1382 case MKTAG(0xa9,'i','n','f'):
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1383 str = c->fc->comment; size = sizeof(c->fc->comment); break;
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1384 }
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1385 if (!str)
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1386 return 0;
2296
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1387 get_be16(pb); /* skip language */
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1388 get_buffer(pb, str, FFMIN(size, str_size));
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1389 return 0;
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1390 }
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1391
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1392 static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1393 {
3595
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1394 int i;
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1395 int width;
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1396 int height;
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1397 int64_t disp_transform[2];
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1398 int display_matrix[3][2];
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1399 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1400 int version = get_byte(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1401
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
1402 get_be24(pb); /* flags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1403 /*
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1404 MOV_TRACK_ENABLED 0x0001
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1405 MOV_TRACK_IN_MOVIE 0x0002
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1406 MOV_TRACK_IN_PREVIEW 0x0004
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1407 MOV_TRACK_IN_POSTER 0x0008
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1408 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1409
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1410 if (version == 1) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1411 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1412 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1413 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1414 get_be32(pb); /* creation time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1415 get_be32(pb); /* modification time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1416 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1417 st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1418 get_be32(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1419 st->start_time = 0; /* check */
3167
125b08d2ad59 cosmetics, split or move too long lines
bcoudurier
parents: 3166
diff changeset
1420 /* highlevel (considering edits) duration in movie timebase */
125b08d2ad59 cosmetics, split or move too long lines
bcoudurier
parents: 3166
diff changeset
1421 (version == 1) ? get_be64(pb) : get_be32(pb);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1422 get_be32(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1423 get_be32(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1424
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1425 get_be16(pb); /* layer */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1426 get_be16(pb); /* alternate group */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1427 get_be16(pb); /* volume */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1428 get_be16(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1429
3595
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1430 //read in the display matrix (outlined in ISO 14496-12, Section 6.2.2)
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1431 // they're kept in fixed point format through all calculations
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1432 // ignore u,v,z b/c we don't need the scale factor to calc aspect ratio
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1433 for (i = 0; i < 3; i++) {
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1434 display_matrix[i][0] = get_be32(pb); // 16.16 fixed point
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1435 display_matrix[i][1] = get_be32(pb); // 16.16 fixed point
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1436 get_be32(pb); // 2.30 fixed point (not used)
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1437 }
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1438
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1439 width = get_be32(pb); // 16.16 fixed point track width
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1440 height = get_be32(pb); // 16.16 fixed point track height
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1441
3595
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1442 //transform the display width/height according to the matrix
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1443 // skip this if the display matrix is the default identity matrix
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1444 // to keep the same scale, use [width height 1<<16]
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1445 if (width && height &&
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1446 (display_matrix[0][0] != 65536 || display_matrix[0][1] ||
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1447 display_matrix[1][0] || display_matrix[1][1] != 65536 ||
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1448 display_matrix[2][0] || display_matrix[2][1])) {
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1449 for (i = 0; i < 2; i++)
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1450 disp_transform[i] =
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1451 (int64_t) width * display_matrix[0][i] +
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1452 (int64_t) height * display_matrix[1][i] +
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1453 ((int64_t) display_matrix[2][i] << 16);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1454
3595
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1455 //sample aspect ratio is new width/height divided by old width/height
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3751
diff changeset
1456 st->sample_aspect_ratio = av_d2q(
3595
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1457 ((double) disp_transform[0] * height) /
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1458 ((double) disp_transform[1] * width), INT_MAX);
84584d6d4d77 Use tkhd matrix for proper display in mov.
benoit
parents: 3588
diff changeset
1459 }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1460 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1461 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1462
3169
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1463 static int mov_read_tfhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1464 {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1465 MOVFragment *frag = &c->fragment;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1466 MOVTrackExt *trex = NULL;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1467 int flags, track_id, i;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1468
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1469 get_byte(pb); /* version */
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1470 flags = get_be24(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1471
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1472 track_id = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1473 if (!track_id || track_id > c->fc->nb_streams)
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1474 return -1;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1475 frag->track_id = track_id;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1476 for (i = 0; i < c->trex_count; i++)
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1477 if (c->trex_data[i].track_id == frag->track_id) {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1478 trex = &c->trex_data[i];
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1479 break;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1480 }
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1481 if (!trex) {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1482 av_log(c->fc, AV_LOG_ERROR, "could not find corresponding trex\n");
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1483 return -1;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1484 }
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1485
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1486 if (flags & 0x01) frag->base_data_offset = get_be64(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1487 else frag->base_data_offset = frag->moof_offset;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1488 if (flags & 0x02) frag->stsd_id = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1489 else frag->stsd_id = trex->stsd_id;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1490
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1491 frag->duration = flags & 0x08 ? get_be32(pb) : trex->duration;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1492 frag->size = flags & 0x10 ? get_be32(pb) : trex->size;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1493 frag->flags = flags & 0x20 ? get_be32(pb) : trex->flags;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1494 dprintf(c->fc, "frag flags 0x%x\n", frag->flags);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1495 return 0;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1496 }
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1497
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1498 static int mov_read_trex(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1499 {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1500 MOVTrackExt *trex;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1501
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1502 if ((uint64_t)c->trex_count+1 >= UINT_MAX / sizeof(*c->trex_data))
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1503 return -1;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1504 c->trex_data = av_realloc(c->trex_data, (c->trex_count+1)*sizeof(*c->trex_data));
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1505 if (!c->trex_data)
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1506 return AVERROR(ENOMEM);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1507 trex = &c->trex_data[c->trex_count++];
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1508 get_byte(pb); /* version */
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1509 get_be24(pb); /* flags */
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1510 trex->track_id = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1511 trex->stsd_id = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1512 trex->duration = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1513 trex->size = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1514 trex->flags = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1515 return 0;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1516 }
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1517
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1518 static int mov_read_trun(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1519 {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1520 MOVFragment *frag = &c->fragment;
3190
8b95e46003f8 check frag track id before setting st
bcoudurier
parents: 3187
diff changeset
1521 AVStream *st;
8b95e46003f8 check frag track id before setting st
bcoudurier
parents: 3187
diff changeset
1522 MOVStreamContext *sc;
3169
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1523 uint64_t offset;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1524 int64_t dts;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1525 int data_offset = 0;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1526 unsigned entries, first_sample_flags = frag->flags;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1527 int flags, distance, i;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1528
3190
8b95e46003f8 check frag track id before setting st
bcoudurier
parents: 3187
diff changeset
1529 if (!frag->track_id || frag->track_id > c->fc->nb_streams)
8b95e46003f8 check frag track id before setting st
bcoudurier
parents: 3187
diff changeset
1530 return -1;
8b95e46003f8 check frag track id before setting st
bcoudurier
parents: 3187
diff changeset
1531 st = c->fc->streams[frag->track_id-1];
8b95e46003f8 check frag track id before setting st
bcoudurier
parents: 3187
diff changeset
1532 sc = st->priv_data;
3169
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1533 if (sc->pseudo_stream_id+1 != frag->stsd_id)
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1534 return 0;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1535 get_byte(pb); /* version */
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1536 flags = get_be24(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1537 entries = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1538 dprintf(c->fc, "flags 0x%x entries %d\n", flags, entries);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1539 if (flags & 0x001) data_offset = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1540 if (flags & 0x004) first_sample_flags = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1541 if (flags & 0x800) {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1542 if ((uint64_t)entries+sc->ctts_count >= UINT_MAX/sizeof(*sc->ctts_data))
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1543 return -1;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1544 sc->ctts_data = av_realloc(sc->ctts_data,
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1545 (entries+sc->ctts_count)*sizeof(*sc->ctts_data));
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1546 if (!sc->ctts_data)
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1547 return AVERROR(ENOMEM);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1548 }
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1549 dts = st->duration;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1550 offset = frag->base_data_offset + data_offset;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1551 distance = 0;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1552 dprintf(c->fc, "first sample flags 0x%x\n", first_sample_flags);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1553 for (i = 0; i < entries; i++) {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1554 unsigned sample_size = frag->size;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1555 int sample_flags = i ? frag->flags : first_sample_flags;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1556 unsigned sample_duration = frag->duration;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1557 int keyframe;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1558
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1559 if (flags & 0x100) sample_duration = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1560 if (flags & 0x200) sample_size = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1561 if (flags & 0x400) sample_flags = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1562 if (flags & 0x800) {
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1563 sc->ctts_data[sc->ctts_count].count = 1;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1564 sc->ctts_data[sc->ctts_count].duration = get_be32(pb);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1565 sc->ctts_count++;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1566 }
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1567 if ((keyframe = st->codec->codec_type == CODEC_TYPE_AUDIO ||
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1568 (flags & 0x004 && !i && !sample_flags) || sample_flags & 0x2000000))
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1569 distance = 0;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1570 av_add_index_entry(st, offset, dts, sample_size, distance,
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1571 keyframe ? AVINDEX_KEYFRAME : 0);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1572 dprintf(c->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1573 "size %d, distance %d, keyframe %d\n", st->index, sc->sample_count+i,
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1574 offset, dts, sample_size, distance, keyframe);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1575 distance++;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1576 assert(sample_duration % sc->time_rate == 0);
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1577 dts += sample_duration / sc->time_rate;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1578 offset += sample_size;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1579 }
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1580 frag->moof_offset = offset;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1581 sc->sample_count = st->nb_index_entries;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1582 st->duration = dts;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1583 return 0;
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1584 }
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1585
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1586 /* this atom should be null (from specs), but some buggy files put the 'moov' atom inside it... */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1587 /* like the files created with Adobe Premiere 5.0, for samples see */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1588 /* http://graphics.tudelft.nl/~wouter/publications/soundtests/ */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1589 static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1590 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1591 int err;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1592
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1593 if (atom.size < 8)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1594 return 0; /* continue */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1595 if (get_be32(pb) != 0) { /* 0 sized mdat atom... use the 'wide' atom size */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1596 url_fskip(pb, atom.size - 4);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1597 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1598 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1599 atom.type = get_le32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1600 atom.offset += 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1601 atom.size -= 8;
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1602 if (atom.type != MKTAG('m','d','a','t')) {
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1603 url_fskip(pb, atom.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1604 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1605 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1606 err = mov_read_mdat(c, pb, atom);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1607 return err;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1608 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1609
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1610 static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1611 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1612 #ifdef CONFIG_ZLIB
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1613 ByteIOContext ctx;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1614 uint8_t *cmov_data;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1615 uint8_t *moov_data; /* uncompressed data */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1616 long cmov_len, moov_len;
3313
8e83e0b76105 free moov and cmov when error occurs, fix memleak, patch by Albert Astals Cid, aastals at tv-wan dot es
bcoudurier
parents: 3301
diff changeset
1617 int ret = -1;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1618
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1619 get_be32(pb); /* dcom atom */
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1620 if (get_le32(pb) != MKTAG('d','c','o','m'))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1621 return -1;
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1622 if (get_le32(pb) != MKTAG('z','l','i','b')) {
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1623 av_log(NULL, AV_LOG_ERROR, "unknown compression for cmov atom !");
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1624 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1625 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1626 get_be32(pb); /* cmvd atom */
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1627 if (get_le32(pb) != MKTAG('c','m','v','d'))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1628 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1629 moov_len = get_be32(pb); /* uncompressed size */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1630 cmov_len = atom.size - 6 * 4;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1631
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1632 cmov_data = av_malloc(cmov_len);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1633 if (!cmov_data)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1634 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1635 moov_data = av_malloc(moov_len);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1636 if (!moov_data) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1637 av_free(cmov_data);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1638 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1639 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1640 get_buffer(pb, cmov_data, cmov_len);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1641 if(uncompress (moov_data, (uLongf *) &moov_len, (const Bytef *)cmov_data, cmov_len) != Z_OK)
3313
8e83e0b76105 free moov and cmov when error occurs, fix memleak, patch by Albert Astals Cid, aastals at tv-wan dot es
bcoudurier
parents: 3301
diff changeset
1642 goto free_and_return;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1643 if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, NULL, NULL, NULL) != 0)
3313
8e83e0b76105 free moov and cmov when error occurs, fix memleak, patch by Albert Astals Cid, aastals at tv-wan dot es
bcoudurier
parents: 3301
diff changeset
1644 goto free_and_return;
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1645 atom.type = MKTAG('m','o','o','v');
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1646 atom.offset = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1647 atom.size = moov_len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1648 #ifdef DEBUG
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1649 // { int fd = open("/tmp/uncompheader.mov", O_WRONLY | O_CREAT); write(fd, moov_data, moov_len); close(fd); }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1650 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1651 ret = mov_read_default(c, &ctx, atom);
3313
8e83e0b76105 free moov and cmov when error occurs, fix memleak, patch by Albert Astals Cid, aastals at tv-wan dot es
bcoudurier
parents: 3301
diff changeset
1652 free_and_return:
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1653 av_free(moov_data);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1654 av_free(cmov_data);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1655 return ret;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1656 #else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1657 av_log(c->fc, AV_LOG_ERROR, "this file requires zlib support compiled in\n");
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1658 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1659 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1660 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1661
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1662 /* edit list atom */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1663 static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1664 {
2824
ecbfaa8712a1 do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents: 2823
diff changeset
1665 MOVStreamContext *sc = c->fc->streams[c->fc->nb_streams-1]->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1666 int i, edit_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1667
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1668 get_byte(pb); /* version */
3145
49989c8b181c simplify, flags is 24bits according to specs
bcoudurier
parents: 3135
diff changeset
1669 get_be24(pb); /* flags */
2824
ecbfaa8712a1 do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents: 2823
diff changeset
1670 edit_count= sc->edit_count = get_be32(pb); /* entries */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1671
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1672 for(i=0; i<edit_count; i++){
3038
db12cabbe337 warn use if edit list is not starting at 0, a/v desync might occur
bcoudurier
parents: 3037
diff changeset
1673 int time;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1674 get_be32(pb); /* Track duration */
3038
db12cabbe337 warn use if edit list is not starting at 0, a/v desync might occur
bcoudurier
parents: 3037
diff changeset
1675 time = get_be32(pb); /* Media time */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1676 get_be32(pb); /* Media rate */
3038
db12cabbe337 warn use if edit list is not starting at 0, a/v desync might occur
bcoudurier
parents: 3037
diff changeset
1677 if (time != 0)
db12cabbe337 warn use if edit list is not starting at 0, a/v desync might occur
bcoudurier
parents: 3037
diff changeset
1678 av_log(c->fc, AV_LOG_WARNING, "edit list not starting at 0, "
db12cabbe337 warn use if edit list is not starting at 0, a/v desync might occur
bcoudurier
parents: 3037
diff changeset
1679 "a/v desync might occur, patch welcome\n");
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1680 }
2824
ecbfaa8712a1 do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents: 2823
diff changeset
1681 dprintf(c->fc, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, sc->edit_count);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1682 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1683 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1684
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1685 static const MOVParseTableEntry mov_default_parse_table[] = {
3496
cdbf302a3c00 chinese avs demuxing support, demux AVSFileFormat.mp4
bcoudurier
parents: 3487
diff changeset
1686 { MKTAG('a','v','s','s'), mov_read_extradata },
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1687 { MKTAG('c','o','6','4'), mov_read_stco },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1688 { MKTAG('c','t','t','s'), mov_read_ctts }, /* composition time to sample */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1689 { MKTAG('d','i','n','f'), mov_read_default },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1690 { MKTAG('d','r','e','f'), mov_read_dref },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1691 { MKTAG('e','d','t','s'), mov_read_default },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1692 { MKTAG('e','l','s','t'), mov_read_elst },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1693 { MKTAG('e','n','d','a'), mov_read_enda },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1694 { MKTAG('f','i','e','l'), mov_read_extradata },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1695 { MKTAG('f','t','y','p'), mov_read_ftyp },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1696 { MKTAG('g','l','b','l'), mov_read_glbl },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1697 { MKTAG('h','d','l','r'), mov_read_hdlr },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1698 { MKTAG('j','p','2','h'), mov_read_extradata },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1699 { MKTAG('m','d','a','t'), mov_read_mdat },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1700 { MKTAG('m','d','h','d'), mov_read_mdhd },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1701 { MKTAG('m','d','i','a'), mov_read_default },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1702 { MKTAG('m','i','n','f'), mov_read_default },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1703 { MKTAG('m','o','o','f'), mov_read_moof },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1704 { MKTAG('m','o','o','v'), mov_read_moov },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1705 { MKTAG('m','v','e','x'), mov_read_default },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1706 { MKTAG('m','v','h','d'), mov_read_mvhd },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1707 { MKTAG('S','M','I',' '), mov_read_smi }, /* Sorenson extension ??? */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1708 { MKTAG('a','l','a','c'), mov_read_extradata }, /* alac specific atom */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1709 { MKTAG('a','v','c','C'), mov_read_glbl },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1710 { MKTAG('s','t','b','l'), mov_read_default },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1711 { MKTAG('s','t','c','o'), mov_read_stco },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1712 { MKTAG('s','t','s','c'), mov_read_stsc },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1713 { MKTAG('s','t','s','d'), mov_read_stsd }, /* sample description */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1714 { MKTAG('s','t','s','s'), mov_read_stss }, /* sync sample */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1715 { MKTAG('s','t','s','z'), mov_read_stsz }, /* sample size */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1716 { MKTAG('s','t','t','s'), mov_read_stts },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1717 { MKTAG('t','k','h','d'), mov_read_tkhd }, /* track header */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1718 { MKTAG('t','f','h','d'), mov_read_tfhd }, /* track fragment header */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1719 { MKTAG('t','r','a','k'), mov_read_trak },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1720 { MKTAG('t','r','a','f'), mov_read_default },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1721 { MKTAG('t','r','e','x'), mov_read_trex },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1722 { MKTAG('t','r','u','n'), mov_read_trun },
4028
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1723 { MKTAG('u','d','t','a'), mov_read_default },
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1724 { MKTAG('w','a','v','e'), mov_read_wave },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1725 { MKTAG('e','s','d','s'), mov_read_esds },
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1726 { MKTAG('w','i','d','e'), mov_read_wide }, /* place holder */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1727 { MKTAG('c','m','o','v'), mov_read_cmov },
4028
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1728 { MKTAG(0xa9,'n','a','m'), mov_read_udta_string },
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1729 { MKTAG(0xa9,'w','r','t'), mov_read_udta_string },
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1730 { MKTAG(0xa9,'c','p','y'), mov_read_udta_string },
7d6ed3692203 simplify metadata reading
bcoudurier
parents: 3989
diff changeset
1731 { MKTAG(0xa9,'i','n','f'), mov_read_udta_string },
2826
24ad70087e67 useless 0L here
bcoudurier
parents: 2825
diff changeset
1732 { 0, NULL }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1733 };
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1734
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1735 static int mov_probe(AVProbeData *p)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1736 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1737 unsigned int offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1738 uint32_t tag;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1739 int score = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1740
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1741 /* check file header */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1742 offset = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1743 for(;;) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1744 /* ignore invalid offset */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1745 if ((offset + 8) > (unsigned int)p->buf_size)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1746 return score;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1747 tag = AV_RL32(p->buf + offset + 4);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1748 switch(tag) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1749 /* check for obvious tags */
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1750 case MKTAG('j','P',' ',' '): /* jpeg 2000 signature */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1751 case MKTAG('m','o','o','v'):
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1752 case MKTAG('m','d','a','t'):
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1753 case MKTAG('p','n','o','t'): /* detect movs with preview pics like ew.mov and april.mov */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1754 case MKTAG('u','d','t','a'): /* Packet Video PVAuthor adds this and a lot of more junk */
3587
7d5480d3989d Return max score when ftyp atom is encountered.
bcoudurier
parents: 3496
diff changeset
1755 case MKTAG('f','t','y','p'):
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1756 return AVPROBE_SCORE_MAX;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1757 /* those are more common words, so rate then a bit less */
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1758 case MKTAG('e','d','i','w'): /* xdcam files have reverted first tags */
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1759 case MKTAG('w','i','d','e'):
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1760 case MKTAG('f','r','e','e'):
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1761 case MKTAG('j','u','n','k'):
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1762 case MKTAG('p','i','c','t'):
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1763 return AVPROBE_SCORE_MAX - 5;
3588
f217917f4433 cosmetics, remove space
bcoudurier
parents: 3587
diff changeset
1764 case MKTAG(0x82,0x82,0x7f,0x7d):
3253
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1765 case MKTAG('s','k','i','p'):
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1766 case MKTAG('u','u','i','d'):
ab5585778359 cosmetics, remove whitespaces in tags
bcoudurier
parents: 3252
diff changeset
1767 case MKTAG('p','r','f','l'):
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1768 offset = AV_RB32(p->buf+offset) + offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1769 /* if we only find those cause probedata is too small at least rate them */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1770 score = AVPROBE_SCORE_MAX - 50;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1771 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1772 default:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1773 /* unrecognized tag */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1774 return score;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1775 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1776 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1777 return score;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1778 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1779
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1780 static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1781 {
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
1782 MOVContext *mov = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2730
diff changeset
1783 ByteIOContext *pb = s->pb;
3155
e22efe21156d free track data asap
bcoudurier
parents: 3154
diff changeset
1784 int err;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1785 MOV_atom_t atom = { 0, 0, 0 };
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1786
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1787 mov->fc = s;
3167
125b08d2ad59 cosmetics, split or move too long lines
bcoudurier
parents: 3166
diff changeset
1788 /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */
125b08d2ad59 cosmetics, split or move too long lines
bcoudurier
parents: 3166
diff changeset
1789 if(!url_is_streamed(pb))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1790 atom.size = url_fsize(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1791 else
2026
2e2c2dbb511d use INT64_MAX
bcoudurier
parents: 2023
diff changeset
1792 atom.size = INT64_MAX;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1793
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1794 /* check MOV header */
3204
bf14268f0f59 better error message
bcoudurier
parents: 3191
diff changeset
1795 if ((err = mov_read_default(mov, pb, atom)) < 0) {
bf14268f0f59 better error message
bcoudurier
parents: 3191
diff changeset
1796 av_log(s, AV_LOG_ERROR, "error reading header: %d\n", err);
bf14268f0f59 better error message
bcoudurier
parents: 3191
diff changeset
1797 return err;
bf14268f0f59 better error message
bcoudurier
parents: 3191
diff changeset
1798 }
bf14268f0f59 better error message
bcoudurier
parents: 3191
diff changeset
1799 if (!mov->found_moov) {
bf14268f0f59 better error message
bcoudurier
parents: 3191
diff changeset
1800 av_log(s, AV_LOG_ERROR, "moov atom not found\n");
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1801 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1802 }
3205
204a79a06c9b remove cast
bcoudurier
parents: 3204
diff changeset
1803 dprintf(mov->fc, "on_parse_exit_offset=%lld\n", url_ftell(pb));
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1804
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1805 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1806 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1807
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1808 static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1809 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1810 MOVContext *mov = s->priv_data;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1811 MOVStreamContext *sc = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1812 AVIndexEntry *sample = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1813 int64_t best_dts = INT64_MAX;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1814 int i;
3170
3c56f53f437b support fragments when non streamable
bcoudurier
parents: 3169
diff changeset
1815 retry:
2823
3f15b52fe817 remove duplicate field
bcoudurier
parents: 2822
diff changeset
1816 for (i = 0; i < s->nb_streams; i++) {
2824
ecbfaa8712a1 do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents: 2823
diff changeset
1817 AVStream *st = s->streams[i];
ecbfaa8712a1 do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents: 2823
diff changeset
1818 MOVStreamContext *msc = st->priv_data;
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1819 if (st->discard != AVDISCARD_ALL && msc->pb && msc->current_sample < msc->sample_count) {
2824
ecbfaa8712a1 do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents: 2823
diff changeset
1820 AVIndexEntry *current_sample = &st->index_entries[msc->current_sample];
2902
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
1821 int64_t dts = av_rescale(current_sample->timestamp * (int64_t)msc->time_rate,
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
1822 AV_TIME_BASE, msc->time_scale);
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
1823 dprintf(s, "stream %d, sample %d, dts %"PRId64"\n", i, msc->current_sample, dts);
2817
b1b21255bbbb support streamed mov/mp4
bcoudurier
parents: 2814
diff changeset
1824 if (!sample || (url_is_streamed(s->pb) && current_sample->pos < sample->pos) ||
b1b21255bbbb support streamed mov/mp4
bcoudurier
parents: 2814
diff changeset
1825 (!url_is_streamed(s->pb) &&
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1826 ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb &&
2817
b1b21255bbbb support streamed mov/mp4
bcoudurier
parents: 2814
diff changeset
1827 ((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) ||
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1828 (FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))))) {
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1829 sample = current_sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1830 best_dts = dts;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1831 sc = msc;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1832 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1833 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1834 }
3170
3c56f53f437b support fragments when non streamable
bcoudurier
parents: 3169
diff changeset
1835 if (!sample) {
3c56f53f437b support fragments when non streamable
bcoudurier
parents: 3169
diff changeset
1836 mov->found_mdat = 0;
3c56f53f437b support fragments when non streamable
bcoudurier
parents: 3169
diff changeset
1837 if (!url_is_streamed(s->pb) ||
3c56f53f437b support fragments when non streamable
bcoudurier
parents: 3169
diff changeset
1838 mov_read_default(mov, s->pb, (MOV_atom_t){ 0, 0, INT64_MAX }) < 0 ||
3c56f53f437b support fragments when non streamable
bcoudurier
parents: 3169
diff changeset
1839 url_feof(s->pb))
3c56f53f437b support fragments when non streamable
bcoudurier
parents: 3169
diff changeset
1840 return -1;
3c56f53f437b support fragments when non streamable
bcoudurier
parents: 3169
diff changeset
1841 dprintf(s, "read fragments, offset 0x%llx\n", url_ftell(s->pb));
3c56f53f437b support fragments when non streamable
bcoudurier
parents: 3169
diff changeset
1842 goto retry;
3c56f53f437b support fragments when non streamable
bcoudurier
parents: 3169
diff changeset
1843 }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1844 /* must be done just before reading, to avoid infinite loop on sample */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1845 sc->current_sample++;
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1846 if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
2902
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
1847 av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n",
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
1848 sc->ffindex, sample->pos);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1849 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1850 }
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1851 av_get_packet(sc->pb, pkt, sample->size);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1852 #ifdef CONFIG_DV_DEMUXER
3027
8ba21013bcbf indentation
bcoudurier
parents: 3026
diff changeset
1853 if (mov->dv_demux && sc->dv_audio_container) {
8ba21013bcbf indentation
bcoudurier
parents: 3026
diff changeset
1854 dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);
8ba21013bcbf indentation
bcoudurier
parents: 3026
diff changeset
1855 av_free(pkt->data);
3034
e8cf328bb609 return error when dv audio extraction fails
bcoudurier
parents: 3033
diff changeset
1856 pkt->size = 0;
e8cf328bb609 return error when dv audio extraction fails
bcoudurier
parents: 3033
diff changeset
1857 if (dv_get_packet(mov->dv_demux, pkt) < 0)
e8cf328bb609 return error when dv audio extraction fails
bcoudurier
parents: 3033
diff changeset
1858 return -1;
3027
8ba21013bcbf indentation
bcoudurier
parents: 3026
diff changeset
1859 }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1860 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1861 pkt->stream_index = sc->ffindex;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1862 pkt->dts = sample->timestamp;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1863 if (sc->ctts_data) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1864 assert(sc->ctts_data[sc->sample_to_ctime_index].duration % sc->time_rate == 0);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1865 pkt->pts = pkt->dts + sc->ctts_data[sc->sample_to_ctime_index].duration / sc->time_rate;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1866 /* update ctts context */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1867 sc->sample_to_ctime_sample++;
2902
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
1868 if (sc->sample_to_ctime_index < sc->ctts_count &&
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
1869 sc->ctts_data[sc->sample_to_ctime_index].count == sc->sample_to_ctime_sample) {
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1870 sc->sample_to_ctime_index++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1871 sc->sample_to_ctime_sample = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1872 }
3956
8bdecea89071 support negative ctts in some way, unset wrong dts
bcoudurier
parents: 3935
diff changeset
1873 if (sc->wrong_dts)
8bdecea89071 support negative ctts in some way, unset wrong dts
bcoudurier
parents: 3935
diff changeset
1874 pkt->dts = AV_NOPTS_VALUE;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1875 } else {
3267
37e245554350 set pkt duration, only when dts == pts though,
bcoudurier
parents: 3265
diff changeset
1876 AVStream *st = s->streams[sc->ffindex];
37e245554350 set pkt duration, only when dts == pts though,
bcoudurier
parents: 3265
diff changeset
1877 int64_t next_dts = (sc->current_sample < sc->sample_count) ?
37e245554350 set pkt duration, only when dts == pts though,
bcoudurier
parents: 3265
diff changeset
1878 st->index_entries[sc->current_sample].timestamp : st->duration;
37e245554350 set pkt duration, only when dts == pts though,
bcoudurier
parents: 3265
diff changeset
1879 pkt->duration = next_dts - pkt->dts;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1880 pkt->pts = pkt->dts;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1881 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1882 pkt->flags |= sample->flags & AVINDEX_KEYFRAME ? PKT_FLAG_KEY : 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1883 pkt->pos = sample->pos;
2902
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
1884 dprintf(s, "stream %d, pts %"PRId64", dts %"PRId64", pos 0x%"PRIx64", duration %d\n",
cb12e3352bf5 cosmetics, split overly long lines
bcoudurier
parents: 2837
diff changeset
1885 pkt->stream_index, pkt->pts, pkt->dts, pkt->pos, pkt->duration);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1886 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1887 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1888
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1889 static int mov_seek_stream(AVStream *st, int64_t timestamp, int flags)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1890 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1891 MOVStreamContext *sc = st->priv_data;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1892 int sample, time_sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1893 int i;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1894
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1895 sample = av_index_search_timestamp(st, timestamp, flags);
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1896 dprintf(st->codec, "stream %d, timestamp %"PRId64", sample %d\n", st->index, timestamp, sample);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1897 if (sample < 0) /* not sure what to do */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1898 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1899 sc->current_sample = sample;
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
1900 dprintf(st->codec, "stream %d, found sample %d\n", st->index, sc->current_sample);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1901 /* adjust ctts index */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1902 if (sc->ctts_data) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1903 time_sample = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1904 for (i = 0; i < sc->ctts_count; i++) {
2083
2c3887f02739 fix ctts index computation when seeking, check must be done against next ctts sample, thanks to Uoti
bcoudurier
parents: 2046
diff changeset
1905 int next = time_sample + sc->ctts_data[i].count;
2c3887f02739 fix ctts index computation when seeking, check must be done against next ctts sample, thanks to Uoti
bcoudurier
parents: 2046
diff changeset
1906 if (next > sc->current_sample) {
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1907 sc->sample_to_ctime_index = i;
2083
2c3887f02739 fix ctts index computation when seeking, check must be done against next ctts sample, thanks to Uoti
bcoudurier
parents: 2046
diff changeset
1908 sc->sample_to_ctime_sample = sc->current_sample - time_sample;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1909 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1910 }
2083
2c3887f02739 fix ctts index computation when seeking, check must be done against next ctts sample, thanks to Uoti
bcoudurier
parents: 2046
diff changeset
1911 time_sample = next;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1912 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1913 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1914 return sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1915 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1916
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1917 static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_time, int flags)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1918 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1919 AVStream *st;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1920 int64_t seek_timestamp, timestamp;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1921 int sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1922 int i;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1923
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1924 if (stream_index >= s->nb_streams)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1925 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1926
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1927 st = s->streams[stream_index];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1928 sample = mov_seek_stream(st, sample_time, flags);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1929 if (sample < 0)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1930 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1931
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1932 /* adjust seek timestamp to found sample timestamp */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1933 seek_timestamp = st->index_entries[sample].timestamp;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1934
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1935 for (i = 0; i < s->nb_streams; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1936 st = s->streams[i];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1937 if (stream_index == i || st->discard == AVDISCARD_ALL)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1938 continue;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1939
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1940 timestamp = av_rescale_q(seek_timestamp, s->streams[stream_index]->time_base, st->time_base);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1941 mov_seek_stream(st, timestamp, flags);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1942 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1943 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1944 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1945
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1946 static int mov_read_close(AVFormatContext *s)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1947 {
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1948 int i, j;
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
1949 MOVContext *mov = s->priv_data;
2823
3f15b52fe817 remove duplicate field
bcoudurier
parents: 2822
diff changeset
1950 for(i=0; i<s->nb_streams; i++) {
2824
ecbfaa8712a1 do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents: 2823
diff changeset
1951 MOVStreamContext *sc = s->streams[i]->priv_data;
ecbfaa8712a1 do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents: 2823
diff changeset
1952 av_freep(&sc->ctts_data);
3085
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1953 for (j=0; j<sc->drefs_count; j++)
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1954 av_freep(&sc->drefs[j].path);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1955 av_freep(&sc->drefs);
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1956 if (sc->pb && sc->pb != s->pb)
bae59276377f support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents: 3084
diff changeset
1957 url_fclose(sc->pb);
2084
f5671ebda7cd simplify, no need for a function
bcoudurier
parents: 2083
diff changeset
1958 }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1959 if(mov->dv_demux){
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1960 for(i=0; i<mov->dv_fctx->nb_streams; i++){
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1961 av_freep(&mov->dv_fctx->streams[i]->codec);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1962 av_freep(&mov->dv_fctx->streams[i]);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1963 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1964 av_freep(&mov->dv_fctx);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1965 av_freep(&mov->dv_demux);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1966 }
3169
8ae50c221ae6 mp4 fragments support
bcoudurier
parents: 3167
diff changeset
1967 av_freep(&mov->trex_data);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1968 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1969 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1970
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1971 AVInputFormat mov_demuxer = {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1972 "mov,mp4,m4a,3gp,3g2,mj2",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3362
diff changeset
1973 NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"),
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1974 sizeof(MOVContext),
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1975 mov_probe,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1976 mov_read_header,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1977 mov_read_packet,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1978 mov_read_close,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1979 mov_read_seek,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1980 };