annotate mov.c @ 3717:f65dc584662d libavformat

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