Mercurial > libavformat.hg
annotate mov.c @ 6491:b7f807b4cd88 libavformat tip
In mov demuxer, check that nb_streams is valid before using it in read_dac3
| author | bcoudurier |
|---|---|
| date | Tue, 28 Sep 2010 00:33:21 +0000 |
| parents | bae1afdd961a |
| children |
| rev | line source |
|---|---|
| 1845 | 1 /* |
| 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 | 5 * |
| 6 * This file is part of FFmpeg. | |
| 7 * | |
| 8 * FFmpeg is free software; you can redistribute it and/or | |
| 9 * modify it under the terms of the GNU Lesser General Public | |
| 10 * License as published by the Free Software Foundation; either | |
| 11 * version 2.1 of the License, or (at your option) any later version. | |
| 12 * | |
| 13 * FFmpeg is distributed in the hope that it will be useful, | |
| 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 * Lesser General Public License for more details. | |
| 17 * | |
| 18 * You should have received a copy of the GNU Lesser General Public | |
| 19 * License along with FFmpeg; if not, write to the Free Software | |
| 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
| 21 */ | |
| 22 | |
| 23 #include <limits.h> | |
| 24 | |
| 25 //#define DEBUG | |
| 4726 | 26 //#define DEBUG_METADATA |
| 27 //#define MOV_EXPORT_ALL_METADATA | |
| 1845 | 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 | 30 #include "libavutil/avstring.h" |
| 1845 | 31 #include "avformat.h" |
| 32 #include "riff.h" | |
| 33 #include "isom.h" | |
| 3286 | 34 #include "libavcodec/mpeg4audio.h" |
| 35 #include "libavcodec/mpegaudiodata.h" | |
| 4872 | 36 #include "libavcodec/get_bits.h" |
| 1845 | 37 |
| 4206 | 38 #if CONFIG_ZLIB |
| 1845 | 39 #include <zlib.h> |
| 40 #endif | |
| 41 | |
| 42 /* | |
| 43 * First version by Francois Revol revol@free.fr | |
| 44 * Seek function by Gael Chardon gael.dev@4now.net | |
| 45 * | |
| 46 * Features and limitations: | |
| 47 * - reads most of the QT files I have (at least the structure), | |
| 48 * Sample QuickTime files with mp3 audio can be found at: http://www.3ivx.com/showcase.html | |
| 49 * - the code is quite ugly... maybe I won't do it recursive next time :-) | |
| 50 * | |
| 51 * Funny I didn't know about http://sourceforge.net/projects/qt-ffmpeg/ | |
| 52 * when coding this :) (it's a writer anyway) | |
| 53 * | |
| 54 * Reference documents: | |
| 55 * http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt | |
| 56 * Apple: | |
| 57 * http://developer.apple.com/documentation/QuickTime/QTFF/ | |
| 58 * http://developer.apple.com/documentation/QuickTime/QTFF/qtff.pdf | |
| 59 * QuickTime is a trademark of Apple (AFAIK :)) | |
| 60 */ | |
| 61 | |
| 62 #include "qtpalette.h" | |
| 63 | |
| 64 | |
| 65 #undef NDEBUG | |
| 66 #include <assert.h> | |
| 67 | |
| 68 /* XXX: it's the first time I make a recursive parser I think... sorry if it's ugly :P */ | |
| 69 | |
| 70 /* those functions parse an atom */ | |
| 71 /* return code: | |
| 3160 | 72 0: continue to parse next atom |
| 3175 | 73 <0: error occurred, exit |
| 3160 | 74 */ |
| 1845 | 75 /* links atom IDs to parse functions */ |
| 76 typedef struct MOVParseTableEntry { | |
| 77 uint32_t type; | |
| 4079 | 78 int (*parse)(MOVContext *ctx, ByteIOContext *pb, MOVAtom atom); |
| 1845 | 79 } MOVParseTableEntry; |
| 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 | 83 static int mov_metadata_trkn(MOVContext *c, ByteIOContext *pb, unsigned len) |
| 84 { | |
| 85 char buf[16]; | |
| 86 | |
| 87 get_be16(pb); // unknown | |
| 88 snprintf(buf, sizeof(buf), "%d", get_be16(pb)); | |
|
5982
f74198942337
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
stefano
parents:
5975
diff
changeset
|
89 av_metadata_set2(&c->fc->metadata, "track", buf, 0); |
| 4728 | 90 |
| 91 get_be16(pb); // total tracks | |
| 92 | |
| 93 return 0; | |
| 94 } | |
| 95 | |
|
5790
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
96 static const uint32_t mac_to_unicode[128] = { |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
97 0x00C4,0x00C5,0x00C7,0x00C9,0x00D1,0x00D6,0x00DC,0x00E1, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
98 0x00E0,0x00E2,0x00E4,0x00E3,0x00E5,0x00E7,0x00E9,0x00E8, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
99 0x00EA,0x00EB,0x00ED,0x00EC,0x00EE,0x00EF,0x00F1,0x00F3, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
100 0x00F2,0x00F4,0x00F6,0x00F5,0x00FA,0x00F9,0x00FB,0x00FC, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
101 0x2020,0x00B0,0x00A2,0x00A3,0x00A7,0x2022,0x00B6,0x00DF, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
102 0x00AE,0x00A9,0x2122,0x00B4,0x00A8,0x2260,0x00C6,0x00D8, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
103 0x221E,0x00B1,0x2264,0x2265,0x00A5,0x00B5,0x2202,0x2211, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
104 0x220F,0x03C0,0x222B,0x00AA,0x00BA,0x03A9,0x00E6,0x00F8, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
105 0x00BF,0x00A1,0x00AC,0x221A,0x0192,0x2248,0x2206,0x00AB, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
106 0x00BB,0x2026,0x00A0,0x00C0,0x00C3,0x00D5,0x0152,0x0153, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
107 0x2013,0x2014,0x201C,0x201D,0x2018,0x2019,0x00F7,0x25CA, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
108 0x00FF,0x0178,0x2044,0x20AC,0x2039,0x203A,0xFB01,0xFB02, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
109 0x2021,0x00B7,0x201A,0x201E,0x2030,0x00C2,0x00CA,0x00C1, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
110 0x00CB,0x00C8,0x00CD,0x00CE,0x00CF,0x00CC,0x00D3,0x00D4, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
111 0xF8FF,0x00D2,0x00DA,0x00DB,0x00D9,0x0131,0x02C6,0x02DC, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
112 0x00AF,0x02D8,0x02D9,0x02DA,0x00B8,0x02DD,0x02DB,0x02C7, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
113 }; |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
114 |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
115 static int mov_read_mac_string(MOVContext *c, ByteIOContext *pb, int len, |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
116 char *dst, int dstlen) |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
117 { |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
118 char *p = dst; |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
119 char *end = dst+dstlen-1; |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
120 int i; |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
121 |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
122 for (i = 0; i < len; i++) { |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
123 uint8_t t, c = get_byte(pb); |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
124 if (c < 0x80 && p < end) |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
125 *p++ = c; |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
126 else |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
127 PUT_UTF8(mac_to_unicode[c-0x80], t, if (p < end) *p++ = t;); |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
128 } |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
129 *p = 0; |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
130 return p - dst; |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
131 } |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
132 |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
133 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
|
134 { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
135 #ifdef MOV_EXPORT_ALL_METADATA |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
136 char tmp_key[5]; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
137 #endif |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
138 char str[1024], key2[16], language[4] = {0}; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
139 const char *key = NULL; |
|
5790
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
140 uint16_t str_size, langcode = 0; |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
141 uint32_t data_type = 0; |
| 4728 | 142 int (*parse)(MOVContext*, ByteIOContext*, unsigned) = NULL; |
|
4727
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 switch (atom.type) { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
145 case MKTAG(0xa9,'n','a','m'): key = "title"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
146 case MKTAG(0xa9,'a','u','t'): |
|
6040
2bab410094e0
change author metadata to artist in mov de/muxer
bcoudurier
parents:
5991
diff
changeset
|
147 case MKTAG(0xa9,'A','R','T'): key = "artist"; break; |
|
5342
d2db7a53bc0d
fix \0xa9wrt metadata, to composer, fix issue #1501
bcoudurier
parents:
5332
diff
changeset
|
148 case MKTAG(0xa9,'w','r','t'): key = "composer"; break; |
| 5383 | 149 case MKTAG( 'c','p','r','t'): |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
150 case MKTAG(0xa9,'c','p','y'): key = "copyright"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
151 case MKTAG(0xa9,'c','m','t'): |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
152 case MKTAG(0xa9,'i','n','f'): key = "comment"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
153 case MKTAG(0xa9,'a','l','b'): key = "album"; break; |
|
5618
27fd77f20a89
Add a list of generic tags and change demuxers to follow it.
pross
parents:
5586
diff
changeset
|
154 case MKTAG(0xa9,'d','a','y'): key = "date"; break; |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
155 case MKTAG(0xa9,'g','e','n'): key = "genre"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
156 case MKTAG(0xa9,'t','o','o'): |
|
5354
0f7d0b4f9bd8
change \0xa9enc tag metadata name to encoder to match id3v2
bcoudurier
parents:
5351
diff
changeset
|
157 case MKTAG(0xa9,'e','n','c'): key = "encoder"; break; |
| 5382 | 158 case MKTAG( 'd','e','s','c'): key = "description";break; |
| 159 case MKTAG( 'l','d','e','s'): key = "synopsis"; break; | |
| 160 case MKTAG( 't','v','s','h'): key = "show"; break; | |
| 161 case MKTAG( 't','v','e','n'): key = "episode_id";break; | |
| 162 case MKTAG( 't','v','n','n'): key = "network"; break; | |
| 4728 | 163 case MKTAG( 't','r','k','n'): key = "track"; |
| 164 parse = mov_metadata_trkn; break; | |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
165 } |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
166 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
167 if (c->itunes_metadata && atom.size > 8) { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
168 int data_size = get_be32(pb); |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
169 int tag = get_le32(pb); |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
170 if (tag == MKTAG('d','a','t','a')) { |
|
5790
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
171 data_type = get_be32(pb); // type |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
172 get_be32(pb); // unknown |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
173 str_size = data_size - 16; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
174 atom.size -= 16; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
175 } else return 0; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
176 } else if (atom.size > 4 && key && !c->itunes_metadata) { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
177 str_size = get_be16(pb); // string length |
|
5790
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
178 langcode = get_be16(pb); |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
179 ff_mov_lang_to_iso639(langcode, language); |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
180 atom.size -= 4; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
181 } else |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
182 str_size = atom.size; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
183 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
184 #ifdef MOV_EXPORT_ALL_METADATA |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
185 if (!key) { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
186 snprintf(tmp_key, 5, "%.4s", (char*)&atom.type); |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
187 key = tmp_key; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
188 } |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
189 #endif |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
190 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
191 if (!key) |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
192 return 0; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
193 if (atom.size < 0) |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
194 return -1; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
195 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
196 str_size = FFMIN3(sizeof(str)-1, str_size, atom.size); |
| 4728 | 197 |
| 198 if (parse) | |
| 199 parse(c, pb, str_size); | |
| 200 else { | |
|
5790
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
201 if (data_type == 3 || (data_type == 0 && langcode < 0x800)) { // MAC Encoded |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
202 mov_read_mac_string(c, pb, str_size, str, sizeof(str)); |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
203 } else { |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
204 get_buffer(pb, str, str_size); |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
205 str[str_size] = 0; |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
206 } |
|
5982
f74198942337
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
stefano
parents:
5975
diff
changeset
|
207 av_metadata_set2(&c->fc->metadata, key, str, 0); |
| 4729 | 208 if (*language && strcmp(language, "und")) { |
| 209 snprintf(key2, sizeof(key2), "%s-%s", key, language); | |
|
5982
f74198942337
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
stefano
parents:
5975
diff
changeset
|
210 av_metadata_set2(&c->fc->metadata, key2, str, 0); |
| 4729 | 211 } |
| 4728 | 212 } |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
213 #ifdef DEBUG_METADATA |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
214 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
|
215 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
|
216 key, str, (char*)&atom.type, str_size, atom.size); |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
217 #endif |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
218 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
219 return 0; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
220 } |
| 4726 | 221 |
| 5991 | 222 static int mov_read_chpl(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 223 { | |
| 224 int64_t start; | |
| 6230 | 225 int i, nb_chapters, str_len, version; |
| 5991 | 226 char str[256+1]; |
| 227 | |
| 228 if ((atom.size -= 5) < 0) | |
| 229 return 0; | |
| 230 | |
| 6230 | 231 version = get_byte(pb); |
| 232 get_be24(pb); | |
| 233 if (version) | |
| 234 get_be32(pb); // ??? | |
| 5991 | 235 nb_chapters = get_byte(pb); |
| 236 | |
| 237 for (i = 0; i < nb_chapters; i++) { | |
| 238 if (atom.size < 9) | |
| 239 return 0; | |
| 240 | |
| 241 start = get_be64(pb); | |
| 242 str_len = get_byte(pb); | |
| 243 | |
| 244 if ((atom.size -= 9+str_len) < 0) | |
| 245 return 0; | |
| 246 | |
| 247 get_buffer(pb, str, str_len); | |
| 248 str[str_len] = 0; | |
| 249 ff_new_chapter(c->fc, i, (AVRational){1,10000000}, start, AV_NOPTS_VALUE, str); | |
| 250 } | |
| 251 return 0; | |
| 252 } | |
| 253 | |
| 4079 | 254 static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 255 { |
| 256 int64_t total_size = 0; | |
| 4079 | 257 MOVAtom a; |
| 1845 | 258 int i; |
| 259 | |
| 260 if (atom.size < 0) | |
| 2026 | 261 atom.size = INT64_MAX; |
|
5497
59df3b64dc89
cosmetics, remove useless parentheses, add space
bcoudurier
parents:
5496
diff
changeset
|
262 while (total_size + 8 < atom.size && !url_feof(pb)) { |
| 4726 | 263 int (*parse)(MOVContext*, ByteIOContext*, MOVAtom) = NULL; |
| 1845 | 264 a.size = atom.size; |
| 2826 | 265 a.type=0; |
| 1845 | 266 if(atom.size >= 8) { |
| 267 a.size = get_be32(pb); | |
| 268 a.type = get_le32(pb); | |
| 269 } | |
|
6173
1b9079c05f9a
Improve mov atom parsing debug message, print parent atom and size in decimal
bcoudurier
parents:
6040
diff
changeset
|
270 dprintf(c->fc, "type: %08x '%.4s' parent:'%.4s' sz: %"PRId64" %"PRId64" %"PRId64"\n", |
|
1b9079c05f9a
Improve mov atom parsing debug message, print parent atom and size in decimal
bcoudurier
parents:
6040
diff
changeset
|
271 a.type, (char*)&a.type, (char*)&atom.type, a.size, total_size, atom.size); |
|
6197
d81e41261983
In mov demuxer, increase total size after debugging message
bcoudurier
parents:
6173
diff
changeset
|
272 total_size += 8; |
| 1845 | 273 if (a.size == 1) { /* 64 bit extended size */ |
| 274 a.size = get_be64(pb) - 8; | |
| 275 total_size += 8; | |
| 276 } | |
| 277 if (a.size == 0) { | |
| 278 a.size = atom.size - total_size; | |
| 279 if (a.size <= 8) | |
| 280 break; | |
| 281 } | |
|
1964
4571a481081d
move atom size check before parsing function search
bcoudurier
parents:
1963
diff
changeset
|
282 a.size -= 8; |
|
2660
022174d849d5
fix issue 225, instead of stoping when wrong atom size is found,
bcoudurier
parents:
2589
diff
changeset
|
283 if(a.size < 0) |
|
1964
4571a481081d
move atom size check before parsing function search
bcoudurier
parents:
1963
diff
changeset
|
284 break; |
| 2665 | 285 a.size = FFMIN(a.size, atom.size - total_size); |
|
1964
4571a481081d
move atom size check before parsing function search
bcoudurier
parents:
1963
diff
changeset
|
286 |
| 4726 | 287 for (i = 0; mov_default_parse_table[i].type; i++) |
| 288 if (mov_default_parse_table[i].type == a.type) { | |
| 289 parse = mov_default_parse_table[i].parse; | |
| 290 break; | |
| 291 } | |
| 1845 | 292 |
| 4726 | 293 // container is user data |
| 294 if (!parse && (atom.type == MKTAG('u','d','t','a') || | |
| 295 atom.type == MKTAG('i','l','s','t'))) | |
| 296 parse = mov_read_udta_string; | |
| 297 | |
| 298 if (!parse) { /* skip leaf atoms data */ | |
| 1845 | 299 url_fskip(pb, a.size); |
| 300 } else { | |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3967
diff
changeset
|
301 int64_t start_pos = url_ftell(pb); |
| 1845 | 302 int64_t left; |
| 5496 | 303 int err = parse(c, pb, a); |
| 304 if (err < 0) | |
| 305 return err; | |
|
5545
3a5082b94ab3
do not skip mdat data if it's the last atom, avoids one seek
bcoudurier
parents:
5497
diff
changeset
|
306 if (c->found_moov && c->found_mdat && |
|
3a5082b94ab3
do not skip mdat data if it's the last atom, avoids one seek
bcoudurier
parents:
5497
diff
changeset
|
307 (url_is_streamed(pb) || start_pos + a.size == url_fsize(pb))) |
|
3a5082b94ab3
do not skip mdat data if it's the last atom, avoids one seek
bcoudurier
parents:
5497
diff
changeset
|
308 return 0; |
| 1845 | 309 left = a.size - url_ftell(pb) + start_pos; |
| 310 if (left > 0) /* skip garbage at atom end */ | |
| 311 url_fskip(pb, left); | |
| 312 } | |
| 313 | |
| 314 total_size += a.size; | |
| 315 } | |
| 316 | |
| 5496 | 317 if (total_size < atom.size && atom.size < 0x7ffff) |
| 1845 | 318 url_fskip(pb, atom.size - total_size); |
| 319 | |
| 5496 | 320 return 0; |
| 1845 | 321 } |
| 322 | |
| 4079 | 323 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
|
324 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
325 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
326 MOVStreamContext *sc; |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
327 int entries, i, j; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
328 |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
329 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
330 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
331 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
332 sc = st->priv_data; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
333 |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
334 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
|
335 entries = get_be32(pb); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
336 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
|
337 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
|
338 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
|
339 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
|
340 return AVERROR(ENOMEM); |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
341 sc->drefs_count = entries; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
342 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
343 for (i = 0; i < sc->drefs_count; i++) { |
| 4079 | 344 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
|
345 uint32_t size = get_be32(pb); |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3967
diff
changeset
|
346 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
|
347 |
| 6467 | 348 if (size < 12) |
| 349 return -1; | |
| 350 | |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
351 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
|
352 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
|
353 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
|
354 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
355 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
|
356 /* macintosh alias record */ |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
357 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
|
358 int16_t type; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
359 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
360 url_fskip(pb, 10); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
361 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
362 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
|
363 volume_len = FFMIN(volume_len, 27); |
|
5369
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
364 get_buffer(pb, dref->volume, 27); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
365 dref->volume[volume_len] = 0; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
366 av_log(c->fc, AV_LOG_DEBUG, "volume %s, len %d\n", dref->volume, volume_len); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
367 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
368 url_fskip(pb, 12); |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
369 |
|
5369
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
370 len = get_byte(pb); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
371 len = FFMIN(len, 63); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
372 get_buffer(pb, dref->filename, 63); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
373 dref->filename[len] = 0; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
374 av_log(c->fc, AV_LOG_DEBUG, "filename %s, len %d\n", dref->filename, len); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
375 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
376 url_fskip(pb, 16); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
377 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
378 /* read next level up_from_alias/down_to_target */ |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
379 dref->nlvl_from = get_be16(pb); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
380 dref->nlvl_to = get_be16(pb); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
381 av_log(c->fc, AV_LOG_DEBUG, "nlvl from %d, nlvl to %d\n", |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
382 dref->nlvl_from, dref->nlvl_to); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
383 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
384 url_fskip(pb, 16); |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
385 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
386 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
|
387 type = get_be16(pb); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
388 len = get_be16(pb); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
389 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
|
390 if (len&1) |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
391 len += 1; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
392 if (type == 2) { // absolute path |
| 3092 | 393 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
|
394 dref->path = av_mallocz(len+1); |
| 3091 | 395 if (!dref->path) |
| 396 return AVERROR(ENOMEM); | |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
397 get_buffer(pb, dref->path, len); |
|
5369
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
398 if (len > volume_len && !strncmp(dref->path, dref->volume, volume_len)) { |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
399 len -= volume_len; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
400 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
|
401 dref->path[len] = 0; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
402 } |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
403 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
|
404 if (dref->path[j] == ':') |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
405 dref->path[j] = '/'; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
406 av_log(c->fc, AV_LOG_DEBUG, "path %s\n", dref->path); |
|
5369
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
407 } else if (type == 0) { // directory name |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
408 av_free(dref->dir); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
409 dref->dir = av_malloc(len+1); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
410 if (!dref->dir) |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
411 return AVERROR(ENOMEM); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
412 get_buffer(pb, dref->dir, len); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
413 dref->dir[len] = 0; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
414 for (j = 0; j < len; j++) |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
415 if (dref->dir[j] == ':') |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
416 dref->dir[j] = '/'; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
417 av_log(c->fc, AV_LOG_DEBUG, "dir %s\n", dref->dir); |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
418 } else |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
419 url_fskip(pb, len); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
420 } |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
421 } |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
422 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
|
423 } |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
424 return 0; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
425 } |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
426 |
| 4079 | 427 static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 428 { |
|
4642
60d5f0997351
MOV: fix crash when 'meta' occurs before first 'trak'
alexc
parents:
4625
diff
changeset
|
429 AVStream *st; |
| 1845 | 430 uint32_t type; |
| 431 uint32_t ctype; | |
| 432 | |
|
4642
60d5f0997351
MOV: fix crash when 'meta' occurs before first 'trak'
alexc
parents:
4625
diff
changeset
|
433 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
|
434 return 0; |
|
60d5f0997351
MOV: fix crash when 'meta' occurs before first 'trak'
alexc
parents:
4625
diff
changeset
|
435 |
|
60d5f0997351
MOV: fix crash when 'meta' occurs before first 'trak'
alexc
parents:
4625
diff
changeset
|
436 st = c->fc->streams[c->fc->nb_streams-1]; |
|
60d5f0997351
MOV: fix crash when 'meta' occurs before first 'trak'
alexc
parents:
4625
diff
changeset
|
437 |
| 1845 | 438 get_byte(pb); /* version */ |
| 3145 | 439 get_be24(pb); /* flags */ |
| 1845 | 440 |
| 441 /* component type */ | |
| 442 ctype = get_le32(pb); | |
| 443 type = get_le32(pb); /* component subtype */ | |
| 444 | |
| 4730 | 445 dprintf(c->fc, "ctype= %.4s (0x%08x)\n", (char*)&ctype, ctype); |
| 446 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
|
447 |
| 3254 | 448 if (type == MKTAG('v','i','d','e')) |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
449 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
| 3253 | 450 else if(type == MKTAG('s','o','u','n')) |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
451 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
| 3253 | 452 else if(type == MKTAG('m','1','a',' ')) |
| 1845 | 453 st->codec->codec_id = CODEC_ID_MP2; |
| 4731 | 454 else if(type == MKTAG('s','u','b','p')) |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
455 st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; |
| 4731 | 456 |
| 1845 | 457 get_be32(pb); /* component manufacture */ |
| 458 get_be32(pb); /* component flags */ | |
| 459 get_be32(pb); /* component flags mask */ | |
| 460 | |
| 461 return 0; | |
| 462 } | |
| 463 | |
| 5205 | 464 int ff_mp4_read_descr_len(ByteIOContext *pb) |
| 1845 | 465 { |
| 466 int len = 0; | |
| 467 int count = 4; | |
| 468 while (count--) { | |
| 469 int c = get_byte(pb); | |
| 470 len = (len << 7) | (c & 0x7f); | |
| 471 if (!(c & 0x80)) | |
| 472 break; | |
| 473 } | |
| 474 return len; | |
| 475 } | |
| 476 | |
|
5723
adf1ad73c63e
Make mp4_read_descr static: It is only used inside libavformat/mov.c.
cehoyos
parents:
5684
diff
changeset
|
477 static int mp4_read_descr(AVFormatContext *fc, ByteIOContext *pb, int *tag) |
| 1845 | 478 { |
| 479 int len; | |
| 480 *tag = get_byte(pb); | |
| 5205 | 481 len = ff_mp4_read_descr_len(pb); |
| 482 dprintf(fc, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len); | |
| 1845 | 483 return len; |
| 484 } | |
| 485 | |
| 2028 | 486 #define MP4ESDescrTag 0x03 |
| 487 #define MP4DecConfigDescrTag 0x04 | |
| 488 #define MP4DecSpecificDescrTag 0x05 | |
| 489 | |
|
3261
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
490 static const AVCodecTag mp4_audio_types[] = { |
|
4749
a0e0086f7f52
MOV: Use the AOT enum for the mp4_audio_types mapping.
alexc
parents:
4742
diff
changeset
|
491 { 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
|
492 { CODEC_ID_MP3ON4, AOT_L1 }, /* layer 1 */ |
|
a0e0086f7f52
MOV: Use the AOT enum for the mp4_audio_types mapping.
alexc
parents:
4742
diff
changeset
|
493 { CODEC_ID_MP3ON4, AOT_L2 }, /* layer 2 */ |
|
a0e0086f7f52
MOV: Use the AOT enum for the mp4_audio_types mapping.
alexc
parents:
4742
diff
changeset
|
494 { 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
|
495 { 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
|
496 { CODEC_ID_NONE, AOT_NULL }, |
|
3261
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
497 }; |
|
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
498 |
| 5205 | 499 int ff_mov_read_esds(AVFormatContext *fc, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 500 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
501 AVStream *st; |
| 1845 | 502 int tag, len; |
| 503 | |
| 5205 | 504 if (fc->nb_streams < 1) |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
505 return 0; |
| 5205 | 506 st = fc->streams[fc->nb_streams-1]; |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
507 |
| 1845 | 508 get_be32(pb); /* version + flags */ |
| 5205 | 509 len = mp4_read_descr(fc, pb, &tag); |
| 1845 | 510 if (tag == MP4ESDescrTag) { |
| 511 get_be16(pb); /* ID */ | |
| 512 get_byte(pb); /* priority */ | |
| 513 } else | |
| 514 get_be16(pb); /* ID */ | |
| 515 | |
| 5205 | 516 len = mp4_read_descr(fc, pb, &tag); |
| 1845 | 517 if (tag == MP4DecConfigDescrTag) { |
| 2028 | 518 int object_type_id = get_byte(pb); |
| 519 get_byte(pb); /* stream type */ | |
| 520 get_be24(pb); /* buffer size db */ | |
| 521 get_be32(pb); /* max bitrate */ | |
| 522 get_be32(pb); /* avg bitrate */ | |
| 1845 | 523 |
|
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5035
diff
changeset
|
524 st->codec->codec_id= ff_codec_get_id(ff_mp4_obj_type, object_type_id); |
|
5364
4a925b59dc1b
Debug print MP4 objectTypeIndication in hex not decimal as values are listed in
alexc
parents:
5362
diff
changeset
|
525 dprintf(fc, "esds object type id 0x%02x\n", object_type_id); |
| 5205 | 526 len = mp4_read_descr(fc, pb, &tag); |
| 1845 | 527 if (tag == MP4DecSpecificDescrTag) { |
| 5205 | 528 dprintf(fc, "Specific MPEG4 header len=%d\n", len); |
| 3078 | 529 if((uint64_t)len > (1<<30)) |
| 530 return -1; | |
| 1845 | 531 st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); |
| 3076 | 532 if (!st->codec->extradata) |
| 533 return AVERROR(ENOMEM); | |
| 3077 | 534 get_buffer(pb, st->codec->extradata, len); |
| 535 st->codec->extradata_size = len; | |
|
3261
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
536 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
|
537 MPEG4AudioConfig cfg; |
|
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
538 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
|
539 st->codec->extradata_size); |
| 5362 | 540 st->codec->channels = cfg.channels; |
|
3262
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
541 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
|
542 st->codec->sample_rate = ff_mpa_freq_tab[cfg.sampling_index]; |
|
6210
da46dcc05d4a
Use ext sample from mpeg4audio config if set with AAC SBR
bcoudurier
parents:
6197
diff
changeset
|
543 else if (cfg.ext_sample_rate) |
|
da46dcc05d4a
Use ext sample from mpeg4audio config if set with AAC SBR
bcoudurier
parents:
6197
diff
changeset
|
544 st->codec->sample_rate = cfg.ext_sample_rate; |
|
3262
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
545 else |
|
6210
da46dcc05d4a
Use ext sample from mpeg4audio config if set with AAC SBR
bcoudurier
parents:
6197
diff
changeset
|
546 st->codec->sample_rate = cfg.sample_rate; |
| 5205 | 547 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
|
548 "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
|
549 cfg.object_type, cfg.ext_object_type, |
|
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
550 cfg.sample_rate, cfg.ext_sample_rate); |
|
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5035
diff
changeset
|
551 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
|
552 cfg.object_type))) |
|
3261
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
553 st->codec->codec_id = CODEC_ID_AAC; |
| 3077 | 554 } |
| 1845 | 555 } |
| 556 } | |
| 557 return 0; | |
| 558 } | |
| 559 | |
| 5205 | 560 static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 561 { | |
| 562 return ff_mov_read_esds(c->fc, pb, atom); | |
| 563 } | |
| 564 | |
|
6464
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
565 static int mov_read_dac3(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
566 { |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
567 AVStream *st; |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
568 int ac3info, acmod, lfeon; |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
569 |
|
6491
b7f807b4cd88
In mov demuxer, check that nb_streams is valid before using it in read_dac3
bcoudurier
parents:
6467
diff
changeset
|
570 if (c->fc->nb_streams < 1) |
|
b7f807b4cd88
In mov demuxer, check that nb_streams is valid before using it in read_dac3
bcoudurier
parents:
6467
diff
changeset
|
571 return 0; |
|
6464
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
572 st = c->fc->streams[c->fc->nb_streams-1]; |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
573 |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
574 ac3info = get_be24(pb); |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
575 acmod = (ac3info >> 11) & 0x7; |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
576 lfeon = (ac3info >> 10) & 0x1; |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
577 st->codec->channels = ((int[]){2,1,2,3,3,4,4,5})[acmod] + lfeon; |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
578 |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
579 return 0; |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
580 } |
|
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
581 |
| 4080 | 582 static int mov_read_pasp(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 583 { | |
| 584 const int num = get_be32(pb); | |
| 585 const int den = get_be32(pb); | |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
586 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
587 |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
588 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
589 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
590 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
591 |
|
6466
35bb7cdfe337
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
bcoudurier
parents:
6464
diff
changeset
|
592 if ((st->sample_aspect_ratio.den != 1 || st->sample_aspect_ratio.num) && // default |
|
35bb7cdfe337
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
bcoudurier
parents:
6464
diff
changeset
|
593 (den != st->sample_aspect_ratio.den || num != st->sample_aspect_ratio.num)) { |
|
35bb7cdfe337
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
bcoudurier
parents:
6464
diff
changeset
|
594 av_log(c->fc, AV_LOG_WARNING, |
|
35bb7cdfe337
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
bcoudurier
parents:
6464
diff
changeset
|
595 "sample aspect ratio already set to %d:%d, ignoring 'pasp' atom (%d:%d)\n", |
|
35bb7cdfe337
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
bcoudurier
parents:
6464
diff
changeset
|
596 st->sample_aspect_ratio.num, st->sample_aspect_ratio.den, |
|
35bb7cdfe337
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
bcoudurier
parents:
6464
diff
changeset
|
597 num, den); |
|
35bb7cdfe337
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
bcoudurier
parents:
6464
diff
changeset
|
598 } else if (den != 0) { |
| 4080 | 599 st->sample_aspect_ratio.num = num; |
| 600 st->sample_aspect_ratio.den = den; | |
| 601 } | |
| 602 return 0; | |
| 603 } | |
| 604 | |
| 1845 | 605 /* this atom contains actual media data */ |
| 4079 | 606 static int mov_read_mdat(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 607 { |
| 608 if(atom.size == 0) /* wrong one (MP4) */ | |
| 609 return 0; | |
| 610 c->found_mdat=1; | |
| 611 return 0; /* now go for moov */ | |
| 612 } | |
| 613 | |
|
5234
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
614 /* read major brand, minor version and compatible brands and store them as metadata */ |
| 4079 | 615 static int mov_read_ftyp(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 616 { |
|
5234
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
617 uint32_t minor_ver; |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
618 int comp_brand_size; |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
619 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
|
620 char* comp_brands_str; |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
621 uint8_t type[5] = {0}; |
| 1845 | 622 |
|
5234
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
623 get_buffer(pb, type, 4); |
| 5235 | 624 if (strcmp(type, "qt ")) |
| 1845 | 625 c->isom = 1; |
| 626 av_log(c->fc, AV_LOG_DEBUG, "ISO: File Type Major Brand: %.4s\n",(char *)&type); | |
|
5982
f74198942337
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
stefano
parents:
5975
diff
changeset
|
627 av_metadata_set2(&c->fc->metadata, "major_brand", type, 0); |
|
5234
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
628 minor_ver = get_be32(pb); /* minor version */ |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
629 snprintf(minor_ver_str, sizeof(minor_ver_str), "%d", minor_ver); |
|
5982
f74198942337
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
stefano
parents:
5975
diff
changeset
|
630 av_metadata_set2(&c->fc->metadata, "minor_version", minor_ver_str, 0); |
|
5234
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
631 |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
632 comp_brand_size = atom.size - 8; |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
633 if (comp_brand_size < 0) |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
634 return -1; |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
635 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
|
636 if (!comp_brands_str) |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
637 return AVERROR(ENOMEM); |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
638 get_buffer(pb, comp_brands_str, comp_brand_size); |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
639 comp_brands_str[comp_brand_size] = 0; |
|
5982
f74198942337
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
stefano
parents:
5975
diff
changeset
|
640 av_metadata_set2(&c->fc->metadata, "compatible_brands", comp_brands_str, 0); |
|
5234
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
641 av_freep(&comp_brands_str); |
|
b133e5865370
Export mov/mp4 major and compatible brands as metadata.
bcoudurier
parents:
5205
diff
changeset
|
642 |
| 1845 | 643 return 0; |
| 644 } | |
| 645 | |
| 646 /* this atom should contain all header atoms */ | |
| 4079 | 647 static int mov_read_moov(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 648 { |
|
2806
1ce39cda4a59
check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents:
2794
diff
changeset
|
649 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
|
650 return -1; |
| 1845 | 651 /* we parsed the 'moov' atom, we can terminate the parsing as soon as we find the 'mdat' */ |
| 652 /* so we don't parse the whole file if over a network */ | |
| 653 c->found_moov=1; | |
| 654 return 0; /* now go for mdat */ | |
| 655 } | |
| 656 | |
| 4079 | 657 static int mov_read_moof(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 3169 | 658 { |
| 659 c->fragment.moof_offset = url_ftell(pb) - 8; | |
| 660 dprintf(c->fc, "moof offset %llx\n", c->fragment.moof_offset); | |
| 661 return mov_read_default(c, pb, atom); | |
| 662 } | |
| 1845 | 663 |
| 4079 | 664 static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 665 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
666 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
667 MOVStreamContext *sc; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
668 int version; |
| 4485 | 669 char language[4] = {0}; |
| 4269 | 670 unsigned lang; |
| 1845 | 671 |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
672 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
673 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
674 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
675 sc = st->priv_data; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
676 |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
677 version = get_byte(pb); |
| 1845 | 678 if (version > 1) |
| 3259 | 679 return -1; /* unsupported */ |
| 1845 | 680 |
| 3145 | 681 get_be24(pb); /* flags */ |
| 1845 | 682 if (version == 1) { |
| 683 get_be64(pb); | |
| 684 get_be64(pb); | |
| 685 } else { | |
| 686 get_be32(pb); /* creation time */ | |
| 687 get_be32(pb); /* modification time */ | |
| 688 } | |
| 689 | |
| 690 sc->time_scale = get_be32(pb); | |
| 691 st->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */ | |
| 692 | |
| 693 lang = get_be16(pb); /* language */ | |
| 4485 | 694 if (ff_mov_lang_to_iso639(lang, language)) |
|
5982
f74198942337
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
stefano
parents:
5975
diff
changeset
|
695 av_metadata_set2(&st->metadata, "language", language, 0); |
| 1845 | 696 get_be16(pb); /* quality */ |
| 697 | |
| 698 return 0; | |
| 699 } | |
| 700 | |
| 4079 | 701 static int mov_read_mvhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 702 { |
| 703 int version = get_byte(pb); /* version */ | |
| 3145 | 704 get_be24(pb); /* flags */ |
| 1845 | 705 |
| 706 if (version == 1) { | |
| 707 get_be64(pb); | |
| 708 get_be64(pb); | |
| 709 } else { | |
| 710 get_be32(pb); /* creation time */ | |
| 711 get_be32(pb); /* modification time */ | |
| 712 } | |
| 713 c->time_scale = get_be32(pb); /* time scale */ | |
| 2044 | 714 |
| 715 dprintf(c->fc, "time scale = %i\n", c->time_scale); | |
| 716 | |
| 1845 | 717 c->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */ |
| 718 get_be32(pb); /* preferred scale */ | |
| 719 | |
| 720 get_be16(pb); /* preferred volume */ | |
| 721 | |
| 722 url_fskip(pb, 10); /* reserved */ | |
| 723 | |
| 724 url_fskip(pb, 36); /* display matrix */ | |
| 725 | |
| 726 get_be32(pb); /* preview time */ | |
| 727 get_be32(pb); /* preview duration */ | |
| 728 get_be32(pb); /* poster time */ | |
| 729 get_be32(pb); /* selection time */ | |
| 730 get_be32(pb); /* selection duration */ | |
| 731 get_be32(pb); /* current time */ | |
| 732 get_be32(pb); /* next track ID */ | |
| 733 | |
| 734 return 0; | |
| 735 } | |
| 736 | |
| 4079 | 737 static int mov_read_smi(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 738 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
739 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
740 |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
741 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
742 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
743 st = c->fc->streams[c->fc->nb_streams-1]; |
| 1845 | 744 |
| 745 if((uint64_t)atom.size > (1<<30)) | |
| 746 return -1; | |
| 747 | |
| 748 // currently SVQ3 decoder expect full STSD header - so let's fake it | |
| 749 // this should be fixed and just SMI header should be passed | |
| 750 av_free(st->codec->extradata); | |
| 3076 | 751 st->codec->extradata = av_mallocz(atom.size + 0x5a + FF_INPUT_BUFFER_PADDING_SIZE); |
| 752 if (!st->codec->extradata) | |
| 753 return AVERROR(ENOMEM); | |
| 3077 | 754 st->codec->extradata_size = 0x5a + atom.size; |
| 755 memcpy(st->codec->extradata, "SVQ3", 4); // fake | |
| 756 get_buffer(pb, st->codec->extradata + 0x5a, atom.size); | |
| 757 dprintf(c->fc, "Reading SMI %"PRId64" %s\n", atom.size, st->codec->extradata + 0x5a); | |
| 1845 | 758 return 0; |
| 759 } | |
| 760 | |
| 4079 | 761 static int mov_read_enda(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 762 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
763 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
764 int little_endian; |
| 1845 | 765 |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
766 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
767 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
768 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
769 |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
770 little_endian = get_be16(pb); |
|
4184
bc40129f13cc
only set le if value is 1, fix boom5.mov, issue #770
bcoudurier
parents:
4123
diff
changeset
|
771 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
|
772 if (little_endian == 1) { |
| 1845 | 773 switch (st->codec->codec_id) { |
| 774 case CODEC_ID_PCM_S24BE: | |
| 775 st->codec->codec_id = CODEC_ID_PCM_S24LE; | |
| 776 break; | |
| 777 case CODEC_ID_PCM_S32BE: | |
| 778 st->codec->codec_id = CODEC_ID_PCM_S32LE; | |
| 779 break; | |
|
3738
0c46eb1cd9b3
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents:
3626
diff
changeset
|
780 case CODEC_ID_PCM_F32BE: |
|
0c46eb1cd9b3
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents:
3626
diff
changeset
|
781 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
|
782 break; |
|
0c46eb1cd9b3
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents:
3626
diff
changeset
|
783 case CODEC_ID_PCM_F64BE: |
|
0c46eb1cd9b3
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents:
3626
diff
changeset
|
784 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
|
785 break; |
| 1845 | 786 default: |
| 787 break; | |
| 788 } | |
| 789 } | |
| 790 return 0; | |
| 791 } | |
| 792 | |
| 793 /* FIXME modify qdm2/svq3/h264 decoders to take full atom as extradata */ | |
| 4079 | 794 static int mov_read_extradata(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 795 { |
|
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
|
796 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
|
797 uint64_t size; |
|
2589
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
798 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
|
799 |
|
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
|
800 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
|
801 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
|
802 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
|
803 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
|
804 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
|
805 return -1; |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
806 buf= av_realloc(st->codec->extradata, size); |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
807 if(!buf) |
| 1845 | 808 return -1; |
|
2589
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
809 st->codec->extradata= buf; |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
810 buf+= st->codec->extradata_size; |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
811 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
|
812 AV_WB32( buf , atom.size + 8); |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
813 AV_WL32( buf + 4, atom.type); |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
814 get_buffer(pb, buf + 8, atom.size); |
| 1845 | 815 return 0; |
| 816 } | |
| 817 | |
| 4079 | 818 static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 819 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
820 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
821 |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
822 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
823 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
824 st = c->fc->streams[c->fc->nb_streams-1]; |
| 1845 | 825 |
| 826 if((uint64_t)atom.size > (1<<30)) | |
| 827 return -1; | |
| 828 | |
| 829 if (st->codec->codec_id == CODEC_ID_QDM2) { | |
| 830 // pass all frma atom to codec, needed at least for QDM2 | |
| 831 av_free(st->codec->extradata); | |
| 3076 | 832 st->codec->extradata = av_mallocz(atom.size + FF_INPUT_BUFFER_PADDING_SIZE); |
| 833 if (!st->codec->extradata) | |
| 834 return AVERROR(ENOMEM); | |
| 1845 | 835 st->codec->extradata_size = atom.size; |
| 3076 | 836 get_buffer(pb, st->codec->extradata, atom.size); |
| 1845 | 837 } 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
|
838 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
|
839 return -1; |
| 1845 | 840 } else |
| 841 url_fskip(pb, atom.size); | |
| 842 return 0; | |
| 843 } | |
| 844 | |
|
2837
1caef0e2fb46
supports glbl atom containing generic extradata for all codecs
bcoudurier
parents:
2826
diff
changeset
|
845 /** |
|
1caef0e2fb46
supports glbl atom containing generic extradata for all codecs
bcoudurier
parents:
2826
diff
changeset
|
846 * 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
|
847 * nor size unlike mov_read_extradata. |
|
1caef0e2fb46
supports glbl atom containing generic extradata for all codecs
bcoudurier
parents:
2826
diff
changeset
|
848 */ |
| 4079 | 849 static int mov_read_glbl(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 850 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
851 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
852 |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
853 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
854 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
855 st = c->fc->streams[c->fc->nb_streams-1]; |
| 1845 | 856 |
| 857 if((uint64_t)atom.size > (1<<30)) | |
| 858 return -1; | |
| 859 | |
| 860 av_free(st->codec->extradata); | |
| 3076 | 861 st->codec->extradata = av_mallocz(atom.size + FF_INPUT_BUFFER_PADDING_SIZE); |
| 862 if (!st->codec->extradata) | |
| 863 return AVERROR(ENOMEM); | |
| 1845 | 864 st->codec->extradata_size = atom.size; |
| 3076 | 865 get_buffer(pb, st->codec->extradata, atom.size); |
| 1845 | 866 return 0; |
| 867 } | |
| 868 | |
| 5959 | 869 /** |
| 870 * An strf atom is a BITMAPINFOHEADER struct. This struct is 40 bytes itself, | |
| 871 * but can have extradata appended at the end after the 40 bytes belonging | |
| 872 * to the struct. | |
| 873 */ | |
| 874 static int mov_read_strf(MOVContext *c, ByteIOContext *pb, MOVAtom atom) | |
| 875 { | |
| 876 AVStream *st; | |
| 877 | |
| 878 if (c->fc->nb_streams < 1) | |
| 879 return 0; | |
| 880 if (atom.size <= 40) | |
| 881 return 0; | |
| 882 st = c->fc->streams[c->fc->nb_streams-1]; | |
| 883 | |
| 884 if((uint64_t)atom.size > (1<<30)) | |
| 885 return -1; | |
| 886 | |
| 887 av_free(st->codec->extradata); | |
| 888 st->codec->extradata = av_mallocz(atom.size - 40 + FF_INPUT_BUFFER_PADDING_SIZE); | |
| 889 if (!st->codec->extradata) | |
| 890 return AVERROR(ENOMEM); | |
| 891 st->codec->extradata_size = atom.size - 40; | |
| 892 url_fskip(pb, 40); | |
| 893 get_buffer(pb, st->codec->extradata, atom.size - 40); | |
| 894 return 0; | |
| 895 } | |
| 896 | |
| 4079 | 897 static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 898 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
899 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
900 MOVStreamContext *sc; |
| 1845 | 901 unsigned int i, entries; |
| 902 | |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
903 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
904 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
905 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
906 sc = st->priv_data; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
907 |
| 1845 | 908 get_byte(pb); /* version */ |
| 3145 | 909 get_be24(pb); /* flags */ |
| 1845 | 910 |
| 911 entries = get_be32(pb); | |
| 912 | |
| 913 if(entries >= UINT_MAX/sizeof(int64_t)) | |
| 914 return -1; | |
| 915 | |
| 916 sc->chunk_offsets = av_malloc(entries * sizeof(int64_t)); | |
| 917 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
|
918 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
|
919 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
|
920 |
| 3254 | 921 if (atom.type == MKTAG('s','t','c','o')) |
| 922 for(i=0; i<entries; i++) | |
| 1845 | 923 sc->chunk_offsets[i] = get_be32(pb); |
| 3254 | 924 else if (atom.type == MKTAG('c','o','6','4')) |
| 925 for(i=0; i<entries; i++) | |
| 1845 | 926 sc->chunk_offsets[i] = get_be64(pb); |
| 3254 | 927 else |
| 1845 | 928 return -1; |
| 929 | |
| 930 return 0; | |
| 931 } | |
| 932 | |
| 3625 | 933 /** |
| 934 * Compute codec id for 'lpcm' tag. | |
| 935 * See CoreAudioTypes and AudioStreamBasicDescription at Apple. | |
| 936 */ | |
| 5205 | 937 enum CodecID ff_mov_get_lpcm_codec_id(int bps, int flags) |
| 3625 | 938 { |
| 939 if (flags & 1) { // floating point | |
| 940 if (flags & 2) { // big endian | |
| 941 if (bps == 32) return CODEC_ID_PCM_F32BE; | |
| 3751 | 942 else if (bps == 64) return CODEC_ID_PCM_F64BE; |
| 3625 | 943 } else { |
| 3751 | 944 if (bps == 32) return CODEC_ID_PCM_F32LE; |
| 945 else if (bps == 64) return CODEC_ID_PCM_F64LE; | |
| 3625 | 946 } |
| 947 } else { | |
| 948 if (flags & 2) { | |
| 949 if (bps == 8) | |
| 950 // signed integer | |
| 951 if (flags & 4) return CODEC_ID_PCM_S8; | |
| 952 else return CODEC_ID_PCM_U8; | |
| 953 else if (bps == 16) return CODEC_ID_PCM_S16BE; | |
| 954 else if (bps == 24) return CODEC_ID_PCM_S24BE; | |
| 955 else if (bps == 32) return CODEC_ID_PCM_S32BE; | |
| 956 } else { | |
| 957 if (bps == 8) | |
| 958 if (flags & 4) return CODEC_ID_PCM_S8; | |
| 959 else return CODEC_ID_PCM_U8; | |
| 3626 | 960 else if (bps == 16) return CODEC_ID_PCM_S16LE; |
| 3625 | 961 else if (bps == 24) return CODEC_ID_PCM_S24LE; |
| 962 else if (bps == 32) return CODEC_ID_PCM_S32LE; | |
| 963 } | |
| 964 } | |
| 3967 | 965 return CODEC_ID_NONE; |
| 3625 | 966 } |
| 967 | |
| 4079 | 968 static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 969 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
970 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
971 MOVStreamContext *sc; |
| 3263 | 972 int j, entries, pseudo_stream_id; |
| 1845 | 973 |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
974 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
975 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
976 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
977 sc = st->priv_data; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
978 |
| 1845 | 979 get_byte(pb); /* version */ |
| 3145 | 980 get_be24(pb); /* flags */ |
| 1845 | 981 |
| 982 entries = get_be32(pb); | |
| 983 | |
| 3167 | 984 for(pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) { |
| 985 //Parsing Sample description table | |
| 1845 | 986 enum CodecID id; |
|
5002
dc92e7858140
broken stsd length might be < 16, fix elst-assert.mp4
bcoudurier
parents:
4992
diff
changeset
|
987 int dref_id = 1; |
|
6173
1b9079c05f9a
Improve mov atom parsing debug message, print parent atom and size in decimal
bcoudurier
parents:
6040
diff
changeset
|
988 MOVAtom a = { AV_RL32("stsd") }; |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3967
diff
changeset
|
989 int64_t start_pos = url_ftell(pb); |
| 1845 | 990 int size = get_be32(pb); /* size */ |
| 3263 | 991 uint32_t format = get_le32(pb); /* data format */ |
| 1845 | 992 |
|
5002
dc92e7858140
broken stsd length might be < 16, fix elst-assert.mp4
bcoudurier
parents:
4992
diff
changeset
|
993 if (size >= 16) { |
|
dc92e7858140
broken stsd length might be < 16, fix elst-assert.mp4
bcoudurier
parents:
4992
diff
changeset
|
994 get_be32(pb); /* reserved */ |
|
dc92e7858140
broken stsd length might be < 16, fix elst-assert.mp4
bcoudurier
parents:
4992
diff
changeset
|
995 get_be16(pb); /* reserved */ |
|
dc92e7858140
broken stsd length might be < 16, fix elst-assert.mp4
bcoudurier
parents:
4992
diff
changeset
|
996 dref_id = get_be16(pb); |
|
dc92e7858140
broken stsd length might be < 16, fix elst-assert.mp4
bcoudurier
parents:
4992
diff
changeset
|
997 } |
| 1845 | 998 |
|
3022
800db1ceafc6
Allow the user to select which codec out of several in stsd he wants.
michael
parents:
2974
diff
changeset
|
999 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
|
1000 st->codec->codec_tag != format && |
|
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5035
diff
changeset
|
1001 (c->fc->video_codec_id ? ff_codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id |
| 3253 | 1002 : 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
|
1003 ){ |
| 3135 | 1004 /* Multiple fourcc, we skip JPEG. This is not correct, we should |
| 1005 * export it as a separate AVStream but this needs a few changes | |
| 1006 * in the MOV demuxer, patch welcome. */ | |
| 3300 | 1007 av_log(c->fc, AV_LOG_WARNING, "multiple fourcc not supported\n"); |
| 1845 | 1008 url_fskip(pb, size - (url_ftell(pb) - start_pos)); |
| 1009 continue; | |
| 1010 } | |
|
3299
80a497804aa8
demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451
bcoudurier
parents:
3286
diff
changeset
|
1011 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
|
1012 sc->dref_id= dref_id; |
| 1845 | 1013 |
| 1014 st->codec->codec_tag = format; | |
|
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5035
diff
changeset
|
1015 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
|
1016 if (id<=0 && ((format&0xFFFF) == 'm'+('s'<<8) || (format&0xFFFF) == 'T'+('S'<<8))) |
| 6248 | 1017 id = ff_codec_get_id(ff_codec_wav_tags, av_bswap32(format)&0xFFFF); |
| 2298 | 1018 |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1019 if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO && id > 0) { |
|
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1020 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
|
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1021 } else if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO && /* do not overwrite codec type */ |
| 3253 | 1022 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
|
1023 id = ff_codec_get_id(codec_movvideo_tags, format); |
| 1845 | 1024 if (id <= 0) |
|
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5035
diff
changeset
|
1025 id = ff_codec_get_id(ff_codec_bmp_tags, format); |
| 1845 | 1026 if (id > 0) |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1027 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
|
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1028 else if(st->codec->codec_type == AVMEDIA_TYPE_DATA){ |
|
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5035
diff
changeset
|
1029 id = ff_codec_get_id(ff_codec_movsubtitle_tags, format); |
| 2969 | 1030 if(id > 0) |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1031 st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; |
| 2969 | 1032 } |
| 1845 | 1033 } |
| 1034 | |
| 2902 | 1035 dprintf(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n", size, |
| 1036 (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, | |
| 1037 (format >> 24) & 0xff, st->codec->codec_type); | |
| 1845 | 1038 |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1039 if(st->codec->codec_type==AVMEDIA_TYPE_VIDEO) { |
|
5790
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
1040 unsigned int color_depth, len; |
| 3263 | 1041 int color_greyscale; |
| 1042 | |
| 1845 | 1043 st->codec->codec_id = id; |
| 1044 get_be16(pb); /* version */ | |
| 1045 get_be16(pb); /* revision level */ | |
| 1046 get_be32(pb); /* vendor */ | |
| 1047 get_be32(pb); /* temporal quality */ | |
| 2730 | 1048 get_be32(pb); /* spatial quality */ |
| 1845 | 1049 |
| 1050 st->codec->width = get_be16(pb); /* width */ | |
| 1051 st->codec->height = get_be16(pb); /* height */ | |
| 1052 | |
| 1053 get_be32(pb); /* horiz resolution */ | |
| 1054 get_be32(pb); /* vert resolution */ | |
| 1055 get_be32(pb); /* data size, always 0 */ | |
| 3264 | 1056 get_be16(pb); /* frames per samples */ |
| 2044 | 1057 |
|
5790
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
1058 len = get_byte(pb); /* codec name, pascal string */ |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
1059 if (len > 31) |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
1060 len = 31; |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
1061 mov_read_mac_string(c, pb, len, st->codec->codec_name, 32); |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
1062 if (len < 31) |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
1063 url_fskip(pb, 31 - len); |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
1064 /* codec_tag YV12 triggers an UV swap in rawdec.c */ |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
1065 if (!memcmp(st->codec->codec_name, "Planar Y'CbCr 8-bit 4:2:0", 25)) |
|
dba191dda275
In mov demuxer, convert mac encoded strings to utf-8
bcoudurier
parents:
5788
diff
changeset
|
1066 st->codec->codec_tag=MKTAG('I', '4', '2', '0'); |
| 1845 | 1067 |
|
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 = get_be16(pb); /* depth */ |
| 1845 | 1069 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
|
1070 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
|
1071 st->codec->bits_per_coded_sample, st->codec->color_table_id); |
| 1845 | 1072 /* 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
|
1073 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
|
1074 color_greyscale = st->codec->bits_per_coded_sample & 0x20; |
| 1845 | 1075 |
| 1076 /* if the depth is 2, 4, or 8 bpp, file is palettized */ | |
| 1077 if ((color_depth == 2) || (color_depth == 4) || | |
| 1078 (color_depth == 8)) { | |
| 3257 | 1079 /* for palette traversal */ |
| 1080 unsigned int color_start, color_count, color_end; | |
| 1081 unsigned char r, g, b; | |
| 1082 | |
| 4719 | 1083 st->codec->palctrl = av_malloc(sizeof(*st->codec->palctrl)); |
| 1845 | 1084 if (color_greyscale) { |
| 3257 | 1085 int color_index, color_dec; |
| 1845 | 1086 /* compute the greyscale palette */ |
|
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3796
diff
changeset
|
1087 st->codec->bits_per_coded_sample = color_depth; |
| 1845 | 1088 color_count = 1 << color_depth; |
| 1089 color_index = 255; | |
| 1090 color_dec = 256 / (color_count - 1); | |
| 1091 for (j = 0; j < color_count; j++) { | |
| 1092 r = g = b = color_index; | |
| 4719 | 1093 st->codec->palctrl->palette[j] = |
| 1845 | 1094 (r << 16) | (g << 8) | (b); |
| 1095 color_index -= color_dec; | |
| 1096 if (color_index < 0) | |
| 1097 color_index = 0; | |
| 1098 } | |
|
3179
5f56b694f9bf
according to specs, only color table id set to 0, have it in stsd, fix 4colors.mov
bcoudurier
parents:
3178
diff
changeset
|
1099 } else if (st->codec->color_table_id) { |
| 3257 | 1100 const uint8_t *color_table; |
| 1845 | 1101 /* if flag bit 3 is set, use the default palette */ |
| 1102 color_count = 1 << color_depth; | |
| 1103 if (color_depth == 2) | |
| 1104 color_table = ff_qt_default_palette_4; | |
| 1105 else if (color_depth == 4) | |
| 1106 color_table = ff_qt_default_palette_16; | |
| 1107 else | |
| 1108 color_table = ff_qt_default_palette_256; | |
| 1109 | |
| 1110 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
|
1111 r = color_table[j * 3 + 0]; |
|
d5ae967cc549
Remove alpha channel from default colorspace tables, since it is unused. See
rbultje
parents:
4782
diff
changeset
|
1112 g = color_table[j * 3 + 1]; |
|
d5ae967cc549
Remove alpha channel from default colorspace tables, since it is unused. See
rbultje
parents:
4782
diff
changeset
|
1113 b = color_table[j * 3 + 2]; |
| 4719 | 1114 st->codec->palctrl->palette[j] = |
| 1845 | 1115 (r << 16) | (g << 8) | (b); |
| 1116 } | |
| 1117 } else { | |
| 1118 /* load the palette from the file */ | |
| 1119 color_start = get_be32(pb); | |
| 1120 color_count = get_be16(pb); | |
| 1121 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
|
1122 if ((color_start <= 255) && |
|
17086a526938
Check sanity in the palette loading operation. The addresses a potential security risk in
melanson
parents:
2807
diff
changeset
|
1123 (color_end <= 255)) { |
| 2810 | 1124 for (j = color_start; j <= color_end; j++) { |
| 1125 /* each R, G, or B component is 16 bits; | |
| 1126 * only use the top 8 bits; skip alpha bytes | |
| 1127 * up front */ | |
| 1128 get_byte(pb); | |
| 1129 get_byte(pb); | |
| 1130 r = get_byte(pb); | |
| 1131 get_byte(pb); | |
| 1132 g = get_byte(pb); | |
| 1133 get_byte(pb); | |
| 1134 b = get_byte(pb); | |
| 1135 get_byte(pb); | |
| 4719 | 1136 st->codec->palctrl->palette[j] = |
| 2810 | 1137 (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
|
1138 } |
| 1845 | 1139 } |
| 1140 } | |
| 1141 st->codec->palctrl->palette_changed = 1; | |
| 4719 | 1142 } |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1143 } else if(st->codec->codec_type==AVMEDIA_TYPE_AUDIO) { |
| 3622 | 1144 int bits_per_sample, flags; |
| 1845 | 1145 uint16_t version = get_be16(pb); |
| 1146 | |
| 1147 st->codec->codec_id = id; | |
| 1148 get_be16(pb); /* revision level */ | |
| 1149 get_be32(pb); /* vendor */ | |
| 1150 | |
| 1151 st->codec->channels = get_be16(pb); /* channel count */ | |
| 1907 | 1152 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
|
1153 st->codec->bits_per_coded_sample = get_be16(pb); /* sample size */ |
| 1845 | 1154 |
|
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
|
1155 sc->audio_cid = get_be16(pb); |
| 1845 | 1156 get_be16(pb); /* packet size = 0 */ |
| 1157 | |
| 1158 st->codec->sample_rate = ((get_be32(pb) >> 16)); | |
| 1159 | |
|
3619
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
1160 //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
|
1161 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
|
1162 if(!c->isom) { |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
1163 if(version==1) { |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
1164 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
|
1165 get_be32(pb); /* bytes per packet */ |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
1166 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
|
1167 get_be32(pb); /* bytes per sample */ |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
1168 } else if(version==2) { |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
1169 get_be32(pb); /* sizeof struct only */ |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
1170 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
|
1171 st->codec->channels = get_be32(pb); |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
1172 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
|
1173 st->codec->bits_per_coded_sample = get_be32(pb); /* bits per channel if sound is uncompressed */ |
| 5387 | 1174 flags = get_be32(pb); /* lpcm format specific flag */ |
| 3620 | 1175 sc->bytes_per_frame = get_be32(pb); /* bytes per audio packet if constant */ |
| 1176 sc->samples_per_frame = get_be32(pb); /* lpcm frames per audio packet if constant */ | |
| 3625 | 1177 if (format == MKTAG('l','p','c','m')) |
| 5205 | 1178 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
|
1179 } |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
1180 } |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
1181 |
| 1845 | 1182 switch (st->codec->codec_id) { |
| 1183 case CODEC_ID_PCM_S8: | |
| 1184 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
|
1185 if (st->codec->bits_per_coded_sample == 16) |
| 1845 | 1186 st->codec->codec_id = CODEC_ID_PCM_S16BE; |
| 1187 break; | |
| 1188 case CODEC_ID_PCM_S16LE: | |
| 1189 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
|
1190 if (st->codec->bits_per_coded_sample == 8) |
| 1845 | 1191 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
|
1192 else if (st->codec->bits_per_coded_sample == 24) |
|
3621
0415fc41780a
keep original codec/fourcc endianness, fix XDCAMHD.mov
bcoudurier
parents:
3620
diff
changeset
|
1193 st->codec->codec_id = |
|
0415fc41780a
keep original codec/fourcc endianness, fix XDCAMHD.mov
bcoudurier
parents:
3620
diff
changeset
|
1194 st->codec->codec_id == CODEC_ID_PCM_S16BE ? |
|
0415fc41780a
keep original codec/fourcc endianness, fix XDCAMHD.mov
bcoudurier
parents:
3620
diff
changeset
|
1195 CODEC_ID_PCM_S24BE : CODEC_ID_PCM_S24LE; |
| 1845 | 1196 break; |
|
3036
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
1197 /* 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
|
1198 case CODEC_ID_MACE3: |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
1199 sc->samples_per_frame = 6; |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
1200 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
|
1201 break; |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
1202 case CODEC_ID_MACE6: |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
1203 sc->samples_per_frame = 6; |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
1204 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
|
1205 break; |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
1206 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
|
1207 sc->samples_per_frame = 64; |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
1208 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
|
1209 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
|
1210 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
|
1211 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
|
1212 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
|
1213 break; |
| 1845 | 1214 default: |
| 1215 break; | |
| 1216 } | |
| 1217 | |
| 1218 bits_per_sample = av_get_bits_per_sample(st->codec->codec_id); | |
| 1219 if (bits_per_sample) { | |
|
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3796
diff
changeset
|
1220 st->codec->bits_per_coded_sample = bits_per_sample; |
| 1845 | 1221 sc->sample_size = (bits_per_sample >> 3) * st->codec->channels; |
| 1222 } | |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1223 } else if(st->codec->codec_type==AVMEDIA_TYPE_SUBTITLE){ |
|
4192
a48a6a414dfe
Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text
conrad
parents:
4184
diff
changeset
|
1224 // ttxt stsd contains display flags, justification, background |
|
a48a6a414dfe
Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text
conrad
parents:
4184
diff
changeset
|
1225 // 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
|
1226 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
|
1227 if (format != AV_RL32("mp4s")) // mp4s contains a regular esds atom |
| 4807 | 1228 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
|
1229 st->codec->codec_id= id; |
| 4202 | 1230 st->codec->width = sc->width; |
| 1231 st->codec->height = sc->height; | |
| 1845 | 1232 } else { |
| 1233 /* other codec type, just skip (rtp, mp4s, tmcd ...) */ | |
| 1234 url_fskip(pb, size - (url_ftell(pb) - start_pos)); | |
| 1235 } | |
| 1236 /* this will read extra atoms at the end (wave, alac, damr, avcC, SMI ...) */ | |
| 1237 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
|
1238 if (a.size > 8) { |
|
1ce39cda4a59
check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents:
2794
diff
changeset
|
1239 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
|
1240 return -1; |
|
1ce39cda4a59
check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents:
2794
diff
changeset
|
1241 } else if (a.size > 0) |
| 1845 | 1242 url_fskip(pb, a.size); |
| 1243 } | |
| 1244 | |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1245 if(st->codec->codec_type==AVMEDIA_TYPE_AUDIO && st->codec->sample_rate==0 && sc->time_scale>1) |
| 1845 | 1246 st->codec->sample_rate= sc->time_scale; |
| 1247 | |
| 1248 /* special codec parameters handling */ | |
| 1249 switch (st->codec->codec_id) { | |
| 4206 | 1250 #if CONFIG_DV_DEMUXER |
| 1845 | 1251 case CODEC_ID_DVAUDIO: |
|
4406
146d6083662b
Replace the calls to the deprecated av_alloc_format_context() with
stefano
parents:
4399
diff
changeset
|
1252 c->dv_fctx = avformat_alloc_context(); |
| 1845 | 1253 c->dv_demux = dv_init_demux(c->dv_fctx); |
| 1254 if (!c->dv_demux) { | |
| 1255 av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n"); | |
| 1256 return -1; | |
| 1257 } | |
| 1258 sc->dv_audio_container = 1; | |
| 1259 st->codec->codec_id = CODEC_ID_PCM_S16LE; | |
| 1260 break; | |
| 1261 #endif | |
| 1262 /* 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
|
1263 case CODEC_ID_QCELP: |
|
4835
ac71e186e2fe
force sample for qcelp when not stored in mov, fix #968
bcoudurier
parents:
4807
diff
changeset
|
1264 // 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
|
1265 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
|
1266 st->codec->sample_rate = 8000; |
|
4056
a6a5fe159af7
Commit last ok'ed parts of QCELP decoder and enable it.
vitor
parents:
4054
diff
changeset
|
1267 st->codec->frame_size= 160; |
| 4054 | 1268 st->codec->channels= 1; /* really needed */ |
|
4056
a6a5fe159af7
Commit last ok'ed parts of QCELP decoder and enable it.
vitor
parents:
4054
diff
changeset
|
1269 break; |
|
3256
b09eff5b0e89
parser should not be needed anymore, merge cases and set frame size for amr too
bcoudurier
parents:
3255
diff
changeset
|
1270 case CODEC_ID_AMR_NB: |
| 3933 | 1271 case CODEC_ID_AMR_WB: |
| 3258 | 1272 st->codec->frame_size= sc->samples_per_frame; |
| 1845 | 1273 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
|
1274 /* force sample rate for amr, stsd in 3gp does not store sample rate */ |
| 3989 | 1275 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
|
1276 st->codec->sample_rate = 8000; |
| 3989 | 1277 else if (st->codec->codec_id == CODEC_ID_AMR_WB) |
| 1278 st->codec->sample_rate = 16000; | |
| 1845 | 1279 break; |
| 1280 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
|
1281 case CODEC_ID_MP3: |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1282 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; /* force type after stsd for m1a hdlr */ |
| 2023 | 1283 st->need_parsing = AVSTREAM_PARSE_FULL; |
| 1845 | 1284 break; |
| 3187 | 1285 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
|
1286 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
|
1287 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
|
1288 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
|
1289 break; |
| 3242 | 1290 case CODEC_ID_ALAC: |
|
4122
30262468fff4
set alac channels from extradata, fix alac mono in m4a
bcoudurier
parents:
4116
diff
changeset
|
1291 if (st->codec->extradata_size == 36) { |
|
4123
e536841c1aeb
cosmetics, remove useless parenthesis and whitespaces
bcoudurier
parents:
4122
diff
changeset
|
1292 st->codec->frame_size = AV_RB32(st->codec->extradata+12); |
|
e536841c1aeb
cosmetics, remove useless parenthesis and whitespaces
bcoudurier
parents:
4122
diff
changeset
|
1293 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
|
1294 } |
| 3242 | 1295 break; |
| 1845 | 1296 default: |
| 1297 break; | |
| 1298 } | |
| 1299 | |
| 1300 return 0; | |
| 1301 } | |
| 1302 | |
| 4079 | 1303 static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1304 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1305 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1306 MOVStreamContext *sc; |
| 1845 | 1307 unsigned int i, entries; |
| 1308 | |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1309 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1310 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1311 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1312 sc = st->priv_data; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1313 |
| 1845 | 1314 get_byte(pb); /* version */ |
| 3145 | 1315 get_be24(pb); /* flags */ |
| 1845 | 1316 |
| 1317 entries = get_be32(pb); | |
| 1318 | |
| 2044 | 1319 dprintf(c->fc, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1, entries); |
| 1320 | |
|
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
|
1321 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
|
1322 return -1; |
| 4412 | 1323 sc->stsc_data = av_malloc(entries * sizeof(*sc->stsc_data)); |
| 1324 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
|
1325 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
|
1326 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
|
1327 |
| 1845 | 1328 for(i=0; i<entries; i++) { |
| 4412 | 1329 sc->stsc_data[i].first = get_be32(pb); |
| 1330 sc->stsc_data[i].count = get_be32(pb); | |
| 1331 sc->stsc_data[i].id = get_be32(pb); | |
| 1845 | 1332 } |
| 1333 return 0; | |
| 1334 } | |
| 1335 | |
|
4933
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1336 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
|
1337 { |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1338 AVStream *st; |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1339 MOVStreamContext *sc; |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1340 unsigned i, entries; |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1341 |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1342 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
|
1343 return 0; |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1344 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
|
1345 sc = st->priv_data; |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1346 |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1347 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
|
1348 |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1349 entries = get_be32(pb); |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1350 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
|
1351 return -1; |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1352 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
|
1353 if (!sc->stps_data) |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1354 return AVERROR(ENOMEM); |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1355 sc->stps_count = entries; |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1356 |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1357 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
|
1358 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
|
1359 //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
|
1360 } |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1361 |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1362 return 0; |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1363 } |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1364 |
| 4079 | 1365 static int mov_read_stss(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1366 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1367 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1368 MOVStreamContext *sc; |
| 1845 | 1369 unsigned int i, entries; |
| 1370 | |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1371 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1372 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1373 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1374 sc = st->priv_data; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1375 |
| 1845 | 1376 get_byte(pb); /* version */ |
| 3145 | 1377 get_be24(pb); /* flags */ |
| 1845 | 1378 |
| 1379 entries = get_be32(pb); | |
| 1380 | |
|
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
|
1381 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
|
1382 |
| 2030 | 1383 if(entries >= UINT_MAX / sizeof(int)) |
| 1845 | 1384 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
|
1385 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
|
1386 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
|
1387 return AVERROR(ENOMEM); |
| 1845 | 1388 sc->keyframe_count = entries; |
| 2044 | 1389 |
| 1845 | 1390 for(i=0; i<entries; i++) { |
| 1391 sc->keyframes[i] = get_be32(pb); | |
| 2044 | 1392 //dprintf(c->fc, "keyframes[]=%d\n", sc->keyframes[i]); |
| 1845 | 1393 } |
| 1394 return 0; | |
| 1395 } | |
| 1396 | |
| 4079 | 1397 static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1398 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1399 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1400 MOVStreamContext *sc; |
| 4739 | 1401 unsigned int i, entries, sample_size, field_size, num_bytes; |
| 1402 GetBitContext gb; | |
| 1403 unsigned char* buf; | |
| 1845 | 1404 |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1405 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1406 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1407 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1408 sc = st->priv_data; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1409 |
| 1845 | 1410 get_byte(pb); /* version */ |
| 3145 | 1411 get_be24(pb); /* flags */ |
| 1845 | 1412 |
| 4739 | 1413 if (atom.type == MKTAG('s','t','s','z')) { |
| 4740 | 1414 sample_size = get_be32(pb); |
| 1415 if (!sc->sample_size) /* do not overwrite value computed in stsd */ | |
| 1416 sc->sample_size = sample_size; | |
| 1417 field_size = 32; | |
| 4739 | 1418 } else { |
| 1419 sample_size = 0; | |
| 1420 get_be24(pb); /* reserved */ | |
| 1421 field_size = get_byte(pb); | |
| 1422 } | |
| 1845 | 1423 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
|
1424 |
|
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
|
1425 dprintf(c->fc, "sample_size = %d sample_count = %d\n", sc->sample_size, entries); |
| 1845 | 1426 |
| 1427 sc->sample_count = entries; | |
| 1428 if (sample_size) | |
| 1429 return 0; | |
| 1430 | |
| 4739 | 1431 if (field_size != 4 && field_size != 8 && field_size != 16 && field_size != 32) { |
| 1432 av_log(c->fc, AV_LOG_ERROR, "Invalid sample field size %d\n", field_size); | |
| 1433 return -1; | |
| 1434 } | |
| 1435 | |
|
5165
3d4203b9c2d7
check entries against field_size, potential malloc overflow in read_stsz, fix #1357
bcoudurier
parents:
5164
diff
changeset
|
1436 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
|
1437 return -1; |
| 2030 | 1438 sc->sample_sizes = av_malloc(entries * sizeof(int)); |
| 1845 | 1439 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
|
1440 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
|
1441 |
| 4739 | 1442 num_bytes = (entries*field_size+4)>>3; |
| 1443 | |
|
4782
400ca65902d2
since code now use get_bits_long, allocate padding buffer
bcoudurier
parents:
4780
diff
changeset
|
1444 buf = av_malloc(num_bytes+FF_INPUT_BUFFER_PADDING_SIZE); |
| 4739 | 1445 if (!buf) { |
| 1446 av_freep(&sc->sample_sizes); | |
| 1447 return AVERROR(ENOMEM); | |
| 1448 } | |
| 1449 | |
| 1450 if (get_buffer(pb, buf, num_bytes) < num_bytes) { | |
| 1451 av_freep(&sc->sample_sizes); | |
| 1452 av_free(buf); | |
| 1453 return -1; | |
| 1454 } | |
| 1455 | |
| 1456 init_get_bits(&gb, buf, 8*num_bytes); | |
| 1457 | |
|
3156
487b1979f195
remove useless debug print since now mov_build_index will do
bcoudurier
parents:
3155
diff
changeset
|
1458 for(i=0; i<entries; i++) |
| 4739 | 1459 sc->sample_sizes[i] = get_bits_long(&gb, field_size); |
| 1460 | |
| 1461 av_free(buf); | |
| 1845 | 1462 return 0; |
| 1463 } | |
| 1464 | |
| 4079 | 1465 static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1466 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1467 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1468 MOVStreamContext *sc; |
| 1845 | 1469 unsigned int i, entries; |
| 1470 int64_t duration=0; | |
| 1471 int64_t total_sample_count=0; | |
| 1472 | |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1473 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1474 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1475 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1476 sc = st->priv_data; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1477 |
| 1845 | 1478 get_byte(pb); /* version */ |
| 3145 | 1479 get_be24(pb); /* flags */ |
| 1845 | 1480 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
|
1481 |
|
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
|
1482 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
|
1483 |
| 4079 | 1484 if(entries >= UINT_MAX / sizeof(*sc->stts_data)) |
| 1845 | 1485 return -1; |
| 4079 | 1486 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
|
1487 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
|
1488 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
|
1489 sc->stts_count = entries; |
| 1845 | 1490 |
| 1491 for(i=0; i<entries; i++) { | |
| 1492 int sample_duration; | |
| 1493 int sample_count; | |
| 1494 | |
| 1495 sample_count=get_be32(pb); | |
| 1496 sample_duration = get_be32(pb); | |
| 1497 sc->stts_data[i].count= sample_count; | |
| 1498 sc->stts_data[i].duration= sample_duration; | |
| 1499 | |
| 1907 | 1500 dprintf(c->fc, "sample_count=%d, sample_duration=%d\n",sample_count,sample_duration); |
| 1845 | 1501 |
| 1502 duration+=(int64_t)sample_duration*sample_count; | |
| 1503 total_sample_count+=sample_count; | |
| 1504 } | |
| 1505 | |
| 1506 st->nb_frames= total_sample_count; | |
| 1507 if(duration) | |
| 1508 st->duration= duration; | |
| 1509 return 0; | |
| 1510 } | |
| 1511 | |
| 4079 | 1512 static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1513 { |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1514 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1515 MOVStreamContext *sc; |
| 1845 | 1516 unsigned int i, entries; |
| 1517 | |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1518 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1519 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1520 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1521 sc = st->priv_data; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1522 |
| 1845 | 1523 get_byte(pb); /* version */ |
| 3145 | 1524 get_be24(pb); /* flags */ |
| 1845 | 1525 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
|
1526 |
|
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
|
1527 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
|
1528 |
| 4079 | 1529 if(entries >= UINT_MAX / sizeof(*sc->ctts_data)) |
| 1845 | 1530 return -1; |
| 4079 | 1531 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
|
1532 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
|
1533 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
|
1534 sc->ctts_count = entries; |
| 1845 | 1535 |
| 1536 for(i=0; i<entries; i++) { | |
| 1537 int count =get_be32(pb); | |
| 1538 int duration =get_be32(pb); | |
| 1539 | |
| 1540 sc->ctts_data[i].count = count; | |
| 1541 sc->ctts_data[i].duration= duration; | |
|
5347
f09a07cad10b
compute dts shift with ctts value, cslg atom might be missing, fix #419
bcoudurier
parents:
5346
diff
changeset
|
1542 if (duration < 0) |
|
f09a07cad10b
compute dts shift with ctts value, cslg atom might be missing, fix #419
bcoudurier
parents:
5346
diff
changeset
|
1543 sc->dts_shift = FFMAX(sc->dts_shift, -duration); |
| 1845 | 1544 } |
|
5347
f09a07cad10b
compute dts shift with ctts value, cslg atom might be missing, fix #419
bcoudurier
parents:
5346
diff
changeset
|
1545 |
| 5351 | 1546 dprintf(c->fc, "dts shift %d\n", sc->dts_shift); |
|
5347
f09a07cad10b
compute dts shift with ctts value, cslg atom might be missing, fix #419
bcoudurier
parents:
5346
diff
changeset
|
1547 |
| 1845 | 1548 return 0; |
| 1549 } | |
| 1550 | |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1551 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
|
1552 { |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1553 MOVStreamContext *sc = st->priv_data; |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3967
diff
changeset
|
1554 int64_t current_offset; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1555 int64_t current_dts = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1556 unsigned int stts_index = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1557 unsigned int stsc_index = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1558 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
|
1559 unsigned int stps_index = 0; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1560 unsigned int i, j; |
|
5332
ff45ef768724
compute codec bitrate in mov demuxer, patch by haim alon, haim dot alter at gmail dot com
bcoudurier
parents:
5242
diff
changeset
|
1561 uint64_t stream_size = 0; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1562 |
|
4399
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
1563 /* 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
|
1564 if (sc->time_offset) { |
|
4742
0496cbd94374
Extend mov edit list support to work for a first padding entry with
reimar
parents:
4740
diff
changeset
|
1565 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
|
1566 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
|
1567 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
|
1568 /* 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
|
1569 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
|
1570 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
|
1571 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
|
1572 } |
|
4399
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
1573 } |
|
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
1574 |
|
3178
73b7ef886091
Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
bcoudurier
parents:
3175
diff
changeset
|
1575 /* only use old uncompressed audio chunk demuxing when stts specifies it */ |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1576 if (!(st->codec->codec_type == AVMEDIA_TYPE_AUDIO && |
|
3178
73b7ef886091
Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
bcoudurier
parents:
3175
diff
changeset
|
1577 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
|
1578 unsigned int current_sample = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1579 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
|
1580 unsigned int sample_size; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1581 unsigned int distance = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1582 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
|
1583 |
|
4930
1f151bcb0b27
Parse 'cslg' atom to retrieve dts shift when 'ctts' duration is negative.
bcoudurier
parents:
4890
diff
changeset
|
1584 current_dts -= sc->dts_shift; |
|
1f151bcb0b27
Parse 'cslg' atom to retrieve dts shift when 'ctts' duration is negative.
bcoudurier
parents:
4890
diff
changeset
|
1585 |
|
5788
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1586 if (sc->sample_count >= UINT_MAX / sizeof(*st->index_entries)) |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1587 return; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1588 st->index_entries = av_malloc(sc->sample_count*sizeof(*st->index_entries)); |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1589 if (!st->index_entries) |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1590 return; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1591 st->index_entries_allocated_size = sc->sample_count*sizeof(*st->index_entries); |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1592 |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1593 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
|
1594 current_offset = sc->chunk_offsets[i]; |
| 4412 | 1595 if (stsc_index + 1 < sc->stsc_count && |
| 1596 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
|
1597 stsc_index++; |
| 4412 | 1598 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
|
1599 int keyframe = 0; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1600 if (current_sample >= sc->sample_count) { |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1601 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
|
1602 return; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1603 } |
|
4933
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1604 |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1605 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
|
1606 keyframe = 1; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1607 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
|
1608 stss_index++; |
|
4933
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1609 } 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
|
1610 keyframe = 1; |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1611 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
|
1612 stps_index++; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1613 } |
|
4933
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1614 if (keyframe) |
|
fc6288f47467
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
bcoudurier
parents:
4931
diff
changeset
|
1615 distance = 0; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1616 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
|
1617 if(sc->pseudo_stream_id == -1 || |
| 4412 | 1618 sc->stsc_data[stsc_index].id - 1 == sc->pseudo_stream_id) { |
|
5788
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1619 AVIndexEntry *e = &st->index_entries[st->nb_index_entries++]; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1620 e->pos = current_offset; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1621 e->timestamp = current_dts; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1622 e->size = sample_size; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1623 e->min_distance = distance; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1624 e->flags = keyframe ? AVINDEX_KEYFRAME : 0; |
|
3301
11b6da5ffe78
only print debug info when sample is actually added
bcoudurier
parents:
3300
diff
changeset
|
1625 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
|
1626 "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
|
1627 current_offset, current_dts, sample_size, distance, keyframe); |
|
11b6da5ffe78
only print debug info when sample is actually added
bcoudurier
parents:
3300
diff
changeset
|
1628 } |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1629 |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1630 current_offset += sample_size; |
|
5332
ff45ef768724
compute codec bitrate in mov demuxer, patch by haim alon, haim dot alter at gmail dot com
bcoudurier
parents:
5242
diff
changeset
|
1631 stream_size += sample_size; |
|
5015
7b260f4d453d
Remove time_rate, we cannot compute exactly when fragments are
bcoudurier
parents:
5002
diff
changeset
|
1632 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
|
1633 distance++; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1634 stts_sample++; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1635 current_sample++; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1636 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
|
1637 stts_sample = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1638 stts_index++; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1639 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1640 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1641 } |
| 5346 | 1642 if (st->duration > 0) |
| 1643 st->codec->bit_rate = stream_size*8*sc->time_scale/st->duration; | |
| 4992 | 1644 } else { |
|
5788
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1645 unsigned chunk_samples, total = 0; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1646 |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1647 // compute total chunk count |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1648 for (i = 0; i < sc->stsc_count; i++) { |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1649 unsigned count, chunk_count; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1650 |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1651 chunk_samples = sc->stsc_data[i].count; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1652 if (sc->samples_per_frame && chunk_samples % sc->samples_per_frame) { |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1653 av_log(mov->fc, AV_LOG_ERROR, "error unaligned chunk\n"); |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1654 return; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1655 } |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1656 |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1657 if (sc->samples_per_frame >= 160) { // gsm |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1658 count = chunk_samples / sc->samples_per_frame; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1659 } else if (sc->samples_per_frame > 1) { |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1660 unsigned samples = (1024/sc->samples_per_frame)*sc->samples_per_frame; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1661 count = (chunk_samples+samples-1) / samples; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1662 } else { |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1663 count = (chunk_samples+1023) / 1024; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1664 } |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1665 |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1666 if (i < sc->stsc_count - 1) |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1667 chunk_count = sc->stsc_data[i+1].first - sc->stsc_data[i].first; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1668 else |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1669 chunk_count = sc->chunk_count - (sc->stsc_data[i].first - 1); |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1670 total += chunk_count * count; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1671 } |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1672 |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1673 dprintf(mov->fc, "chunk count %d\n", total); |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1674 if (total >= UINT_MAX / sizeof(*st->index_entries)) |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1675 return; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1676 st->index_entries = av_malloc(total*sizeof(*st->index_entries)); |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1677 if (!st->index_entries) |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1678 return; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1679 st->index_entries_allocated_size = total*sizeof(*st->index_entries); |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1680 |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1681 // populate index |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1682 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
|
1683 current_offset = sc->chunk_offsets[i]; |
| 4412 | 1684 if (stsc_index + 1 < sc->stsc_count && |
| 1685 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
|
1686 stsc_index++; |
| 4412 | 1687 chunk_samples = sc->stsc_data[stsc_index].count; |
| 4992 | 1688 |
| 1689 while (chunk_samples > 0) { | |
|
5788
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1690 AVIndexEntry *e; |
| 4992 | 1691 unsigned size, samples; |
| 1692 | |
| 1693 if (sc->samples_per_frame >= 160) { // gsm | |
| 1694 samples = sc->samples_per_frame; | |
| 1695 size = sc->bytes_per_frame; | |
| 1696 } else { | |
| 1697 if (sc->samples_per_frame > 1) { | |
| 1698 samples = FFMIN((1024 / sc->samples_per_frame)* | |
| 1699 sc->samples_per_frame, chunk_samples); | |
| 1700 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
|
1701 } else { |
| 4992 | 1702 samples = FFMIN(1024, chunk_samples); |
| 1703 size = samples * sc->sample_size; | |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1704 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1705 } |
| 4992 | 1706 |
|
5788
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1707 if (st->nb_index_entries >= total) { |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1708 av_log(mov->fc, AV_LOG_ERROR, "wrong chunk count %d\n", total); |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1709 return; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1710 } |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1711 e = &st->index_entries[st->nb_index_entries++]; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1712 e->pos = current_offset; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1713 e->timestamp = current_dts; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1714 e->size = size; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1715 e->min_distance = 0; |
|
8539cb618ae7
Preallocate index entries in mov demuxer, huge speedup
bcoudurier
parents:
5723
diff
changeset
|
1716 e->flags = AVINDEX_KEYFRAME; |
| 3167 | 1717 dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", " |
| 1718 "size %d, duration %d\n", st->index, i, current_offset, current_dts, | |
| 4992 | 1719 size, samples); |
| 1720 | |
| 1721 current_offset += size; | |
|
5015
7b260f4d453d
Remove time_rate, we cannot compute exactly when fragments are
bcoudurier
parents:
5002
diff
changeset
|
1722 current_dts += samples; |
| 4992 | 1723 chunk_samples -= samples; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1724 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1725 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1726 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1727 } |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1728 |
|
5369
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1729 static int mov_open_dref(ByteIOContext **pb, char *src, MOVDref *ref) |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1730 { |
|
5683
7dab04a73364
Do not attempt to open references through absolute pathes.
michael
parents:
5618
diff
changeset
|
1731 /* try relative path, we do not try the absolute because it can leak information about our |
|
7dab04a73364
Do not attempt to open references through absolute pathes.
michael
parents:
5618
diff
changeset
|
1732 system to an attacker */ |
|
5369
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1733 if (ref->nlvl_to > 0 && ref->nlvl_from > 0) { |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1734 char filename[1024]; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1735 char *src_path; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1736 int i, l; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1737 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1738 /* find a source dir */ |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1739 src_path = strrchr(src, '/'); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1740 if (src_path) |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1741 src_path++; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1742 else |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1743 src_path = src; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1744 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1745 /* find a next level down to target */ |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1746 for (i = 0, l = strlen(ref->path) - 1; l >= 0; l--) |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1747 if (ref->path[l] == '/') { |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1748 if (i == ref->nlvl_to - 1) |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1749 break; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1750 else |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1751 i++; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1752 } |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1753 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1754 /* compose filename if next level down to target was found */ |
|
5684
9a3b8d7062d2
Make sure we dont write more bytes into filename than the array is long.
michael
parents:
5683
diff
changeset
|
1755 if (i == ref->nlvl_to - 1 && src_path - src < sizeof(filename)) { |
|
5369
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1756 memcpy(filename, src, src_path - src); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1757 filename[src_path - src] = 0; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1758 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1759 for (i = 1; i < ref->nlvl_from; i++) |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1760 av_strlcat(filename, "../", 1024); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1761 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1762 av_strlcat(filename, ref->path + l + 1, 1024); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1763 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1764 if (!url_fopen(pb, filename, URL_RDONLY)) |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1765 return 0; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1766 } |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1767 } |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1768 |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1769 return AVERROR(ENOENT); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1770 }; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1771 |
| 4079 | 1772 static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1773 { |
| 1774 AVStream *st; | |
| 1775 MOVStreamContext *sc; | |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1776 int ret; |
| 1845 | 1777 |
| 1778 st = av_new_stream(c->fc, c->fc->nb_streams); | |
| 3162 | 1779 if (!st) return AVERROR(ENOMEM); |
| 1845 | 1780 sc = av_mallocz(sizeof(MOVStreamContext)); |
|
3161
60be75aa8c47
cannot free AVStream like this, and return ENOMEM
bcoudurier
parents:
3160
diff
changeset
|
1781 if (!sc) return AVERROR(ENOMEM); |
| 1845 | 1782 |
| 1783 st->priv_data = sc; | |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1784 st->codec->codec_type = AVMEDIA_TYPE_DATA; |
|
4197
84251a788a67
move ffindex set before mov_read_default so it can be used in functions
bcoudurier
parents:
4192
diff
changeset
|
1785 sc->ffindex = st->index; |
| 1845 | 1786 |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1787 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
|
1788 return ret; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1789 |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1790 /* sanity checks */ |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1791 if (sc->chunk_count && (!sc->stts_count || !sc->stsc_count || |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1792 (!sc->sample_size && !sc->sample_count))) { |
| 3180 | 1793 av_log(c->fc, AV_LOG_ERROR, "stream %d, missing mandatory atoms, broken header\n", |
| 1794 st->index); | |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1795 return 0; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1796 } |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1797 |
|
5345
4f2be9042fd6
warn if stream timescale is not set and set it to 1 to avoid FPE
bcoudurier
parents:
5342
diff
changeset
|
1798 if (!sc->time_scale) { |
|
4f2be9042fd6
warn if stream timescale is not set and set it to 1 to avoid FPE
bcoudurier
parents:
5342
diff
changeset
|
1799 av_log(c->fc, AV_LOG_WARNING, "stream %d, timescale not set\n", st->index); |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1800 sc->time_scale = c->time_scale; |
|
5345
4f2be9042fd6
warn if stream timescale is not set and set it to 1 to avoid FPE
bcoudurier
parents:
5342
diff
changeset
|
1801 if (!sc->time_scale) |
|
4f2be9042fd6
warn if stream timescale is not set and set it to 1 to avoid FPE
bcoudurier
parents:
5342
diff
changeset
|
1802 sc->time_scale = 1; |
|
4f2be9042fd6
warn if stream timescale is not set and set it to 1 to avoid FPE
bcoudurier
parents:
5342
diff
changeset
|
1803 } |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1804 |
|
5015
7b260f4d453d
Remove time_rate, we cannot compute exactly when fragments are
bcoudurier
parents:
5002
diff
changeset
|
1805 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
|
1806 |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1807 if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && |
|
4454
7d1460900c59
fix frame size, time rate is not stts duration anymore with time offset
bcoudurier
parents:
4453
diff
changeset
|
1808 !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
|
1809 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
|
1810 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
|
1811 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
|
1812 } |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1813 |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1814 mov_build_index(c, st); |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1815 |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1816 if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) { |
|
5369
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1817 MOVDref *dref = &sc->drefs[sc->dref_id - 1]; |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1818 if (mov_open_dref(&sc->pb, c->fc->filename, dref) < 0) |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1819 av_log(c->fc, AV_LOG_ERROR, |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1820 "stream %d, error opening alias: path='%s', dir='%s', " |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1821 "filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n", |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1822 st->index, dref->path, dref->dir, dref->filename, |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
1823 dref->volume, dref->nlvl_from, dref->nlvl_to); |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1824 } else |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1825 sc->pb = c->fc->pb; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1826 |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
1827 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { |
|
6211
6f6ecca6904a
In mov demuxer, only set sar if not already set, patch by Andrew Wason,
bcoudurier
parents:
6210
diff
changeset
|
1828 if (!st->sample_aspect_ratio.num && |
|
6f6ecca6904a
In mov demuxer, only set sar if not already set, patch by Andrew Wason,
bcoudurier
parents:
6210
diff
changeset
|
1829 (st->codec->width != sc->width || st->codec->height != sc->height)) { |
|
6f6ecca6904a
In mov demuxer, only set sar if not already set, patch by Andrew Wason,
bcoudurier
parents:
6210
diff
changeset
|
1830 st->sample_aspect_ratio = av_d2q(((double)st->codec->height * sc->width) / |
|
6f6ecca6904a
In mov demuxer, only set sar if not already set, patch by Andrew Wason,
bcoudurier
parents:
6210
diff
changeset
|
1831 ((double)st->codec->width * sc->height), INT_MAX); |
| 5562 | 1832 } |
| 1833 | |
| 1834 av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, | |
| 1835 sc->time_scale*st->nb_frames, st->duration, INT_MAX); | |
|
5561
067c0af56a4c
move aspect ratio code at the end of the track parsing, fix cathedral-beta2-400extra-crop-avc.mp4
bcoudurier
parents:
5546
diff
changeset
|
1836 } |
|
067c0af56a4c
move aspect ratio code at the end of the track parsing, fix cathedral-beta2-400extra-crop-avc.mp4
bcoudurier
parents:
5546
diff
changeset
|
1837 |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1838 switch (st->codec->codec_id) { |
| 4206 | 1839 #if CONFIG_H261_DECODER |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1840 case CODEC_ID_H261: |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1841 #endif |
| 4206 | 1842 #if CONFIG_H263_DECODER |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1843 case CODEC_ID_H263: |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1844 #endif |
|
4780
75d9edccd39c
reset codec width/height for h264 forcing decoder to parse extradata
bcoudurier
parents:
4749
diff
changeset
|
1845 #if CONFIG_H264_DECODER |
|
75d9edccd39c
reset codec width/height for h264 forcing decoder to parse extradata
bcoudurier
parents:
4749
diff
changeset
|
1846 case CODEC_ID_H264: |
|
75d9edccd39c
reset codec width/height for h264 forcing decoder to parse extradata
bcoudurier
parents:
4749
diff
changeset
|
1847 #endif |
| 4206 | 1848 #if CONFIG_MPEG4_DECODER |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1849 case CODEC_ID_MPEG4: |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1850 #endif |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1851 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
|
1852 st->codec->height= 0; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1853 break; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1854 } |
| 3155 | 1855 |
| 1856 /* Do not need those anymore. */ | |
| 1857 av_freep(&sc->chunk_offsets); | |
| 4412 | 1858 av_freep(&sc->stsc_data); |
| 3155 | 1859 av_freep(&sc->sample_sizes); |
| 1860 av_freep(&sc->keyframes); | |
| 1861 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
|
1862 av_freep(&sc->stps_data); |
| 3155 | 1863 |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1864 return 0; |
| 1845 | 1865 } |
| 1866 | |
| 4079 | 1867 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
|
1868 { |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1869 int ret; |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1870 c->itunes_metadata = 1; |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1871 ret = mov_read_default(c, pb, atom); |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1872 c->itunes_metadata = 0; |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1873 return ret; |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1874 } |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1875 |
| 4079 | 1876 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
|
1877 { |
|
4724
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1878 while (atom.size > 8) { |
|
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1879 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
|
1880 atom.size -= 4; |
|
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1881 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
|
1882 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
|
1883 atom.size += 8; |
|
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1884 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
|
1885 } |
|
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1886 } |
|
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1887 return 0; |
|
4033
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1888 } |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1889 |
| 4079 | 1890 static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1891 { |
| 3595 | 1892 int i; |
| 1893 int width; | |
| 1894 int height; | |
| 1895 int64_t disp_transform[2]; | |
| 1896 int display_matrix[3][2]; | |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1897 AVStream *st; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1898 MOVStreamContext *sc; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1899 int version; |
| 1845 | 1900 |
|
5060
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1901 if (c->fc->nb_streams < 1) |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1902 return 0; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1903 st = c->fc->streams[c->fc->nb_streams-1]; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1904 sc = st->priv_data; |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1905 |
|
0bac77c4a578
check stream existence before assignment, fix #1222
bcoudurier
parents:
5058
diff
changeset
|
1906 version = get_byte(pb); |
| 3145 | 1907 get_be24(pb); /* flags */ |
| 1845 | 1908 /* |
| 1909 MOV_TRACK_ENABLED 0x0001 | |
| 1910 MOV_TRACK_IN_MOVIE 0x0002 | |
| 1911 MOV_TRACK_IN_PREVIEW 0x0004 | |
| 1912 MOV_TRACK_IN_POSTER 0x0008 | |
| 1913 */ | |
| 1914 | |
| 1915 if (version == 1) { | |
| 1916 get_be64(pb); | |
| 1917 get_be64(pb); | |
| 1918 } else { | |
| 1919 get_be32(pb); /* creation time */ | |
| 1920 get_be32(pb); /* modification time */ | |
| 1921 } | |
| 1922 st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/ | |
| 1923 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
|
1924 |
| 3167 | 1925 /* highlevel (considering edits) duration in movie timebase */ |
| 1926 (version == 1) ? get_be64(pb) : get_be32(pb); | |
| 1845 | 1927 get_be32(pb); /* reserved */ |
| 1928 get_be32(pb); /* reserved */ | |
| 1929 | |
| 1930 get_be16(pb); /* layer */ | |
| 1931 get_be16(pb); /* alternate group */ | |
| 1932 get_be16(pb); /* volume */ | |
| 1933 get_be16(pb); /* reserved */ | |
| 1934 | |
| 3595 | 1935 //read in the display matrix (outlined in ISO 14496-12, Section 6.2.2) |
| 1936 // they're kept in fixed point format through all calculations | |
| 1937 // ignore u,v,z b/c we don't need the scale factor to calc aspect ratio | |
| 1938 for (i = 0; i < 3; i++) { | |
| 1939 display_matrix[i][0] = get_be32(pb); // 16.16 fixed point | |
| 1940 display_matrix[i][1] = get_be32(pb); // 16.16 fixed point | |
| 1941 get_be32(pb); // 2.30 fixed point (not used) | |
| 1942 } | |
| 1943 | |
| 1944 width = get_be32(pb); // 16.16 fixed point track width | |
| 1945 height = get_be32(pb); // 16.16 fixed point track height | |
| 4202 | 1946 sc->width = width >> 16; |
| 1947 sc->height = height >> 16; | |
| 1845 | 1948 |
|
5068
5657f855d5d0
only set par if it does not indicates a rotation, ex iphone 3GS
bcoudurier
parents:
5065
diff
changeset
|
1949 // transform the display width/height according to the matrix |
| 3595 | 1950 // 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
|
1951 // or if it is rotating the picture, ex iPhone 3GS |
| 3595 | 1952 // to keep the same scale, use [width height 1<<16] |
| 1953 if (width && height && | |
|
5068
5657f855d5d0
only set par if it does not indicates a rotation, ex iphone 3GS
bcoudurier
parents:
5065
diff
changeset
|
1954 ((display_matrix[0][0] != 65536 || |
|
5657f855d5d0
only set par if it does not indicates a rotation, ex iphone 3GS
bcoudurier
parents:
5065
diff
changeset
|
1955 display_matrix[1][1] != 65536) && |
|
5657f855d5d0
only set par if it does not indicates a rotation, ex iphone 3GS
bcoudurier
parents:
5065
diff
changeset
|
1956 !display_matrix[0][1] && |
|
5657f855d5d0
only set par if it does not indicates a rotation, ex iphone 3GS
bcoudurier
parents:
5065
diff
changeset
|
1957 !display_matrix[1][0] && |
|
5657f855d5d0
only set par if it does not indicates a rotation, ex iphone 3GS
bcoudurier
parents:
5065
diff
changeset
|
1958 !display_matrix[2][0] && !display_matrix[2][1])) { |
| 3595 | 1959 for (i = 0; i < 2; i++) |
| 1960 disp_transform[i] = | |
| 1961 (int64_t) width * display_matrix[0][i] + | |
| 1962 (int64_t) height * display_matrix[1][i] + | |
| 1963 ((int64_t) display_matrix[2][i] << 16); | |
| 1845 | 1964 |
| 3595 | 1965 //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
|
1966 st->sample_aspect_ratio = av_d2q( |
| 3595 | 1967 ((double) disp_transform[0] * height) / |
| 1968 ((double) disp_transform[1] * width), INT_MAX); | |
| 1969 } | |
| 1845 | 1970 return 0; |
| 1971 } | |
| 1972 | |
| 4079 | 1973 static int mov_read_tfhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 3169 | 1974 { |
| 1975 MOVFragment *frag = &c->fragment; | |
| 1976 MOVTrackExt *trex = NULL; | |
| 1977 int flags, track_id, i; | |
| 1978 | |
| 1979 get_byte(pb); /* version */ | |
| 1980 flags = get_be24(pb); | |
| 1981 | |
| 1982 track_id = get_be32(pb); | |
| 4646 | 1983 if (!track_id) |
| 3169 | 1984 return -1; |
| 1985 frag->track_id = track_id; | |
| 1986 for (i = 0; i < c->trex_count; i++) | |
| 1987 if (c->trex_data[i].track_id == frag->track_id) { | |
| 1988 trex = &c->trex_data[i]; | |
| 1989 break; | |
| 1990 } | |
| 1991 if (!trex) { | |
| 1992 av_log(c->fc, AV_LOG_ERROR, "could not find corresponding trex\n"); | |
| 1993 return -1; | |
| 1994 } | |
| 1995 | |
| 1996 if (flags & 0x01) frag->base_data_offset = get_be64(pb); | |
| 1997 else frag->base_data_offset = frag->moof_offset; | |
| 1998 if (flags & 0x02) frag->stsd_id = get_be32(pb); | |
| 1999 else frag->stsd_id = trex->stsd_id; | |
| 2000 | |
| 2001 frag->duration = flags & 0x08 ? get_be32(pb) : trex->duration; | |
| 2002 frag->size = flags & 0x10 ? get_be32(pb) : trex->size; | |
| 2003 frag->flags = flags & 0x20 ? get_be32(pb) : trex->flags; | |
| 2004 dprintf(c->fc, "frag flags 0x%x\n", frag->flags); | |
| 2005 return 0; | |
| 2006 } | |
| 2007 | |
| 5975 | 2008 static int mov_read_chap(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 2009 { | |
| 2010 c->chapter_track = get_be32(pb); | |
| 2011 return 0; | |
| 2012 } | |
| 2013 | |
| 4079 | 2014 static int mov_read_trex(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 3169 | 2015 { |
| 2016 MOVTrackExt *trex; | |
| 2017 | |
| 2018 if ((uint64_t)c->trex_count+1 >= UINT_MAX / sizeof(*c->trex_data)) | |
| 2019 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
|
2020 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
|
2021 if (!trex) |
| 3169 | 2022 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
|
2023 c->trex_data = trex; |
| 3169 | 2024 trex = &c->trex_data[c->trex_count++]; |
| 2025 get_byte(pb); /* version */ | |
| 2026 get_be24(pb); /* flags */ | |
| 2027 trex->track_id = get_be32(pb); | |
| 2028 trex->stsd_id = get_be32(pb); | |
| 2029 trex->duration = get_be32(pb); | |
| 2030 trex->size = get_be32(pb); | |
| 2031 trex->flags = get_be32(pb); | |
| 2032 return 0; | |
| 2033 } | |
| 2034 | |
| 4079 | 2035 static int mov_read_trun(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 3169 | 2036 { |
| 2037 MOVFragment *frag = &c->fragment; | |
| 4646 | 2038 AVStream *st = NULL; |
| 3190 | 2039 MOVStreamContext *sc; |
| 3169 | 2040 uint64_t offset; |
| 2041 int64_t dts; | |
| 2042 int data_offset = 0; | |
| 2043 unsigned entries, first_sample_flags = frag->flags; | |
| 2044 int flags, distance, i; | |
| 2045 | |
| 4646 | 2046 for (i = 0; i < c->fc->nb_streams; i++) { |
| 2047 if (c->fc->streams[i]->id == frag->track_id) { | |
| 2048 st = c->fc->streams[i]; | |
| 2049 break; | |
| 2050 } | |
| 2051 } | |
| 2052 if (!st) { | |
| 2053 av_log(c->fc, AV_LOG_ERROR, "could not find corresponding track id %d\n", frag->track_id); | |
| 3190 | 2054 return -1; |
| 4646 | 2055 } |
| 3190 | 2056 sc = st->priv_data; |
| 3169 | 2057 if (sc->pseudo_stream_id+1 != frag->stsd_id) |
| 2058 return 0; | |
| 2059 get_byte(pb); /* version */ | |
| 2060 flags = get_be24(pb); | |
| 2061 entries = get_be32(pb); | |
| 2062 dprintf(c->fc, "flags 0x%x entries %d\n", flags, entries); | |
| 2063 if (flags & 0x001) data_offset = get_be32(pb); | |
| 2064 if (flags & 0x004) first_sample_flags = get_be32(pb); | |
| 2065 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
|
2066 MOVStts *ctts_data; |
| 3169 | 2067 if ((uint64_t)entries+sc->ctts_count >= UINT_MAX/sizeof(*sc->ctts_data)) |
| 2068 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
|
2069 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
|
2070 (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
|
2071 if (!ctts_data) |
| 3169 | 2072 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
|
2073 sc->ctts_data = ctts_data; |
| 3169 | 2074 } |
| 2075 dts = st->duration; | |
| 2076 offset = frag->base_data_offset + data_offset; | |
| 2077 distance = 0; | |
| 2078 dprintf(c->fc, "first sample flags 0x%x\n", first_sample_flags); | |
| 2079 for (i = 0; i < entries; i++) { | |
| 2080 unsigned sample_size = frag->size; | |
| 2081 int sample_flags = i ? frag->flags : first_sample_flags; | |
| 2082 unsigned sample_duration = frag->duration; | |
| 2083 int keyframe; | |
| 2084 | |
| 2085 if (flags & 0x100) sample_duration = get_be32(pb); | |
| 2086 if (flags & 0x200) sample_size = get_be32(pb); | |
| 2087 if (flags & 0x400) sample_flags = get_be32(pb); | |
| 2088 if (flags & 0x800) { | |
| 2089 sc->ctts_data[sc->ctts_count].count = 1; | |
| 2090 sc->ctts_data[sc->ctts_count].duration = get_be32(pb); | |
| 2091 sc->ctts_count++; | |
| 2092 } | |
|
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5790
diff
changeset
|
2093 if ((keyframe = st->codec->codec_type == AVMEDIA_TYPE_AUDIO || |
| 3169 | 2094 (flags & 0x004 && !i && !sample_flags) || sample_flags & 0x2000000)) |
| 2095 distance = 0; | |
| 2096 av_add_index_entry(st, offset, dts, sample_size, distance, | |
| 2097 keyframe ? AVINDEX_KEYFRAME : 0); | |
| 2098 dprintf(c->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", " | |
| 2099 "size %d, distance %d, keyframe %d\n", st->index, sc->sample_count+i, | |
| 2100 offset, dts, sample_size, distance, keyframe); | |
| 2101 distance++; | |
|
5015
7b260f4d453d
Remove time_rate, we cannot compute exactly when fragments are
bcoudurier
parents:
5002
diff
changeset
|
2102 dts += sample_duration; |
| 3169 | 2103 offset += sample_size; |
| 2104 } | |
| 2105 frag->moof_offset = offset; | |
| 2106 st->duration = dts; | |
| 2107 return 0; | |
| 2108 } | |
| 2109 | |
| 1845 | 2110 /* this atom should be null (from specs), but some buggy files put the 'moov' atom inside it... */ |
| 2111 /* like the files created with Adobe Premiere 5.0, for samples see */ | |
| 2112 /* http://graphics.tudelft.nl/~wouter/publications/soundtests/ */ | |
| 4079 | 2113 static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 2114 { |
| 2115 int err; | |
| 2116 | |
| 2117 if (atom.size < 8) | |
| 2118 return 0; /* continue */ | |
| 2119 if (get_be32(pb) != 0) { /* 0 sized mdat atom... use the 'wide' atom size */ | |
| 2120 url_fskip(pb, atom.size - 4); | |
| 2121 return 0; | |
| 2122 } | |
| 2123 atom.type = get_le32(pb); | |
| 2124 atom.size -= 8; | |
| 3253 | 2125 if (atom.type != MKTAG('m','d','a','t')) { |
| 1845 | 2126 url_fskip(pb, atom.size); |
| 2127 return 0; | |
| 2128 } | |
| 2129 err = mov_read_mdat(c, pb, atom); | |
| 2130 return err; | |
| 2131 } | |
| 2132 | |
| 4079 | 2133 static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 2134 { |
| 4206 | 2135 #if CONFIG_ZLIB |
| 1845 | 2136 ByteIOContext ctx; |
| 2137 uint8_t *cmov_data; | |
| 2138 uint8_t *moov_data; /* uncompressed data */ | |
| 2139 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
|
2140 int ret = -1; |
| 1845 | 2141 |
| 2142 get_be32(pb); /* dcom atom */ | |
| 3253 | 2143 if (get_le32(pb) != MKTAG('d','c','o','m')) |
| 1845 | 2144 return -1; |
| 3253 | 2145 if (get_le32(pb) != MKTAG('z','l','i','b')) { |
| 4602 | 2146 av_log(c->fc, AV_LOG_ERROR, "unknown compression for cmov atom !"); |
| 1845 | 2147 return -1; |
| 2148 } | |
| 2149 get_be32(pb); /* cmvd atom */ | |
| 3253 | 2150 if (get_le32(pb) != MKTAG('c','m','v','d')) |
| 1845 | 2151 return -1; |
| 2152 moov_len = get_be32(pb); /* uncompressed size */ | |
| 2153 cmov_len = atom.size - 6 * 4; | |
| 2154 | |
| 2155 cmov_data = av_malloc(cmov_len); | |
| 2156 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
|
2157 return AVERROR(ENOMEM); |
| 1845 | 2158 moov_data = av_malloc(moov_len); |
| 2159 if (!moov_data) { | |
| 2160 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
|
2161 return AVERROR(ENOMEM); |
| 1845 | 2162 } |
| 2163 get_buffer(pb, cmov_data, cmov_len); | |
| 2164 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
|
2165 goto free_and_return; |
| 1845 | 2166 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
|
2167 goto free_and_return; |
| 3253 | 2168 atom.type = MKTAG('m','o','o','v'); |
| 1845 | 2169 atom.size = moov_len; |
| 2170 #ifdef DEBUG | |
| 2171 // { int fd = open("/tmp/uncompheader.mov", O_WRONLY | O_CREAT); write(fd, moov_data, moov_len); close(fd); } | |
| 2172 #endif | |
| 2173 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
|
2174 free_and_return: |
| 1845 | 2175 av_free(moov_data); |
| 2176 av_free(cmov_data); | |
| 2177 return ret; | |
| 2178 #else | |
| 2179 av_log(c->fc, AV_LOG_ERROR, "this file requires zlib support compiled in\n"); | |
| 2180 return -1; | |
| 2181 #endif | |
| 2182 } | |
| 2183 | |
| 2184 /* edit list atom */ | |
| 4079 | 2185 static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 2186 { |
|
5164
99c46fe0b8a0
add one missing check for stream existence in read_elst, fix #1364
bcoudurier
parents:
5068
diff
changeset
|
2187 MOVStreamContext *sc; |
| 1845 | 2188 int i, edit_count; |
| 2189 | |
|
5164
99c46fe0b8a0
add one missing check for stream existence in read_elst, fix #1364
bcoudurier
parents:
5068
diff
changeset
|
2190 if (c->fc->nb_streams < 1) |
|
99c46fe0b8a0
add one missing check for stream existence in read_elst, fix #1364
bcoudurier
parents:
5068
diff
changeset
|
2191 return 0; |
|
99c46fe0b8a0
add one missing check for stream existence in read_elst, fix #1364
bcoudurier
parents:
5068
diff
changeset
|
2192 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
|
2193 |
| 1845 | 2194 get_byte(pb); /* version */ |
| 3145 | 2195 get_be24(pb); /* flags */ |
| 4410 | 2196 edit_count = get_be32(pb); /* entries */ |
| 1845 | 2197 |
|
5035
e743de5125cd
check atom size against edit_count to avoid very long loop
bcoudurier
parents:
5027
diff
changeset
|
2198 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
|
2199 return -1; |
|
e743de5125cd
check atom size against edit_count to avoid very long loop
bcoudurier
parents:
5027
diff
changeset
|
2200 |
| 1845 | 2201 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
|
2202 int time; |
|
4742
0496cbd94374
Extend mov edit list support to work for a first padding entry with
reimar
parents:
4740
diff
changeset
|
2203 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
|
2204 time = get_be32(pb); /* Media time */ |
| 1845 | 2205 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
|
2206 if (i == 0 && time >= -1) { |
|
0496cbd94374
Extend mov edit list support to work for a first padding entry with
reimar
parents:
4740
diff
changeset
|
2207 sc->time_offset = time != -1 ? time : -duration; |
| 4447 | 2208 } |
| 1845 | 2209 } |
|
4399
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
2210 |
|
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
2211 if(edit_count > 1) |
|
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
2212 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
|
2213 "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
|
2214 |
|
4429
7ed870203bfe
fix compilation with DEBUG defined, field does not exist anymore
bcoudurier
parents:
4412
diff
changeset
|
2215 dprintf(c->fc, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, edit_count); |
| 1845 | 2216 return 0; |
| 2217 } | |
| 2218 | |
| 2219 static const MOVParseTableEntry mov_default_parse_table[] = { | |
|
3496
cdbf302a3c00
chinese avs demuxing support, demux AVSFileFormat.mp4
bcoudurier
parents:
3487
diff
changeset
|
2220 { MKTAG('a','v','s','s'), mov_read_extradata }, |
| 5991 | 2221 { MKTAG('c','h','p','l'), mov_read_chpl }, |
| 3253 | 2222 { MKTAG('c','o','6','4'), mov_read_stco }, |
| 2223 { MKTAG('c','t','t','s'), mov_read_ctts }, /* composition time to sample */ | |
| 2224 { MKTAG('d','i','n','f'), mov_read_default }, | |
| 2225 { MKTAG('d','r','e','f'), mov_read_dref }, | |
| 2226 { MKTAG('e','d','t','s'), mov_read_default }, | |
| 2227 { MKTAG('e','l','s','t'), mov_read_elst }, | |
| 2228 { MKTAG('e','n','d','a'), mov_read_enda }, | |
| 2229 { MKTAG('f','i','e','l'), mov_read_extradata }, | |
| 2230 { MKTAG('f','t','y','p'), mov_read_ftyp }, | |
| 2231 { MKTAG('g','l','b','l'), mov_read_glbl }, | |
| 2232 { MKTAG('h','d','l','r'), mov_read_hdlr }, | |
|
4033
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
2233 { MKTAG('i','l','s','t'), mov_read_ilst }, |
| 3253 | 2234 { MKTAG('j','p','2','h'), mov_read_extradata }, |
| 2235 { MKTAG('m','d','a','t'), mov_read_mdat }, | |
| 2236 { MKTAG('m','d','h','d'), mov_read_mdhd }, | |
| 2237 { MKTAG('m','d','i','a'), mov_read_default }, | |
|
4033
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
2238 { MKTAG('m','e','t','a'), mov_read_meta }, |
| 3253 | 2239 { MKTAG('m','i','n','f'), mov_read_default }, |
| 2240 { MKTAG('m','o','o','f'), mov_read_moof }, | |
| 2241 { MKTAG('m','o','o','v'), mov_read_moov }, | |
| 2242 { MKTAG('m','v','e','x'), mov_read_default }, | |
| 2243 { MKTAG('m','v','h','d'), mov_read_mvhd }, | |
| 2244 { MKTAG('S','M','I',' '), mov_read_smi }, /* Sorenson extension ??? */ | |
| 2245 { MKTAG('a','l','a','c'), mov_read_extradata }, /* alac specific atom */ | |
| 2246 { MKTAG('a','v','c','C'), mov_read_glbl }, | |
| 4080 | 2247 { MKTAG('p','a','s','p'), mov_read_pasp }, |
| 3253 | 2248 { MKTAG('s','t','b','l'), mov_read_default }, |
| 2249 { 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
|
2250 { MKTAG('s','t','p','s'), mov_read_stps }, |
| 5959 | 2251 { MKTAG('s','t','r','f'), mov_read_strf }, |
| 3253 | 2252 { MKTAG('s','t','s','c'), mov_read_stsc }, |
| 2253 { MKTAG('s','t','s','d'), mov_read_stsd }, /* sample description */ | |
| 2254 { MKTAG('s','t','s','s'), mov_read_stss }, /* sync sample */ | |
| 2255 { MKTAG('s','t','s','z'), mov_read_stsz }, /* sample size */ | |
| 2256 { MKTAG('s','t','t','s'), mov_read_stts }, | |
| 4739 | 2257 { MKTAG('s','t','z','2'), mov_read_stsz }, /* compact sample size */ |
| 3253 | 2258 { MKTAG('t','k','h','d'), mov_read_tkhd }, /* track header */ |
| 2259 { MKTAG('t','f','h','d'), mov_read_tfhd }, /* track fragment header */ | |
| 2260 { MKTAG('t','r','a','k'), mov_read_trak }, | |
| 2261 { MKTAG('t','r','a','f'), mov_read_default }, | |
| 5975 | 2262 { MKTAG('t','r','e','f'), mov_read_default }, |
| 2263 { MKTAG('c','h','a','p'), mov_read_chap }, | |
| 3253 | 2264 { MKTAG('t','r','e','x'), mov_read_trex }, |
| 2265 { MKTAG('t','r','u','n'), mov_read_trun }, | |
| 4028 | 2266 { MKTAG('u','d','t','a'), mov_read_default }, |
| 3253 | 2267 { MKTAG('w','a','v','e'), mov_read_wave }, |
| 2268 { MKTAG('e','s','d','s'), mov_read_esds }, | |
|
6464
b6e3e7876e4c
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
jbr
parents:
6248
diff
changeset
|
2269 { MKTAG('d','a','c','3'), mov_read_dac3 }, /* AC-3 info */ |
| 3253 | 2270 { MKTAG('w','i','d','e'), mov_read_wide }, /* place holder */ |
| 2271 { MKTAG('c','m','o','v'), mov_read_cmov }, | |
| 2826 | 2272 { 0, NULL } |
| 1845 | 2273 }; |
| 2274 | |
| 2275 static int mov_probe(AVProbeData *p) | |
| 2276 { | |
| 2277 unsigned int offset; | |
| 2278 uint32_t tag; | |
| 2279 int score = 0; | |
| 2280 | |
| 2281 /* check file header */ | |
| 2282 offset = 0; | |
| 2283 for(;;) { | |
| 2284 /* ignore invalid offset */ | |
| 2285 if ((offset + 8) > (unsigned int)p->buf_size) | |
| 2286 return score; | |
| 2287 tag = AV_RL32(p->buf + offset + 4); | |
| 2288 switch(tag) { | |
| 2289 /* check for obvious tags */ | |
| 3253 | 2290 case MKTAG('j','P',' ',' '): /* jpeg 2000 signature */ |
| 2291 case MKTAG('m','o','o','v'): | |
| 2292 case MKTAG('m','d','a','t'): | |
| 2293 case MKTAG('p','n','o','t'): /* detect movs with preview pics like ew.mov and april.mov */ | |
| 2294 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
|
2295 case MKTAG('f','t','y','p'): |
| 1845 | 2296 return AVPROBE_SCORE_MAX; |
| 2297 /* those are more common words, so rate then a bit less */ | |
| 3253 | 2298 case MKTAG('e','d','i','w'): /* xdcam files have reverted first tags */ |
| 2299 case MKTAG('w','i','d','e'): | |
| 2300 case MKTAG('f','r','e','e'): | |
| 2301 case MKTAG('j','u','n','k'): | |
| 2302 case MKTAG('p','i','c','t'): | |
| 1845 | 2303 return AVPROBE_SCORE_MAX - 5; |
| 3588 | 2304 case MKTAG(0x82,0x82,0x7f,0x7d): |
| 3253 | 2305 case MKTAG('s','k','i','p'): |
| 2306 case MKTAG('u','u','i','d'): | |
| 2307 case MKTAG('p','r','f','l'): | |
| 1845 | 2308 offset = AV_RB32(p->buf+offset) + offset; |
| 2309 /* if we only find those cause probedata is too small at least rate them */ | |
| 2310 score = AVPROBE_SCORE_MAX - 50; | |
| 2311 break; | |
| 2312 default: | |
| 2313 /* unrecognized tag */ | |
| 2314 return score; | |
| 2315 } | |
| 2316 } | |
| 2317 return score; | |
| 2318 } | |
| 2319 | |
| 5975 | 2320 // must be done after parsing all trak because there's no order requirement |
| 2321 static void mov_read_chapters(AVFormatContext *s) | |
| 2322 { | |
| 2323 MOVContext *mov = s->priv_data; | |
| 2324 AVStream *st = NULL; | |
| 2325 MOVStreamContext *sc; | |
| 2326 int64_t cur_pos; | |
| 2327 uint8_t *title = NULL; | |
| 2328 int i, len, i8, i16; | |
| 2329 | |
| 2330 for (i = 0; i < s->nb_streams; i++) | |
| 2331 if (s->streams[i]->id == mov->chapter_track) { | |
| 2332 st = s->streams[i]; | |
| 2333 break; | |
| 2334 } | |
| 2335 if (!st) { | |
| 2336 av_log(s, AV_LOG_ERROR, "Referenced QT chapter track not found\n"); | |
| 2337 return; | |
| 2338 } | |
| 2339 | |
| 2340 st->discard = AVDISCARD_ALL; | |
| 2341 sc = st->priv_data; | |
| 2342 cur_pos = url_ftell(sc->pb); | |
| 2343 | |
| 2344 for (i = 0; i < st->nb_index_entries; i++) { | |
| 2345 AVIndexEntry *sample = &st->index_entries[i]; | |
| 2346 int64_t end = i+1 < st->nb_index_entries ? st->index_entries[i+1].timestamp : st->duration; | |
| 2347 | |
| 2348 if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) { | |
| 2349 av_log(s, AV_LOG_ERROR, "Chapter %d not found in file\n", i); | |
| 2350 goto finish; | |
| 2351 } | |
| 2352 | |
| 2353 title = av_malloc(sample->size+2); | |
| 2354 get_buffer(sc->pb, title, sample->size); | |
| 2355 | |
| 2356 // the first two bytes are the length of the title | |
| 2357 len = AV_RB16(title); | |
| 2358 if (len > sample->size-2) | |
| 2359 continue; | |
| 2360 | |
| 2361 // The samples could theoretically be in any encoding if there's an encd | |
| 2362 // atom following, but in practice are only utf-8 or utf-16, distinguished | |
| 2363 // instead by the presence of a BOM | |
| 2364 if (AV_RB16(title+2) == 0xfeff) { | |
| 2365 uint8_t *utf8 = av_malloc(2*len+3); | |
| 2366 | |
| 2367 i8 = i16 = 0; | |
| 2368 while (i16 < len) { | |
| 2369 uint32_t ch; | |
| 2370 uint8_t tmp; | |
| 2371 GET_UTF16(ch, i16 < len ? AV_RB16(title + (i16+=2)) : 0, break;) | |
| 2372 PUT_UTF8(ch, tmp, if (i8 < 2*len) utf8[2+i8++] = tmp;) | |
| 2373 } | |
| 2374 utf8[2+i8] = 0; | |
| 2375 av_freep(&title); | |
| 2376 title = utf8; | |
| 2377 } | |
| 2378 | |
| 2379 ff_new_chapter(s, i, st->time_base, sample->timestamp, end, title+2); | |
| 2380 av_freep(&title); | |
| 2381 } | |
| 2382 finish: | |
| 2383 av_free(title); | |
| 2384 url_fseek(sc->pb, cur_pos, SEEK_SET); | |
| 2385 } | |
| 2386 | |
| 1845 | 2387 static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) |
| 2388 { | |
| 2006 | 2389 MOVContext *mov = s->priv_data; |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2730
diff
changeset
|
2390 ByteIOContext *pb = s->pb; |
| 3155 | 2391 int err; |
|
6173
1b9079c05f9a
Improve mov atom parsing debug message, print parent atom and size in decimal
bcoudurier
parents:
6040
diff
changeset
|
2392 MOVAtom atom = { AV_RL32("root") }; |
| 1845 | 2393 |
| 2394 mov->fc = s; | |
| 3167 | 2395 /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ |
| 2396 if(!url_is_streamed(pb)) | |
| 1845 | 2397 atom.size = url_fsize(pb); |
| 2398 else | |
| 2026 | 2399 atom.size = INT64_MAX; |
| 1845 | 2400 |
| 2401 /* check MOV header */ | |
| 3204 | 2402 if ((err = mov_read_default(mov, pb, atom)) < 0) { |
| 2403 av_log(s, AV_LOG_ERROR, "error reading header: %d\n", err); | |
| 2404 return err; | |
| 2405 } | |
| 2406 if (!mov->found_moov) { | |
| 2407 av_log(s, AV_LOG_ERROR, "moov atom not found\n"); | |
| 1845 | 2408 return -1; |
| 2409 } | |
| 3205 | 2410 dprintf(mov->fc, "on_parse_exit_offset=%lld\n", url_ftell(pb)); |
| 1845 | 2411 |
| 5975 | 2412 if (!url_is_streamed(pb) && mov->chapter_track > 0) |
| 2413 mov_read_chapters(s); | |
| 2414 | |
| 1845 | 2415 return 0; |
| 2416 } | |
| 2417 | |
|
5063
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2418 static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st) |
| 1845 | 2419 { |
|
5063
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2420 AVIndexEntry *sample = NULL; |
| 1845 | 2421 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
|
2422 int i; |
| 2823 | 2423 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
|
2424 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
|
2425 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
|
2426 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
|
2427 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
|
2428 int64_t dts = av_rescale(current_sample->timestamp, AV_TIME_BASE, msc->time_scale); |
| 2030 | 2429 dprintf(s, "stream %d, sample %d, dts %"PRId64"\n", i, msc->current_sample, dts); |
| 2817 | 2430 if (!sample || (url_is_streamed(s->pb) && current_sample->pos < sample->pos) || |
| 2431 (!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
|
2432 ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb && |
| 2817 | 2433 ((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
|
2434 (FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))))) { |
| 1845 | 2435 sample = current_sample; |
| 2436 best_dts = dts; | |
|
5063
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2437 *st = avst; |
| 1845 | 2438 } |
| 2439 } | |
| 2440 } | |
|
5063
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2441 return sample; |
|
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2442 } |
|
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2443 |
|
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2444 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
|
2445 { |
|
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2446 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
|
2447 MOVStreamContext *sc; |
|
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2448 AVIndexEntry *sample; |
|
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2449 AVStream *st = NULL; |
|
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2450 int ret; |
|
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2451 retry: |
|
dcaea581e24d
mov_read_packet: extract code that searches for the stream/sample to demux next
reimar
parents:
5062
diff
changeset
|
2452 sample = mov_find_next_sample(s, &st); |
| 3170 | 2453 if (!sample) { |
| 2454 mov->found_mdat = 0; | |
| 2455 if (!url_is_streamed(s->pb) || | |
|
6173
1b9079c05f9a
Improve mov atom parsing debug message, print parent atom and size in decimal
bcoudurier
parents:
6040
diff
changeset
|
2456 mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }) < 0 || |
| 3170 | 2457 url_feof(s->pb)) |
| 4972 | 2458 return AVERROR_EOF; |
| 3170 | 2459 dprintf(s, "read fragments, offset 0x%llx\n", url_ftell(s->pb)); |
| 2460 goto retry; | |
| 2461 } | |
|
5061
5ff6a72c9686
In mov_read_packet remember the AVStream we want to demux next instead of the
reimar
parents:
5060
diff
changeset
|
2462 sc = st->priv_data; |
| 1845 | 2463 /* must be done just before reading, to avoid infinite loop on sample */ |
| 2464 sc->current_sample++; | |
|
5064
1ed8004a3ef5
mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set.
reimar
parents:
5063
diff
changeset
|
2465 |
|
1ed8004a3ef5
mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set.
reimar
parents:
5063
diff
changeset
|
2466 if (st->discard != AVDISCARD_ALL) { |
| 5065 | 2467 if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) { |
| 2468 av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n", | |
| 2469 sc->ffindex, sample->pos); | |
| 2470 return -1; | |
| 2471 } | |
| 2472 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
|
2473 if (ret < 0) |
|
8d81bf3822ac
mov_read_packet: if dv_get_packet fails, return exactly its error value
reimar
parents:
5061
diff
changeset
|
2474 return ret; |
| 5065 | 2475 #if CONFIG_DV_DEMUXER |
| 2476 if (mov->dv_demux && sc->dv_audio_container) { | |
| 2477 dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size); | |
| 2478 av_free(pkt->data); | |
| 2479 pkt->size = 0; | |
| 2480 ret = dv_get_packet(mov->dv_demux, pkt); | |
| 2481 if (ret < 0) | |
| 2482 return ret; | |
| 2483 } | |
| 1845 | 2484 #endif |
|
5064
1ed8004a3ef5
mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set.
reimar
parents:
5063
diff
changeset
|
2485 } |
|
1ed8004a3ef5
mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set.
reimar
parents:
5063
diff
changeset
|
2486 |
| 1845 | 2487 pkt->stream_index = sc->ffindex; |
| 2488 pkt->dts = sample->timestamp; | |
| 2489 if (sc->ctts_data) { | |
|
5015
7b260f4d453d
Remove time_rate, we cannot compute exactly when fragments are
bcoudurier
parents:
5002
diff
changeset
|
2490 pkt->pts = pkt->dts + sc->dts_shift + sc->ctts_data[sc->ctts_index].duration; |
| 1845 | 2491 /* update ctts context */ |
| 4411 | 2492 sc->ctts_sample++; |
| 2493 if (sc->ctts_index < sc->ctts_count && | |
| 2494 sc->ctts_data[sc->ctts_index].count == sc->ctts_sample) { | |
| 2495 sc->ctts_index++; | |
| 2496 sc->ctts_sample = 0; | |
| 1845 | 2497 } |
|
3956
8bdecea89071
support negative ctts in some way, unset wrong dts
bcoudurier
parents:
3935
diff
changeset
|
2498 if (sc->wrong_dts) |
|
8bdecea89071
support negative ctts in some way, unset wrong dts
bcoudurier
parents:
3935
diff
changeset
|
2499 pkt->dts = AV_NOPTS_VALUE; |
| 1845 | 2500 } else { |
|
4717
ee2dd1b3afc3
do not modify sample_count, check against index entries
bcoudurier
parents:
4690
diff
changeset
|
2501 int64_t next_dts = (sc->current_sample < st->nb_index_entries) ? |
| 3267 | 2502 st->index_entries[sc->current_sample].timestamp : st->duration; |
| 2503 pkt->duration = next_dts - pkt->dts; | |
| 1845 | 2504 pkt->pts = pkt->dts; |
| 2505 } | |
|
5064
1ed8004a3ef5
mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set.
reimar
parents:
5063
diff
changeset
|
2506 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
|
2507 goto retry; |
|
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
2508 pkt->flags |= sample->flags & AVINDEX_KEYFRAME ? AV_PKT_FLAG_KEY : 0; |
| 1845 | 2509 pkt->pos = sample->pos; |
| 2902 | 2510 dprintf(s, "stream %d, pts %"PRId64", dts %"PRId64", pos 0x%"PRIx64", duration %d\n", |
| 2511 pkt->stream_index, pkt->pts, pkt->dts, pkt->pos, pkt->duration); | |
| 1845 | 2512 return 0; |
| 2513 } | |
| 2514 | |
| 5371 | 2515 static int mov_seek_stream(AVFormatContext *s, AVStream *st, int64_t timestamp, int flags) |
| 1845 | 2516 { |
| 2517 MOVStreamContext *sc = st->priv_data; | |
| 2518 int sample, time_sample; | |
| 2519 int i; | |
| 2520 | |
| 2521 sample = av_index_search_timestamp(st, timestamp, flags); | |
| 5371 | 2522 dprintf(s, "stream %d, timestamp %"PRId64", sample %d\n", st->index, timestamp, sample); |
|
6213
525a4e7c0d30
In mov demuxer, fix seeking to the beginning when file has edit lists.
bcoudurier
parents:
6211
diff
changeset
|
2523 if (sample < 0 && st->nb_index_entries && timestamp < st->index_entries[0].timestamp) |
|
525a4e7c0d30
In mov demuxer, fix seeking to the beginning when file has edit lists.
bcoudurier
parents:
6211
diff
changeset
|
2524 sample = 0; |
| 1845 | 2525 if (sample < 0) /* not sure what to do */ |
| 2526 return -1; | |
| 2527 sc->current_sample = sample; | |
| 5371 | 2528 dprintf(s, "stream %d, found sample %d\n", st->index, sc->current_sample); |
| 1845 | 2529 /* adjust ctts index */ |
| 2530 if (sc->ctts_data) { | |
| 2531 time_sample = 0; | |
| 2532 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
|
2533 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
|
2534 if (next > sc->current_sample) { |
| 4411 | 2535 sc->ctts_index = i; |
| 2536 sc->ctts_sample = sc->current_sample - time_sample; | |
| 1845 | 2537 break; |
| 2538 } | |
|
2083
2c3887f02739
fix ctts index computation when seeking, check must be done against next ctts sample, thanks to Uoti
bcoudurier
parents:
2046
diff
changeset
|
2539 time_sample = next; |
| 1845 | 2540 } |
| 2541 } | |
| 2542 return sample; | |
| 2543 } | |
| 2544 | |
| 2545 static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_time, int flags) | |
| 2546 { | |
| 2547 AVStream *st; | |
| 2548 int64_t seek_timestamp, timestamp; | |
| 2549 int sample; | |
| 2550 int i; | |
| 2551 | |
| 2552 if (stream_index >= s->nb_streams) | |
| 2553 return -1; | |
| 4290 | 2554 if (sample_time < 0) |
| 2555 sample_time = 0; | |
| 1845 | 2556 |
| 2557 st = s->streams[stream_index]; | |
| 5371 | 2558 sample = mov_seek_stream(s, st, sample_time, flags); |
| 1845 | 2559 if (sample < 0) |
| 2560 return -1; | |
| 2561 | |
| 2562 /* adjust seek timestamp to found sample timestamp */ | |
| 2563 seek_timestamp = st->index_entries[sample].timestamp; | |
| 2564 | |
| 2565 for (i = 0; i < s->nb_streams; i++) { | |
| 2566 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
|
2567 if (stream_index == i) |
| 1845 | 2568 continue; |
| 2569 | |
| 2570 timestamp = av_rescale_q(seek_timestamp, s->streams[stream_index]->time_base, st->time_base); | |
| 5371 | 2571 mov_seek_stream(s, st, timestamp, flags); |
| 1845 | 2572 } |
| 2573 return 0; | |
| 2574 } | |
| 2575 | |
| 2576 static int mov_read_close(AVFormatContext *s) | |
| 2577 { | |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2578 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
|
2579 int i, j; |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2580 |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2581 for (i = 0; i < s->nb_streams; i++) { |
| 4719 | 2582 AVStream *st = s->streams[i]; |
| 2583 MOVStreamContext *sc = st->priv_data; | |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2584 |
|
2824
ecbfaa8712a1
do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents:
2823
diff
changeset
|
2585 av_freep(&sc->ctts_data); |
|
5369
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
2586 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
|
2587 av_freep(&sc->drefs[j].path); |
|
5369
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
2588 av_freep(&sc->drefs[j].dir); |
|
347123a18feb
Search relative path according to alias record when opening mov reference files.
bcoudurier
parents:
5364
diff
changeset
|
2589 } |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
2590 av_freep(&sc->drefs); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
2591 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
|
2592 url_fclose(sc->pb); |
| 4719 | 2593 |
| 2594 av_freep(&st->codec->palctrl); | |
| 2084 | 2595 } |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2596 |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2597 if (mov->dv_demux) { |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2598 for(i = 0; i < mov->dv_fctx->nb_streams; i++) { |
| 1845 | 2599 av_freep(&mov->dv_fctx->streams[i]->codec); |
| 2600 av_freep(&mov->dv_fctx->streams[i]); | |
| 2601 } | |
| 2602 av_freep(&mov->dv_fctx); | |
| 2603 av_freep(&mov->dv_demux); | |
| 2604 } | |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2605 |
| 3169 | 2606 av_freep(&mov->trex_data); |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2607 |
| 1845 | 2608 return 0; |
| 2609 } | |
| 2610 | |
| 2611 AVInputFormat mov_demuxer = { | |
| 2612 "mov,mp4,m4a,3gp,3g2,mj2", | |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3362
diff
changeset
|
2613 NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"), |
| 1845 | 2614 sizeof(MOVContext), |
| 2615 mov_probe, | |
| 2616 mov_read_header, | |
| 2617 mov_read_packet, | |
| 2618 mov_read_close, | |
| 2619 mov_read_seek, | |
| 2620 }; |
