annotate mov.c @ 2822:bdb887c3e9e9 libavformat

cosmetics: func -> parse, remove useless parenthesis
author bcoudurier
date Sun, 16 Dec 2007 18:26:34 +0000
parents 5a12b619e974
children 3f15b52fe817
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"
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
30
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
31 #ifdef CONFIG_ZLIB
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
32 #include <zlib.h>
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
33 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
34
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
35 /*
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
36 * First version by Francois Revol revol@free.fr
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
37 * Seek function by Gael Chardon gael.dev@4now.net
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
38 *
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
39 * Features and limitations:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
40 * - reads most of the QT files I have (at least the structure),
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
41 * 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
42 * - 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
43 *
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
44 * Funny I didn't know about http://sourceforge.net/projects/qt-ffmpeg/
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
45 * when coding this :) (it's a writer anyway)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
46 *
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
47 * Reference documents:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
48 * http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
49 * Apple:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
50 * http://developer.apple.com/documentation/QuickTime/QTFF/
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
51 * http://developer.apple.com/documentation/QuickTime/QTFF/qtff.pdf
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
52 * QuickTime is a trademark of Apple (AFAIK :))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
53 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
54
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
55 #include "qtpalette.h"
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
56
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
57
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
58 #undef NDEBUG
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
59 #include <assert.h>
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
60
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
61 /* the QuickTime file format is quite convoluted...
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
62 * it has lots of index tables, each indexing something in another one...
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
63 * Here we just use what is needed to read the chunks
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
64 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
65
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
66 typedef struct {
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
67 int first;
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
68 int count;
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
69 int id;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
70 } MOV_stsc_t;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
71
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
72 typedef struct {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
73 uint32_t type;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
74 int64_t offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
75 int64_t size; /* total size (excluding the size and type fields) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
76 } MOV_atom_t;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
77
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
78 typedef struct {
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
79 offset_t offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
80 int64_t size;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
81 } MOV_mdat_t;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
82
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
83 struct MOVParseTableEntry;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
84
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
85 typedef struct MOVStreamContext {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
86 int ffindex; /* the ffmpeg stream id */
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
87 int next_chunk;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
88 unsigned int chunk_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
89 int64_t *chunk_offsets;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
90 unsigned int stts_count;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
91 MOV_stts_t *stts_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
92 unsigned int ctts_count;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
93 MOV_stts_t *ctts_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
94 unsigned int edit_count; /* number of 'edit' (elst atom) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
95 unsigned int sample_to_chunk_sz;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
96 MOV_stsc_t *sample_to_chunk;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
97 int sample_to_ctime_index;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
98 int sample_to_ctime_sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
99 unsigned int sample_size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
100 unsigned int sample_count;
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
101 int *sample_sizes;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
102 unsigned int keyframe_count;
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
103 int *keyframes;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
104 int time_scale;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
105 int time_rate;
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
106 int current_sample;
1940
1a7f66384792 cosmetics, sample_size_v1 -> bytes_per_frame / samples_per_frame
bcoudurier
parents: 1939
diff changeset
107 unsigned int bytes_per_frame;
1a7f66384792 cosmetics, sample_size_v1 -> bytes_per_frame / samples_per_frame
bcoudurier
parents: 1939
diff changeset
108 unsigned int samples_per_frame;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
109 int dv_audio_container;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
110 } MOVStreamContext;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
111
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
112 typedef struct MOVContext {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
113 AVFormatContext *fc;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
114 int time_scale;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
115 int64_t duration; /* duration of the longest track */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
116 int found_moov; /* when both 'moov' and 'mdat' sections has been found */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
117 int found_mdat; /* we suppose we have enough data to read the file */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
118 int64_t mdat_offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
119 int total_streams;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
120 MOVStreamContext *streams[MAX_STREAMS];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
121 AVPaletteControl palette_control;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
122 MOV_mdat_t *mdat_list;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
123 int mdat_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
124 DVDemuxContext *dv_demux;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
125 AVFormatContext *dv_fctx;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
126 int isom; /* 1 if file is ISO Media (mp4/3gp) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
127 } MOVContext;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
128
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
129
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
130 /* 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
131
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
132 /* those functions parse an atom */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
133 /* return code:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
134 1: found what I wanted, exit
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
135 0: continue to parse next atom
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
136 -1: error occured, exit
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
137 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
138 /* links atom IDs to parse functions */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
139 typedef struct MOVParseTableEntry {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
140 uint32_t type;
2822
bdb887c3e9e9 cosmetics: func -> parse, remove useless parenthesis
bcoudurier
parents: 2821
diff changeset
141 int (*parse)(MOVContext *ctx, ByteIOContext *pb, MOV_atom_t atom);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
142 } MOVParseTableEntry;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
143
2820
95ce00ad6f3e save pointer to parse table, it is unlikely to change
bcoudurier
parents: 2819
diff changeset
144 static const MOVParseTableEntry mov_default_parse_table[];
95ce00ad6f3e save pointer to parse table, it is unlikely to change
bcoudurier
parents: 2819
diff changeset
145
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
146 static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
147 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
148 int64_t total_size = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
149 MOV_atom_t a;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
150 int i;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
151 int err = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
152
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
153 a.offset = atom.offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
154
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
155 if (atom.size < 0)
2026
2e2c2dbb511d use INT64_MAX
bcoudurier
parents: 2023
diff changeset
156 atom.size = INT64_MAX;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
157 while(((total_size + 8) < atom.size) && !url_feof(pb) && !err) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
158 a.size = atom.size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
159 a.type=0L;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
160 if(atom.size >= 8) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
161 a.size = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
162 a.type = get_le32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
163 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
164 total_size += 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
165 a.offset += 8;
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
166 dprintf(c->fc, "type: %08x %.4s sz: %"PRIx64" %"PRIx64" %"PRIx64"\n", a.type, (char*)&a.type, a.size, atom.size, total_size);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
167 if (a.size == 1) { /* 64 bit extended size */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
168 a.size = get_be64(pb) - 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
169 a.offset += 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
170 total_size += 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
171 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
172 if (a.size == 0) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
173 a.size = atom.size - total_size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
174 if (a.size <= 8)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
175 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
176 }
1964
4571a481081d move atom size check before parsing function search
bcoudurier
parents: 1963
diff changeset
177 a.size -= 8;
2660
022174d849d5 fix issue 225, instead of stoping when wrong atom size is found,
bcoudurier
parents: 2589
diff changeset
178 if(a.size < 0)
1964
4571a481081d move atom size check before parsing function search
bcoudurier
parents: 1963
diff changeset
179 break;
2665
9645f395842d use FFMIN
bcoudurier
parents: 2660
diff changeset
180 a.size = FFMIN(a.size, atom.size - total_size);
1964
4571a481081d move atom size check before parsing function search
bcoudurier
parents: 1963
diff changeset
181
2820
95ce00ad6f3e save pointer to parse table, it is unlikely to change
bcoudurier
parents: 2819
diff changeset
182 for (i = 0; mov_default_parse_table[i].type != 0L
95ce00ad6f3e save pointer to parse table, it is unlikely to change
bcoudurier
parents: 2819
diff changeset
183 && mov_default_parse_table[i].type != a.type; i++)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
184 /* empty */;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
185
2820
95ce00ad6f3e save pointer to parse table, it is unlikely to change
bcoudurier
parents: 2819
diff changeset
186 if (mov_default_parse_table[i].type == 0) { /* skip leaf atoms data */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
187 url_fskip(pb, a.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
188 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
189 offset_t start_pos = url_ftell(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
190 int64_t left;
2822
bdb887c3e9e9 cosmetics: func -> parse, remove useless parenthesis
bcoudurier
parents: 2821
diff changeset
191 err = mov_default_parse_table[i].parse(c, pb, a);
2817
b1b21255bbbb support streamed mov/mp4
bcoudurier
parents: 2814
diff changeset
192 if (c->found_moov && c->found_mdat)
b1b21255bbbb support streamed mov/mp4
bcoudurier
parents: 2814
diff changeset
193 break;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
194 left = a.size - url_ftell(pb) + start_pos;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
195 if (left > 0) /* skip garbage at atom end */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
196 url_fskip(pb, left);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
197 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
198
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
199 a.offset += a.size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
200 total_size += a.size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
201 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
202
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
203 if (!err && total_size < atom.size && atom.size < 0x7ffff) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
204 url_fskip(pb, atom.size - total_size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
205 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
206
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
207 return err;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
208 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
209
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
210 static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
211 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
212 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
213 uint32_t type;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
214 uint32_t ctype;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
215
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
216 get_byte(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
217 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
218
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
219 /* component type */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
220 ctype = get_le32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
221 type = get_le32(pb); /* component subtype */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
222
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
223 dprintf(c->fc, "ctype= %c%c%c%c (0x%08x)\n", *((char *)&ctype), ((char *)&ctype)[1], ((char *)&ctype)[2], ((char *)&ctype)[3], (int) ctype);
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
224 dprintf(c->fc, "stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
225 if(!ctype)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
226 c->isom = 1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
227 if(type == MKTAG('v', 'i', 'd', 'e'))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
228 st->codec->codec_type = CODEC_TYPE_VIDEO;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
229 else if(type == MKTAG('s', 'o', 'u', 'n'))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
230 st->codec->codec_type = CODEC_TYPE_AUDIO;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
231 else if(type == MKTAG('m', '1', 'a', ' '))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
232 st->codec->codec_id = CODEC_ID_MP2;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
233 else if(type == MKTAG('s', 'u', 'b', 'p')) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
234 st->codec->codec_type = CODEC_TYPE_SUBTITLE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
235 st->codec->codec_id = CODEC_ID_DVD_SUBTITLE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
236 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
237 get_be32(pb); /* component manufacture */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
238 get_be32(pb); /* component flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
239 get_be32(pb); /* component flags mask */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
240
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
241 if(atom.size <= 24)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
242 return 0; /* nothing left to read */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
243
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
244 url_fskip(pb, atom.size - (url_ftell(pb) - atom.offset));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
245 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
246 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
247
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
248 static int mp4_read_descr_len(ByteIOContext *pb)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
249 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
250 int len = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
251 int count = 4;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
252 while (count--) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
253 int c = get_byte(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
254 len = (len << 7) | (c & 0x7f);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
255 if (!(c & 0x80))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
256 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
257 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
258 return len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
259 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
260
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
261 static int mp4_read_descr(MOVContext *c, ByteIOContext *pb, int *tag)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
262 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
263 int len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
264 *tag = get_byte(pb);
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
265 len = mp4_read_descr_len(pb);
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
266 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
267 return len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
268 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
269
2028
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
270 #define MP4ESDescrTag 0x03
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
271 #define MP4DecConfigDescrTag 0x04
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
272 #define MP4DecSpecificDescrTag 0x05
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
273
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
274 static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
275 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
276 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
277 int tag, len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
278
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
279 get_be32(pb); /* version + flags */
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
280 len = mp4_read_descr(c, pb, &tag);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
281 if (tag == MP4ESDescrTag) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
282 get_be16(pb); /* ID */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
283 get_byte(pb); /* priority */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
284 } else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
285 get_be16(pb); /* ID */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
286
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
287 len = mp4_read_descr(c, pb, &tag);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
288 if (tag == MP4DecConfigDescrTag) {
2028
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
289 int object_type_id = get_byte(pb);
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
290 get_byte(pb); /* stream type */
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
291 get_be24(pb); /* buffer size db */
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
292 get_be32(pb); /* max bitrate */
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
293 get_be32(pb); /* avg bitrate */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
294
2028
319147157f29 clean and simplify esds reading function
bcoudurier
parents: 2027
diff changeset
295 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
296 dprintf(c->fc, "esds object type id %d\n", object_type_id);
2029
df8331c95632 cosmetics: mov_mp4 -> mp4
bcoudurier
parents: 2028
diff changeset
297 len = mp4_read_descr(c, pb, &tag);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
298 if (tag == MP4DecSpecificDescrTag) {
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
299 dprintf(c->fc, "Specific MPEG4 header len=%d\n", len);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
300 st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
301 if (st->codec->extradata) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
302 get_buffer(pb, st->codec->extradata, len);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
303 st->codec->extradata_size = len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
304 /* from mplayer */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
305 if ((*st->codec->extradata >> 3) == 29) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
306 st->codec->codec_id = CODEC_ID_MP3ON4;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
307 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
308 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
309 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
310 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
311 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
312 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
313
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
314 /* this atom contains actual media data */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
315 static int mov_read_mdat(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
316 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
317 if(atom.size == 0) /* wrong one (MP4) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
318 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
319 c->mdat_list = av_realloc(c->mdat_list, (c->mdat_count + 1) * sizeof(*c->mdat_list));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
320 c->mdat_list[c->mdat_count].offset = atom.offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
321 c->mdat_list[c->mdat_count].size = atom.size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
322 c->mdat_count++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
323 c->found_mdat=1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
324 c->mdat_offset = atom.offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
325 if(c->found_moov)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
326 return 1; /* found both, just go */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
327 url_fskip(pb, atom.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
328 return 0; /* now go for moov */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
329 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
330
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
331 static int mov_read_ftyp(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
332 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
333 uint32_t type = get_le32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
334
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
335 if (type != MKTAG('q','t',' ',' '))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
336 c->isom = 1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
337 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
338 get_be32(pb); /* minor version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
339 url_fskip(pb, atom.size - 8);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
340 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
341 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
342
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
343 /* this atom should contain all header atoms */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
344 static int mov_read_moov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
345 {
2806
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
346 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
347 return -1;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
348 /* 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
349 /* so we don't parse the whole file if over a network */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
350 c->found_moov=1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
351 if(c->found_mdat)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
352 return 1; /* found both, just go */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
353 return 0; /* now go for mdat */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
354 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
355
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
356
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
357 static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
358 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
359 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
360 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
361 int version = get_byte(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
362 int lang;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
363
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
364 if (version > 1)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
365 return 1; /* unsupported */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
366
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
367 get_byte(pb); get_byte(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
368 get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
369
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
370 if (version == 1) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
371 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
372 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
373 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
374 get_be32(pb); /* creation time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
375 get_be32(pb); /* modification time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
376 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
377
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
378 sc->time_scale = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
379 st->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
380
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
381 lang = get_be16(pb); /* language */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
382 ff_mov_lang_to_iso639(lang, st->language);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
383 get_be16(pb); /* quality */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
384
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
385 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
386 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
387
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
388 static int mov_read_mvhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
389 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
390 int version = get_byte(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
391 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
392
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
393 if (version == 1) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
394 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
395 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
396 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
397 get_be32(pb); /* creation time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
398 get_be32(pb); /* modification time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
399 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
400 c->time_scale = get_be32(pb); /* time scale */
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
401
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
402 dprintf(c->fc, "time scale = %i\n", c->time_scale);
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
403
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
404 c->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
405 get_be32(pb); /* preferred scale */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
406
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
407 get_be16(pb); /* preferred volume */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
408
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
409 url_fskip(pb, 10); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
410
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
411 url_fskip(pb, 36); /* display matrix */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
412
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
413 get_be32(pb); /* preview time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
414 get_be32(pb); /* preview duration */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
415 get_be32(pb); /* poster time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
416 get_be32(pb); /* selection time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
417 get_be32(pb); /* selection duration */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
418 get_be32(pb); /* current time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
419 get_be32(pb); /* next track ID */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
420
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
421 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
422 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
423
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
424 static int mov_read_smi(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
425 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
426 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
427
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
428 if((uint64_t)atom.size > (1<<30))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
429 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
430
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
431 // currently SVQ3 decoder expect full STSD header - so let's fake it
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
432 // this should be fixed and just SMI header should be passed
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
433 av_free(st->codec->extradata);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
434 st->codec->extradata_size = 0x5a + atom.size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
435 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
436
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
437 if (st->codec->extradata) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
438 memcpy(st->codec->extradata, "SVQ3", 4); // fake
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
439 get_buffer(pb, st->codec->extradata + 0x5a, atom.size);
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
440 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
441 } else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
442 url_fskip(pb, atom.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
443
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
444 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
445 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
446
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
447 static int mov_read_enda(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
448 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
449 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
450 int little_endian = get_be16(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
451
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
452 if (little_endian) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
453 switch (st->codec->codec_id) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
454 case CODEC_ID_PCM_S24BE:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
455 st->codec->codec_id = CODEC_ID_PCM_S24LE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
456 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
457 case CODEC_ID_PCM_S32BE:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
458 st->codec->codec_id = CODEC_ID_PCM_S32LE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
459 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
460 default:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
461 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
462 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
463 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
464 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
465 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
466
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
467 /* FIXME modify qdm2/svq3/h264 decoders to take full atom as extradata */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
468 static int mov_read_extradata(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
469 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
470 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
471 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
472 uint8_t *buf;
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
473 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
474 return -1;
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
475 buf= av_realloc(st->codec->extradata, size);
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
476 if(!buf)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
477 return -1;
2589
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
478 st->codec->extradata= buf;
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
479 buf+= st->codec->extradata_size;
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
480 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
481 AV_WB32( buf , atom.size + 8);
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
482 AV_WL32( buf + 4, atom.type);
960795567b33 append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents: 2547
diff changeset
483 get_buffer(pb, buf + 8, atom.size);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
484 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
485 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
486
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
487 static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
488 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
489 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
490
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
491 if((uint64_t)atom.size > (1<<30))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
492 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
493
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
494 if (st->codec->codec_id == CODEC_ID_QDM2) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
495 // pass all frma atom to codec, needed at least for QDM2
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
496 av_free(st->codec->extradata);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
497 st->codec->extradata_size = atom.size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
498 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
499
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
500 if (st->codec->extradata) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
501 get_buffer(pb, st->codec->extradata, atom.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
502 } else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
503 url_fskip(pb, atom.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
504 } 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
505 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
506 return -1;
1845
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 url_fskip(pb, atom.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
509 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
510 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
511
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
512 static int mov_read_avcC(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
513 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
514 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
515
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
516 if((uint64_t)atom.size > (1<<30))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
517 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
518
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
519 av_free(st->codec->extradata);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
520
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
521 st->codec->extradata_size = atom.size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
522 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
523
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
524 if (st->codec->extradata) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
525 get_buffer(pb, st->codec->extradata, atom.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
526 } else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
527 url_fskip(pb, atom.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
528
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
529 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
530 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
531
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
532 static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
533 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
534 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
535 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
536 unsigned int i, entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
537
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
538 get_byte(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
539 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
540
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
541 entries = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
542
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
543 if(entries >= UINT_MAX/sizeof(int64_t))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
544 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
545
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
546 sc->chunk_count = entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
547 sc->chunk_offsets = av_malloc(entries * sizeof(int64_t));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
548 if (!sc->chunk_offsets)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
549 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
550 if (atom.type == MKTAG('s', 't', 'c', 'o')) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
551 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
552 sc->chunk_offsets[i] = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
553 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
554 } else if (atom.type == MKTAG('c', 'o', '6', '4')) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
555 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
556 sc->chunk_offsets[i] = get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
557 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
558 } else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
559 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
560
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
561 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
562 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
563
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
564 static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
565 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
566 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
567 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
568 int entries, frames_per_sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
569 uint32_t format;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
570 uint8_t codec_name[32];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
571
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
572 /* for palette traversal */
2809
17086a526938 Check sanity in the palette loading operation. The addresses a potential security risk in
melanson
parents: 2807
diff changeset
573 unsigned int color_depth;
17086a526938 Check sanity in the palette loading operation. The addresses a potential security risk in
melanson
parents: 2807
diff changeset
574 unsigned int color_start;
17086a526938 Check sanity in the palette loading operation. The addresses a potential security risk in
melanson
parents: 2807
diff changeset
575 unsigned int color_count;
17086a526938 Check sanity in the palette loading operation. The addresses a potential security risk in
melanson
parents: 2807
diff changeset
576 unsigned int color_end;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
577 int color_index;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
578 int color_dec;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
579 int color_greyscale;
2794
b556182542cb Make ff_qt_default_palette_* arrays "static const"
reimar
parents: 2771
diff changeset
580 const uint8_t *color_table;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
581 int j;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
582 unsigned char r, g, b;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
583
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
584 get_byte(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
585 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
586
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
587 entries = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
588
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
589 while(entries--) { //Parsing Sample description table
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
590 enum CodecID id;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
591 MOV_atom_t a = { 0, 0, 0 };
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
592 offset_t start_pos = url_ftell(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
593 int size = get_be32(pb); /* size */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
594 format = get_le32(pb); /* data format */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
595
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
596 get_be32(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
597 get_be16(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
598 get_be16(pb); /* index */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
599
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
600 if (st->codec->codec_tag) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
601 /* multiple fourcc, just skip for now */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
602 url_fskip(pb, size - (url_ftell(pb) - start_pos));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
603 continue;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
604 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
605
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
606 st->codec->codec_tag = format;
1847
922180a45610 recommit of the change below after reverting earlier cosmetic-functional mix
michael
parents: 1846
diff changeset
607 id = codec_get_id(codec_movaudio_tags, format);
2298
4f946c9ae9b3 detect MS wav codecs
michael
parents: 2296
diff changeset
608 if (id<=0 && (format&0xFFFF) == 'm' + ('s'<<8))
4f946c9ae9b3 detect MS wav codecs
michael
parents: 2296
diff changeset
609 id = codec_get_id(codec_wav_tags, bswap_32(format)&0xFFFF);
4f946c9ae9b3 detect MS wav codecs
michael
parents: 2296
diff changeset
610
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
611 if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
612 st->codec->codec_type = CODEC_TYPE_AUDIO;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
613 } else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
614 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
615 id = codec_get_id(codec_movvideo_tags, format);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
616 if (id <= 0)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
617 id = codec_get_id(codec_bmp_tags, format);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
618 if (id > 0)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
619 st->codec->codec_type = CODEC_TYPE_VIDEO;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
620 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
621
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
622 dprintf(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n",
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
623 size,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
624 (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, (format >> 24) & 0xff,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
625 st->codec->codec_type);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
626
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
627 if(st->codec->codec_type==CODEC_TYPE_VIDEO) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
628 st->codec->codec_id = id;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
629 get_be16(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
630 get_be16(pb); /* revision level */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
631 get_be32(pb); /* vendor */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
632 get_be32(pb); /* temporal quality */
2730
7782a46ddbf5 comment typo
diego
parents: 2665
diff changeset
633 get_be32(pb); /* spatial quality */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
634
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
635 st->codec->width = get_be16(pb); /* width */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
636 st->codec->height = get_be16(pb); /* height */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
637
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
638 get_be32(pb); /* horiz resolution */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
639 get_be32(pb); /* vert resolution */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
640 get_be32(pb); /* data size, always 0 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
641 frames_per_sample = get_be16(pb); /* frames per samples */
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
642
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
643 dprintf(c->fc, "frames/samples = %d\n", frames_per_sample);
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
644
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
645 get_buffer(pb, codec_name, 32); /* codec name, pascal string (FIXME: true for mp4?) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
646 if (codec_name[0] <= 31) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
647 memcpy(st->codec->codec_name, &codec_name[1],codec_name[0]);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
648 st->codec->codec_name[codec_name[0]] = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
649 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
650
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
651 st->codec->bits_per_sample = get_be16(pb); /* depth */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
652 st->codec->color_table_id = get_be16(pb); /* colortable id */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
653
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
654 /* figure out the palette situation */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
655 color_depth = st->codec->bits_per_sample & 0x1F;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
656 color_greyscale = st->codec->bits_per_sample & 0x20;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
657
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
658 /* if the depth is 2, 4, or 8 bpp, file is palettized */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
659 if ((color_depth == 2) || (color_depth == 4) ||
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
660 (color_depth == 8)) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
661 if (color_greyscale) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
662 /* compute the greyscale palette */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
663 color_count = 1 << color_depth;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
664 color_index = 255;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
665 color_dec = 256 / (color_count - 1);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
666 for (j = 0; j < color_count; j++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
667 r = g = b = color_index;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
668 c->palette_control.palette[j] =
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
669 (r << 16) | (g << 8) | (b);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
670 color_index -= color_dec;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
671 if (color_index < 0)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
672 color_index = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
673 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
674 } else if (st->codec->color_table_id & 0x08) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
675 /* if flag bit 3 is set, use the default palette */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
676 color_count = 1 << color_depth;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
677 if (color_depth == 2)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
678 color_table = ff_qt_default_palette_4;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
679 else if (color_depth == 4)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
680 color_table = ff_qt_default_palette_16;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
681 else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
682 color_table = ff_qt_default_palette_256;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
683
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
684 for (j = 0; j < color_count; j++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
685 r = color_table[j * 4 + 0];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
686 g = color_table[j * 4 + 1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
687 b = color_table[j * 4 + 2];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
688 c->palette_control.palette[j] =
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
689 (r << 16) | (g << 8) | (b);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
690 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
691 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
692 /* load the palette from the file */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
693 color_start = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
694 color_count = get_be16(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
695 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
696 if ((color_start <= 255) &&
17086a526938 Check sanity in the palette loading operation. The addresses a potential security risk in
melanson
parents: 2807
diff changeset
697 (color_end <= 255)) {
2810
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
698 for (j = color_start; j <= color_end; j++) {
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
699 /* each R, G, or B component is 16 bits;
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
700 * only use the top 8 bits; skip alpha bytes
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
701 * up front */
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
702 get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
703 get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
704 r = get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
705 get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
706 g = get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
707 get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
708 b = get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
709 get_byte(pb);
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
710 c->palette_control.palette[j] =
e106e4b43718 adjust indentation on latest patch
melanson
parents: 2809
diff changeset
711 (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
712 }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
713 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
714 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
715 st->codec->palctrl = &c->palette_control;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
716 st->codec->palctrl->palette_changed = 1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
717 } else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
718 st->codec->palctrl = NULL;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
719 } else if(st->codec->codec_type==CODEC_TYPE_AUDIO) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
720 int bits_per_sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
721 uint16_t version = get_be16(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
722
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
723 st->codec->codec_id = id;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
724 get_be16(pb); /* revision level */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
725 get_be32(pb); /* vendor */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
726
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
727 st->codec->channels = get_be16(pb); /* channel count */
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
728 dprintf(c->fc, "audio channels %d\n", st->codec->channels);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
729 st->codec->bits_per_sample = get_be16(pb); /* sample size */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
730 /* do we need to force to 16 for AMR ? */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
731
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
732 /* handle specific s8 codec */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
733 get_be16(pb); /* compression id = 0*/
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
734 get_be16(pb); /* packet size = 0 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
735
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
736 st->codec->sample_rate = ((get_be32(pb) >> 16));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
737
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
738 switch (st->codec->codec_id) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
739 case CODEC_ID_PCM_S8:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
740 case CODEC_ID_PCM_U8:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
741 if (st->codec->bits_per_sample == 16)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
742 st->codec->codec_id = CODEC_ID_PCM_S16BE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
743 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
744 case CODEC_ID_PCM_S16LE:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
745 case CODEC_ID_PCM_S16BE:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
746 if (st->codec->bits_per_sample == 8)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
747 st->codec->codec_id = CODEC_ID_PCM_S8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
748 else if (st->codec->bits_per_sample == 24)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
749 st->codec->codec_id = CODEC_ID_PCM_S24BE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
750 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
751 default:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
752 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
753 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
754
2164
3804e39efbfd misc spelling fixes
diego
parents: 2084
diff changeset
755 //Read QT version 1 fields. In version 0 these do not exist.
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
756 dprintf(c->fc, "version =%d, isom =%d\n",version,c->isom);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
757 if(!c->isom) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
758 if(version==1) {
1940
1a7f66384792 cosmetics, sample_size_v1 -> bytes_per_frame / samples_per_frame
bcoudurier
parents: 1939
diff changeset
759 sc->samples_per_frame = get_be32(pb);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
760 get_be32(pb); /* bytes per packet */
1940
1a7f66384792 cosmetics, sample_size_v1 -> bytes_per_frame / samples_per_frame
bcoudurier
parents: 1939
diff changeset
761 sc->bytes_per_frame = get_be32(pb);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
762 get_be32(pb); /* bytes per sample */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
763 } else if(version==2) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
764 get_be32(pb); /* sizeof struct only */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
765 st->codec->sample_rate = av_int2dbl(get_be64(pb)); /* float 64 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
766 st->codec->channels = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
767 get_be32(pb); /* always 0x7F000000 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
768 get_be32(pb); /* bits per channel if sound is uncompressed */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
769 get_be32(pb); /* lcpm format specific flag */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
770 get_be32(pb); /* bytes per audio packet if constant */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
771 get_be32(pb); /* lpcm frames per audio packet if constant */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
772 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
773 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
774
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
775 bits_per_sample = av_get_bits_per_sample(st->codec->codec_id);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
776 if (bits_per_sample) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
777 st->codec->bits_per_sample = bits_per_sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
778 sc->sample_size = (bits_per_sample >> 3) * st->codec->channels;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
779 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
780 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
781 /* other codec type, just skip (rtp, mp4s, tmcd ...) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
782 url_fskip(pb, size - (url_ftell(pb) - start_pos));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
783 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
784 /* this will read extra atoms at the end (wave, alac, damr, avcC, SMI ...) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
785 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
786 if (a.size > 8) {
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
787 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
788 return -1;
1ce39cda4a59 check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents: 2794
diff changeset
789 } else if (a.size > 0)
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
790 url_fskip(pb, a.size);
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 if(st->codec->codec_type==CODEC_TYPE_AUDIO && st->codec->sample_rate==0 && sc->time_scale>1) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
794 st->codec->sample_rate= sc->time_scale;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
795 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
796
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
797 /* special codec parameters handling */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
798 switch (st->codec->codec_id) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
799 #ifdef CONFIG_H261_DECODER
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
800 case CODEC_ID_H261:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
801 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
802 #ifdef CONFIG_H263_DECODER
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
803 case CODEC_ID_H263:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
804 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
805 #ifdef CONFIG_MPEG4_DECODER
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
806 case CODEC_ID_MPEG4:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
807 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
808 st->codec->width= 0; /* let decoder init width/height */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
809 st->codec->height= 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
810 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
811 #ifdef CONFIG_LIBFAAD
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
812 case CODEC_ID_AAC:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
813 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
814 #ifdef CONFIG_VORBIS_DECODER
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
815 case CODEC_ID_VORBIS:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
816 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
817 case CODEC_ID_MP3ON4:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
818 st->codec->sample_rate= 0; /* let decoder init parameters properly */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
819 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
820 #ifdef CONFIG_DV_DEMUXER
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
821 case CODEC_ID_DVAUDIO:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
822 c->dv_fctx = av_alloc_format_context();
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
823 c->dv_demux = dv_init_demux(c->dv_fctx);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
824 if (!c->dv_demux) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
825 av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n");
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
826 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
827 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
828 sc->dv_audio_container = 1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
829 st->codec->codec_id = CODEC_ID_PCM_S16LE;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
830 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
831 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
832 /* no ifdef since parameters are always those */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
833 case CODEC_ID_AMR_WB:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
834 st->codec->sample_rate= 16000;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
835 st->codec->channels= 1; /* really needed */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
836 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
837 case CODEC_ID_AMR_NB:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
838 st->codec->sample_rate= 8000;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
839 st->codec->channels= 1; /* really needed */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
840 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
841 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
842 case CODEC_ID_MP3:
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
843 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
844 st->need_parsing = AVSTREAM_PARSE_FULL;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
845 break;
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
846 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
847 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
848 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
849 break;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
850 default:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
851 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
852 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
853
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
854 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
855 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
856
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
857 static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
858 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
859 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
860 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
861 unsigned int i, entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
862
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
863 get_byte(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
864 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
865
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
866 entries = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
867
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
868 if(entries >= UINT_MAX / sizeof(MOV_stsc_t))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
869 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
870
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
871 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
872
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
873 sc->sample_to_chunk_sz = entries;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
874 sc->sample_to_chunk = av_malloc(entries * sizeof(MOV_stsc_t));
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
875 if (!sc->sample_to_chunk)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
876 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
877 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
878 sc->sample_to_chunk[i].first = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
879 sc->sample_to_chunk[i].count = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
880 sc->sample_to_chunk[i].id = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
881 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
882 return 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
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
885 static int mov_read_stss(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
886 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
887 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
888 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
889 unsigned int i, entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
890
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
891 get_byte(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
892 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
893
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
894 entries = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
895
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
896 if(entries >= UINT_MAX / sizeof(int))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
897 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
898
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
899 sc->keyframe_count = entries;
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
900
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
901 dprintf(c->fc, "keyframe_count = %d\n", sc->keyframe_count);
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
902
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
903 sc->keyframes = av_malloc(entries * sizeof(int));
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
904 if (!sc->keyframes)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
905 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
906 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
907 sc->keyframes[i] = get_be32(pb);
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
908 //dprintf(c->fc, "keyframes[]=%d\n", sc->keyframes[i]);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
909 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
910 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
911 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
912
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
913 static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
914 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
915 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
916 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
917 unsigned int i, entries, sample_size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
918
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
919 get_byte(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
920 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
921
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
922 sample_size = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
923 if (!sc->sample_size) /* do not overwrite value computed in stsd */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
924 sc->sample_size = sample_size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
925 entries = get_be32(pb);
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
926 if(entries >= UINT_MAX / sizeof(int))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
927 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
928
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
929 sc->sample_count = entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
930 if (sample_size)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
931 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
932
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
933 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
934
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
935 sc->sample_sizes = av_malloc(entries * sizeof(int));
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
936 if (!sc->sample_sizes)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
937 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
938 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
939 sc->sample_sizes[i] = get_be32(pb);
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
940 dprintf(c->fc, "sample_sizes[]=%d\n", sc->sample_sizes[i]);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
941 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
942 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
943 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
944
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
945 static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
946 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
947 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
948 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
949 unsigned int i, entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
950 int64_t duration=0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
951 int64_t total_sample_count=0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
952
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
953 get_byte(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
954 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
955 entries = get_be32(pb);
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
956 if(entries >= UINT_MAX / sizeof(MOV_stts_t))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
957 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
958
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
959 sc->stts_count = entries;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
960 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
961 if (!sc->stts_data)
5bf4b9df2794 return error if malloc failed, found by takis, fix issue 286
bcoudurier
parents: 2806
diff changeset
962 return -1;
2044
fee0acdb8156 use dprintf with AVFormatContext and simplify
bcoudurier
parents: 2042
diff changeset
963 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
964
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
965 sc->time_rate=0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
966
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
967 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
968 int sample_duration;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
969 int sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
970
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
971 sample_count=get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
972 sample_duration = get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
973 sc->stts_data[i].count= sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
974 sc->stts_data[i].duration= sample_duration;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
975
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
976 sc->time_rate= ff_gcd(sc->time_rate, sample_duration);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
977
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
978 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
979
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
980 duration+=(int64_t)sample_duration*sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
981 total_sample_count+=sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
982 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
983
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
984 st->nb_frames= total_sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
985 if(duration)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
986 st->duration= duration;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
987 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
988 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
989
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
990 static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
991 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
992 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
993 MOVStreamContext *sc = st->priv_data;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
994 unsigned int i, entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
995
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
996 get_byte(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
997 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
998 entries = get_be32(pb);
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
999 if(entries >= UINT_MAX / sizeof(MOV_stts_t))
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1000 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1001
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1002 sc->ctts_count = entries;
2045
aa5e56700fdf cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents: 2044
diff changeset
1003 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
1004 if (!sc->ctts_data)
5bf4b9df2794 return error if malloc failed, found by takis, fix issue 286
bcoudurier
parents: 2806
diff changeset
1005 return -1;
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1006 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
1007
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1008 for(i=0; i<entries; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1009 int count =get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1010 int duration =get_be32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1011
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1012 if (duration < 0) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1013 av_log(c->fc, AV_LOG_ERROR, "negative ctts, ignoring\n");
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1014 sc->ctts_count = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1015 url_fskip(pb, 8 * (entries - i - 1));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1016 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1017 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1018 sc->ctts_data[i].count = count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1019 sc->ctts_data[i].duration= duration;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1020
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1021 sc->time_rate= ff_gcd(sc->time_rate, duration);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1022 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1023 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1024 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1025
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1026 static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1027 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1028 AVStream *st;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1029 MOVStreamContext *sc;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1030
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1031 st = av_new_stream(c->fc, c->fc->nb_streams);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1032 if (!st) return -2;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1033 sc = av_mallocz(sizeof(MOVStreamContext));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1034 if (!sc) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1035 av_free(st);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1036 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1037 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1038
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1039 st->priv_data = sc;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1040 st->codec->codec_type = CODEC_TYPE_DATA;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1041 st->start_time = 0; /* XXX: check */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1042 c->streams[c->fc->nb_streams-1] = sc;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1043
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1044 return mov_read_default(c, pb, atom);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1045 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1046
2296
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1047 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
1048 {
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1049 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
1050
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1051 get_be16(pb); /* skip language */
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1052 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
1053 }
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1054
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1055 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
1056 {
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1057 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
1058
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1059 while (url_ftell(pb) + 8 < end) {
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1060 uint32_t tag_size = get_be32(pb);
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1061 uint32_t tag = get_le32(pb);
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1062 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
1063
2547
92bf4673d050 stop parsing udta if size is wrong/garbage, fix issue 154, fix RQ004F14.MOV
bcoudurier
parents: 2299
diff changeset
1064 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
1065 break;
92bf4673d050 stop parsing udta if size is wrong/garbage, fix issue 154, fix RQ004F14.MOV
bcoudurier
parents: 2299
diff changeset
1066
2296
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1067 switch (tag) {
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1068 case MKTAG(0xa9,'n','a','m'):
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1069 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
1070 break;
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1071 case MKTAG(0xa9,'w','r','t'):
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1072 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
1073 break;
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1074 case MKTAG(0xa9,'c','p','y'):
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1075 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
1076 break;
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1077 case MKTAG(0xa9,'i','n','f'):
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1078 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
1079 break;
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1080 default:
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1081 break;
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1082 }
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1083
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1084 url_fseek(pb, next, SEEK_SET);
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1085 }
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1086
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1087 return 0;
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1088 }
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1089
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1090 static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1091 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1092 AVStream *st = c->fc->streams[c->fc->nb_streams-1];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1093 int version = get_byte(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1094
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1095 get_byte(pb); get_byte(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1096 get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1097 /*
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1098 MOV_TRACK_ENABLED 0x0001
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1099 MOV_TRACK_IN_MOVIE 0x0002
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1100 MOV_TRACK_IN_PREVIEW 0x0004
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1101 MOV_TRACK_IN_POSTER 0x0008
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1102 */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1103
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1104 if (version == 1) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1105 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1106 get_be64(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1107 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1108 get_be32(pb); /* creation time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1109 get_be32(pb); /* modification time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1110 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1111 st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1112 get_be32(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1113 st->start_time = 0; /* check */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1114 (version == 1) ? get_be64(pb) : get_be32(pb); /* highlevel (considering edits) duration in movie timebase */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1115 get_be32(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1116 get_be32(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1117
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1118 get_be16(pb); /* layer */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1119 get_be16(pb); /* alternate group */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1120 get_be16(pb); /* volume */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1121 get_be16(pb); /* reserved */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1122
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1123 url_fskip(pb, 36); /* display matrix */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1124
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1125 /* those are fixed-point */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1126 get_be32(pb); /* track width */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1127 get_be32(pb); /* track height */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1128
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1129 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1130 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1131
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1132 /* 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
1133 /* like the files created with Adobe Premiere 5.0, for samples see */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1134 /* http://graphics.tudelft.nl/~wouter/publications/soundtests/ */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1135 static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1136 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1137 int err;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1138
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1139 if (atom.size < 8)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1140 return 0; /* continue */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1141 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
1142 url_fskip(pb, atom.size - 4);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1143 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1144 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1145 atom.type = get_le32(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1146 atom.offset += 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1147 atom.size -= 8;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1148 if (atom.type != MKTAG('m', 'd', 'a', 't')) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1149 url_fskip(pb, atom.size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1150 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1151 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1152 err = mov_read_mdat(c, pb, atom);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1153 return err;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1154 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1155
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1156 static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1157 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1158 #ifdef CONFIG_ZLIB
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1159 ByteIOContext ctx;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1160 uint8_t *cmov_data;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1161 uint8_t *moov_data; /* uncompressed data */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1162 long cmov_len, moov_len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1163 int ret;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1164
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1165 get_be32(pb); /* dcom atom */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1166 if (get_le32(pb) != MKTAG( 'd', 'c', 'o', 'm' ))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1167 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1168 if (get_le32(pb) != MKTAG( 'z', 'l', 'i', 'b' )) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1169 av_log(NULL, AV_LOG_ERROR, "unknown compression for cmov atom !");
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1170 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1171 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1172 get_be32(pb); /* cmvd atom */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1173 if (get_le32(pb) != MKTAG( 'c', 'm', 'v', 'd' ))
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1174 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1175 moov_len = get_be32(pb); /* uncompressed size */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1176 cmov_len = atom.size - 6 * 4;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1177
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1178 cmov_data = av_malloc(cmov_len);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1179 if (!cmov_data)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1180 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1181 moov_data = av_malloc(moov_len);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1182 if (!moov_data) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1183 av_free(cmov_data);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1184 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1185 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1186 get_buffer(pb, cmov_data, cmov_len);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1187 if(uncompress (moov_data, (uLongf *) &moov_len, (const Bytef *)cmov_data, cmov_len) != Z_OK)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1188 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1189 if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, NULL, NULL, NULL) != 0)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1190 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1191 atom.type = MKTAG( 'm', 'o', 'o', 'v' );
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1192 atom.offset = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1193 atom.size = moov_len;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1194 #ifdef DEBUG
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1195 // { 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
1196 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1197 ret = mov_read_default(c, &ctx, atom);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1198 av_free(moov_data);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1199 av_free(cmov_data);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1200 return ret;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1201 #else
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1202 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
1203 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1204 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1205 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1206
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1207 /* edit list atom */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1208 static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1209 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1210 int i, edit_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1211
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1212 get_byte(pb); /* version */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1213 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1214 edit_count= c->streams[c->fc->nb_streams-1]->edit_count = get_be32(pb); /* entries */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1215
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1216 for(i=0; i<edit_count; i++){
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1217 get_be32(pb); /* Track duration */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1218 get_be32(pb); /* Media time */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1219 get_be32(pb); /* Media rate */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1220 }
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1221 dprintf(c->fc, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->edit_count);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1222 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1223 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1224
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1225 static const MOVParseTableEntry mov_default_parse_table[] = {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1226 /* mp4 atoms */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1227 { MKTAG( 'c', 'o', '6', '4' ), mov_read_stco },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1228 { MKTAG( 'c', 't', 't', 's' ), mov_read_ctts }, /* composition time to sample */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1229 { MKTAG( 'e', 'd', 't', 's' ), mov_read_default },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1230 { MKTAG( 'e', 'l', 's', 't' ), mov_read_elst },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1231 { MKTAG( 'e', 'n', 'd', 'a' ), mov_read_enda },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1232 { MKTAG( 'f', 'i', 'e', 'l' ), mov_read_extradata },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1233 { MKTAG( 'f', 't', 'y', 'p' ), mov_read_ftyp },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1234 { MKTAG( 'h', 'd', 'l', 'r' ), mov_read_hdlr },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1235 { MKTAG( 'j', 'p', '2', 'h' ), mov_read_extradata },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1236 { MKTAG( 'm', 'd', 'a', 't' ), mov_read_mdat },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1237 { MKTAG( 'm', 'd', 'h', 'd' ), mov_read_mdhd },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1238 { MKTAG( 'm', 'd', 'i', 'a' ), mov_read_default },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1239 { MKTAG( 'm', 'i', 'n', 'f' ), mov_read_default },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1240 { MKTAG( 'm', 'o', 'o', 'v' ), mov_read_moov },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1241 { MKTAG( 'm', 'v', 'h', 'd' ), mov_read_mvhd },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1242 { MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorenson extension ??? */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1243 { MKTAG( 'a', 'l', 'a', 'c' ), mov_read_extradata }, /* alac specific atom */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1244 { MKTAG( 'a', 'v', 'c', 'C' ), mov_read_avcC },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1245 { MKTAG( 's', 't', 'b', 'l' ), mov_read_default },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1246 { MKTAG( 's', 't', 'c', 'o' ), mov_read_stco },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1247 { MKTAG( 's', 't', 's', 'c' ), mov_read_stsc },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1248 { MKTAG( 's', 't', 's', 'd' ), mov_read_stsd }, /* sample description */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1249 { MKTAG( 's', 't', 's', 's' ), mov_read_stss }, /* sync sample */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1250 { MKTAG( 's', 't', 's', 'z' ), mov_read_stsz }, /* sample size */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1251 { MKTAG( 's', 't', 't', 's' ), mov_read_stts },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1252 { MKTAG( 't', 'k', 'h', 'd' ), mov_read_tkhd }, /* track header */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1253 { MKTAG( 't', 'r', 'a', 'k' ), mov_read_trak },
2296
0cfc556604e3 fill title, author, copyright and comment fields by parsing udta atom
benoit
parents: 2164
diff changeset
1254 { MKTAG( 'u', 'd', 't', 'a' ), mov_read_udta },
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1255 { MKTAG( 'w', 'a', 'v', 'e' ), mov_read_wave },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1256 { MKTAG( 'e', 's', 'd', 's' ), mov_read_esds },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1257 { MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1258 { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_cmov },
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1259 { 0L, NULL }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1260 };
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1261
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1262 /* XXX: is it sufficient ? */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1263 static int mov_probe(AVProbeData *p)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1264 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1265 unsigned int offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1266 uint32_t tag;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1267 int score = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1268
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1269 /* check file header */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1270 offset = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1271 for(;;) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1272 /* ignore invalid offset */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1273 if ((offset + 8) > (unsigned int)p->buf_size)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1274 return score;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1275 tag = AV_RL32(p->buf + offset + 4);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1276 switch(tag) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1277 /* check for obvious tags */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1278 case MKTAG( 'j', 'P', ' ', ' ' ): /* jpeg 2000 signature */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1279 case MKTAG( 'm', 'o', 'o', 'v' ):
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1280 case MKTAG( 'm', 'd', 'a', 't' ):
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1281 case MKTAG( 'p', 'n', 'o', 't' ): /* detect movs with preview pics like ew.mov and april.mov */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1282 case MKTAG( 'u', 'd', 't', 'a' ): /* Packet Video PVAuthor adds this and a lot of more junk */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1283 return AVPROBE_SCORE_MAX;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1284 /* those are more common words, so rate then a bit less */
2039
5dd45d0a5340 add 'wide' reversed tag in probe, detect broken xdcam files xdcam_hd_1080i60.mov
bcoudurier
parents: 2030
diff changeset
1285 case MKTAG( 'e', 'd', 'i', 'w' ): /* xdcam files have reverted first tags */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1286 case MKTAG( 'w', 'i', 'd', 'e' ):
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1287 case MKTAG( 'f', 'r', 'e', 'e' ):
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1288 case MKTAG( 'j', 'u', 'n', 'k' ):
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1289 case MKTAG( 'p', 'i', 'c', 't' ):
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1290 return AVPROBE_SCORE_MAX - 5;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1291 case MKTAG( 'f', 't', 'y', 'p' ):
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1292 case MKTAG( 's', 'k', 'i', 'p' ):
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1293 case MKTAG( 'u', 'u', 'i', 'd' ):
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1294 offset = AV_RB32(p->buf+offset) + offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1295 /* 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
1296 score = AVPROBE_SCORE_MAX - 50;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1297 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1298 default:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1299 /* unrecognized tag */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1300 return score;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1301 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1302 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1303 return score;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1304 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1305
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1306 static void mov_build_index(MOVContext *mov, AVStream *st)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1307 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1308 MOVStreamContext *sc = st->priv_data;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1309 offset_t current_offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1310 int64_t current_dts = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1311 unsigned int stts_index = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1312 unsigned int stsc_index = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1313 unsigned int stss_index = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1314 unsigned int i, j, k;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1315
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1316 if (sc->sample_sizes || st->codec->codec_type == CODEC_TYPE_VIDEO || sc->dv_audio_container) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1317 unsigned int current_sample = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1318 unsigned int stts_sample = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1319 unsigned int keyframe, sample_size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1320 unsigned int distance = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1321
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1322 st->nb_frames = sc->sample_count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1323 for (i = 0; i < sc->chunk_count; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1324 current_offset = sc->chunk_offsets[i];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1325 if (stsc_index + 1 < sc->sample_to_chunk_sz && i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1326 stsc_index++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1327 for (j = 0; j < sc->sample_to_chunk[stsc_index].count; j++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1328 if (current_sample >= sc->sample_count) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1329 av_log(mov->fc, AV_LOG_ERROR, "wrong sample count\n");
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1330 goto out;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1331 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1332 keyframe = !sc->keyframe_count || current_sample + 1 == sc->keyframes[stss_index];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1333 if (keyframe) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1334 distance = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1335 if (stss_index + 1 < sc->keyframe_count)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1336 stss_index++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1337 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1338 sample_size = sc->sample_size > 0 ? sc->sample_size : sc->sample_sizes[current_sample];
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1339 dprintf(mov->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", size %d, distance %d, keyframe %d\n",
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1340 st->index, current_sample, current_offset, current_dts, sample_size, distance, keyframe);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1341 av_add_index_entry(st, current_offset, current_dts, sample_size, distance, keyframe ? AVINDEX_KEYFRAME : 0);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1342 current_offset += sample_size;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1343 assert(sc->stts_data[stts_index].duration % sc->time_rate == 0);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1344 current_dts += sc->stts_data[stts_index].duration / sc->time_rate;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1345 distance++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1346 stts_sample++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1347 current_sample++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1348 if (stts_index + 1 < sc->stts_count && stts_sample == sc->stts_data[stts_index].count) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1349 stts_sample = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1350 stts_index++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1351 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1352 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1353 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1354 } else { /* read whole chunk */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1355 unsigned int chunk_samples, chunk_size, chunk_duration;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1356 for (i = 0; i < sc->chunk_count; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1357 current_offset = sc->chunk_offsets[i];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1358 if (stsc_index + 1 < sc->sample_to_chunk_sz && i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1359 stsc_index++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1360 chunk_samples = sc->sample_to_chunk[stsc_index].count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1361 /* get chunk size */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1362 if (sc->sample_size > 1 || st->codec->codec_id == CODEC_ID_PCM_U8 || st->codec->codec_id == CODEC_ID_PCM_S8)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1363 chunk_size = chunk_samples * sc->sample_size;
1940
1a7f66384792 cosmetics, sample_size_v1 -> bytes_per_frame / samples_per_frame
bcoudurier
parents: 1939
diff changeset
1364 else if (sc->samples_per_frame > 0 && (chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0))
1a7f66384792 cosmetics, sample_size_v1 -> bytes_per_frame / samples_per_frame
bcoudurier
parents: 1939
diff changeset
1365 chunk_size = chunk_samples * sc->bytes_per_frame / sc->samples_per_frame;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1366 else { /* workaround to find nearest next chunk offset */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1367 chunk_size = INT_MAX;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1368 for (j = 0; j < mov->total_streams; j++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1369 MOVStreamContext *msc = mov->streams[j];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1370 for (k = msc->next_chunk; k < msc->chunk_count; k++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1371 if (msc->chunk_offsets[k] > current_offset && msc->chunk_offsets[k] - current_offset < chunk_size) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1372 chunk_size = msc->chunk_offsets[k] - current_offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1373 msc->next_chunk = k;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1374 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1375 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1376 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1377 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1378 /* check for last chunk */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1379 if (chunk_size == INT_MAX)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1380 for (j = 0; j < mov->mdat_count; j++) {
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1381 dprintf(mov->fc, "mdat %d, offset %"PRIx64", size %"PRId64", current offset %"PRIx64"\n",
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1382 j, mov->mdat_list[j].offset, mov->mdat_list[j].size, current_offset);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1383 if (mov->mdat_list[j].offset <= current_offset && mov->mdat_list[j].offset + mov->mdat_list[j].size > current_offset)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1384 chunk_size = mov->mdat_list[j].offset + mov->mdat_list[j].size - current_offset;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1385 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1386 assert(chunk_size != INT_MAX);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1387 for (j = 0; j < mov->total_streams; j++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1388 mov->streams[j]->next_chunk = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1389 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1390 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1391 av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1392 /* get chunk duration */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1393 chunk_duration = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1394 while (chunk_samples > 0) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1395 if (chunk_samples < sc->stts_data[stts_index].count) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1396 chunk_duration += sc->stts_data[stts_index].duration * chunk_samples;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1397 sc->stts_data[stts_index].count -= chunk_samples;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1398 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1399 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1400 chunk_duration += sc->stts_data[stts_index].duration * chunk_samples;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1401 chunk_samples -= sc->stts_data[stts_index].count;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1402 if (stts_index + 1 < sc->stts_count) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1403 stts_index++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1404 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1405 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1406 }
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1407 dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", size %d, duration %d\n",
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1408 st->index, i, current_offset, current_dts, chunk_size, chunk_duration);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1409 assert(chunk_duration % sc->time_rate == 0);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1410 current_dts += chunk_duration / sc->time_rate;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1411 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1412 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1413 out:
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1414 /* adjust sample count to avindex entries */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1415 sc->sample_count = st->nb_index_entries;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1416 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1417
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1418 static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1419 {
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
1420 MOVContext *mov = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2730
diff changeset
1421 ByteIOContext *pb = s->pb;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1422 int i, err;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1423 MOV_atom_t atom = { 0, 0, 0 };
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1424
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1425 mov->fc = s;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1426
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1427 if(!url_is_streamed(pb)) /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1428 atom.size = url_fsize(pb);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1429 else
2026
2e2c2dbb511d use INT64_MAX
bcoudurier
parents: 2023
diff changeset
1430 atom.size = INT64_MAX;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1431
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1432 /* check MOV header */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1433 err = mov_read_default(mov, pb, atom);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1434 if (err<0 || (!mov->found_moov && !mov->found_mdat)) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1435 av_log(s, AV_LOG_ERROR, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%"PRId64"\n",
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1436 err, mov->found_moov, mov->found_mdat, url_ftell(pb));
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1437 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1438 }
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1439 dprintf(mov->fc, "on_parse_exit_offset=%d\n", (int) url_ftell(pb));
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1440
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1441 mov->total_streams = s->nb_streams;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1442
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1443 for(i=0; i<mov->total_streams; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1444 MOVStreamContext *sc = mov->streams[i];
1938
1e93a2174dc6 set audio frame size based on stts
bcoudurier
parents: 1907
diff changeset
1445 AVStream *st = s->streams[i];
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1446 /* sanity checks */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1447 if(!sc->stts_count || !sc->chunk_count || !sc->sample_to_chunk_sz ||
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1448 (!sc->sample_size && !sc->sample_count)){
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1449 av_log(s, AV_LOG_ERROR, "missing mandatory atoms, broken header\n");
1963
81268e2bd9aa unset sample count to disable track when is broken
bcoudurier
parents: 1962
diff changeset
1450 sc->sample_count = 0; //ignore track
1950
4ef37f929c21 dont fail immediately when a somehow broken track is detected, some tracks might be good, fix mi2_vorbis51.mp4
bcoudurier
parents: 1948
diff changeset
1451 continue;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1452 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1453 if(!sc->time_rate)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1454 sc->time_rate=1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1455 if(!sc->time_scale)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1456 sc->time_scale= mov->time_scale;
1939
f846a0c202b5 cosmetics
bcoudurier
parents: 1938
diff changeset
1457 av_set_pts_info(st, 64, sc->time_rate, sc->time_scale);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1458
1938
1e93a2174dc6 set audio frame size based on stts
bcoudurier
parents: 1907
diff changeset
1459 if (st->codec->codec_type == CODEC_TYPE_AUDIO && sc->stts_count == 1)
1e93a2174dc6 set audio frame size based on stts
bcoudurier
parents: 1907
diff changeset
1460 st->codec->frame_size = sc->stts_data[0].duration;
1e93a2174dc6 set audio frame size based on stts
bcoudurier
parents: 1907
diff changeset
1461
1939
f846a0c202b5 cosmetics
bcoudurier
parents: 1938
diff changeset
1462 if(st->duration != AV_NOPTS_VALUE){
f846a0c202b5 cosmetics
bcoudurier
parents: 1938
diff changeset
1463 assert(st->duration % sc->time_rate == 0);
f846a0c202b5 cosmetics
bcoudurier
parents: 1938
diff changeset
1464 st->duration /= sc->time_rate;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1465 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1466 sc->ffindex = i;
1939
f846a0c202b5 cosmetics
bcoudurier
parents: 1938
diff changeset
1467 mov_build_index(mov, st);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1468 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1469
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1470 for(i=0; i<mov->total_streams; i++) {
2164
3804e39efbfd misc spelling fixes
diego
parents: 2084
diff changeset
1471 /* Do not need those anymore. */
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1472 av_freep(&mov->streams[i]->chunk_offsets);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1473 av_freep(&mov->streams[i]->sample_to_chunk);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1474 av_freep(&mov->streams[i]->sample_sizes);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1475 av_freep(&mov->streams[i]->keyframes);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1476 av_freep(&mov->streams[i]->stts_data);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1477 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1478 av_freep(&mov->mdat_list);
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
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1482 static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1483 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1484 MOVContext *mov = s->priv_data;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1485 MOVStreamContext *sc = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1486 AVIndexEntry *sample = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1487 int64_t best_dts = INT64_MAX;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1488 int i;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1489
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1490 for (i = 0; i < mov->total_streams; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1491 MOVStreamContext *msc = mov->streams[i];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1492 if (s->streams[i]->discard != AVDISCARD_ALL && msc->current_sample < msc->sample_count) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1493 AVIndexEntry *current_sample = &s->streams[i]->index_entries[msc->current_sample];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1494 int64_t dts = av_rescale(current_sample->timestamp * (int64_t)msc->time_rate, AV_TIME_BASE, msc->time_scale);
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
1495 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
1496 if (!sample || (url_is_streamed(s->pb) && current_sample->pos < sample->pos) ||
b1b21255bbbb support streamed mov/mp4
bcoudurier
parents: 2814
diff changeset
1497 (!url_is_streamed(s->pb) &&
b1b21255bbbb support streamed mov/mp4
bcoudurier
parents: 2814
diff changeset
1498 ((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) ||
b1b21255bbbb support streamed mov/mp4
bcoudurier
parents: 2814
diff changeset
1499 (FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))) {
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1500 sample = current_sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1501 best_dts = dts;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1502 sc = msc;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1503 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1504 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1505 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1506 if (!sample)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1507 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1508 /* must be done just before reading, to avoid infinite loop on sample */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1509 sc->current_sample++;
2817
b1b21255bbbb support streamed mov/mp4
bcoudurier
parents: 2814
diff changeset
1510 if (url_fseek(s->pb, sample->pos, SEEK_SET) != sample->pos) {
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1511 av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n", sc->ffindex, sample->pos);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1512 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1513 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1514 #ifdef CONFIG_DV_DEMUXER
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1515 if (sc->dv_audio_container) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1516 dv_get_packet(mov->dv_demux, pkt);
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1517 dprintf(s, "dv audio pkt size %d\n", pkt->size);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1518 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1519 #endif
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2730
diff changeset
1520 av_get_packet(s->pb, pkt, sample->size);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1521 #ifdef CONFIG_DV_DEMUXER
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1522 if (mov->dv_demux) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1523 void *pkt_destruct_func = pkt->destruct;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1524 dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1525 pkt->destruct = pkt_destruct_func;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1526 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1527 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1528 #endif
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1529 pkt->stream_index = sc->ffindex;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1530 pkt->dts = sample->timestamp;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1531 if (sc->ctts_data) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1532 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
1533 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
1534 /* update ctts context */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1535 sc->sample_to_ctime_sample++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1536 if (sc->sample_to_ctime_index < sc->ctts_count && sc->ctts_data[sc->sample_to_ctime_index].count == sc->sample_to_ctime_sample) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1537 sc->sample_to_ctime_index++;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1538 sc->sample_to_ctime_sample = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1539 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1540 } else {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1541 pkt->pts = pkt->dts;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1542 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1543 pkt->flags |= sample->flags & AVINDEX_KEYFRAME ? PKT_FLAG_KEY : 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1544 pkt->pos = sample->pos;
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1545 dprintf(s, "stream %d, pts %"PRId64", dts %"PRId64", pos 0x%"PRIx64", duration %d\n", pkt->stream_index, pkt->pts, pkt->dts, pkt->pos, pkt->duration);
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1546 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1547 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1548
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1549 static int mov_seek_stream(AVStream *st, int64_t timestamp, int flags)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1550 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1551 MOVStreamContext *sc = st->priv_data;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1552 int sample, time_sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1553 int i;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1554
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1555 sample = av_index_search_timestamp(st, timestamp, flags);
1907
b33db97089ba Give context to dprintf
mbardiaux
parents: 1848
diff changeset
1556 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
1557 if (sample < 0) /* not sure what to do */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1558 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1559 sc->current_sample = sample;
2030
4464239eddbb long -> int
bcoudurier
parents: 2029
diff changeset
1560 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
1561 /* adjust ctts index */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1562 if (sc->ctts_data) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1563 time_sample = 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1564 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
1565 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
1566 if (next > sc->current_sample) {
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1567 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
1568 sc->sample_to_ctime_sample = sc->current_sample - time_sample;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1569 break;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1570 }
2083
2c3887f02739 fix ctts index computation when seeking, check must be done against next ctts sample, thanks to Uoti
bcoudurier
parents: 2046
diff changeset
1571 time_sample = next;
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1572 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1573 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1574 return sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1575 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1576
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1577 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
1578 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1579 AVStream *st;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1580 int64_t seek_timestamp, timestamp;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1581 int sample;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1582 int i;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1583
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1584 if (stream_index >= s->nb_streams)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1585 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1586
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1587 st = s->streams[stream_index];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1588 sample = mov_seek_stream(st, sample_time, flags);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1589 if (sample < 0)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1590 return -1;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1591
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1592 /* adjust seek timestamp to found sample timestamp */
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1593 seek_timestamp = st->index_entries[sample].timestamp;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1594
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1595 for (i = 0; i < s->nb_streams; i++) {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1596 st = s->streams[i];
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1597 if (stream_index == i || st->discard == AVDISCARD_ALL)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1598 continue;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1599
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1600 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
1601 mov_seek_stream(st, timestamp, flags);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1602 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1603 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1604 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1605
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1606 static int mov_read_close(AVFormatContext *s)
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1607 {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1608 int i;
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
1609 MOVContext *mov = s->priv_data;
2084
f5671ebda7cd simplify, no need for a function
bcoudurier
parents: 2083
diff changeset
1610 for(i=0; i<mov->total_streams; i++) {
f5671ebda7cd simplify, no need for a function
bcoudurier
parents: 2083
diff changeset
1611 av_freep(&mov->streams[i]->ctts_data);
f5671ebda7cd simplify, no need for a function
bcoudurier
parents: 2083
diff changeset
1612 av_freep(&mov->streams[i]);
f5671ebda7cd simplify, no need for a function
bcoudurier
parents: 2083
diff changeset
1613 }
1845
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1614 if(mov->dv_demux){
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1615 for(i=0; i<mov->dv_fctx->nb_streams; i++){
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1616 av_freep(&mov->dv_fctx->streams[i]->codec);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1617 av_freep(&mov->dv_fctx->streams[i]);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1618 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1619 av_freep(&mov->dv_fctx);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1620 av_freep(&mov->dv_demux);
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1621 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1622 return 0;
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1623 }
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1624
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1625 AVInputFormat mov_demuxer = {
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1626 "mov,mp4,m4a,3gp,3g2,mj2",
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1627 "QuickTime/MPEG4/Motion JPEG 2000 format",
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1628 sizeof(MOVContext),
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1629 mov_probe,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1630 mov_read_header,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1631 mov_read_packet,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1632 mov_read_close,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1633 mov_read_seek,
4c4825b91451 functional part of the commit below
michael
parents:
diff changeset
1634 };