annotate mov.c @ 5234:b133e5865370 libavformat

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