Mercurial > libavformat.hg
annotate mov.c @ 4806:c3f239ee623f libavformat
Support DVD subtitles in mov/mp4 as created by Nero.
See also http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4
| author | reimar |
|---|---|
| date | Thu, 02 Apr 2009 11:26:46 +0000 |
| parents | 0493d65debd7 |
| children | 916678f56bfd |
| 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" | |
| 4739 | 36 #include "libavcodec/bitstream.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)); | |
| 89 av_metadata_set(&c->fc->metadata, "track", buf); | |
| 90 | |
| 91 get_be16(pb); // total tracks | |
| 92 | |
| 93 return 0; | |
| 94 } | |
| 95 | |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
96 static int mov_read_udta_string(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
97 { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
98 #ifdef MOV_EXPORT_ALL_METADATA |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
99 char tmp_key[5]; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
100 #endif |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
101 char str[1024], key2[16], language[4] = {0}; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
102 const char *key = NULL; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
103 uint16_t str_size; |
| 4728 | 104 int (*parse)(MOVContext*, ByteIOContext*, unsigned) = NULL; |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
105 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
106 switch (atom.type) { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
107 case MKTAG(0xa9,'n','a','m'): key = "title"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
108 case MKTAG(0xa9,'a','u','t'): |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
109 case MKTAG(0xa9,'A','R','T'): |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
110 case MKTAG(0xa9,'w','r','t'): key = "author"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
111 case MKTAG(0xa9,'c','p','y'): key = "copyright"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
112 case MKTAG(0xa9,'c','m','t'): |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
113 case MKTAG(0xa9,'i','n','f'): key = "comment"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
114 case MKTAG(0xa9,'a','l','b'): key = "album"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
115 case MKTAG(0xa9,'d','a','y'): key = "year"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
116 case MKTAG(0xa9,'g','e','n'): key = "genre"; break; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
117 case MKTAG(0xa9,'t','o','o'): |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
118 case MKTAG(0xa9,'e','n','c'): key = "muxer"; break; |
| 4728 | 119 case MKTAG( 't','r','k','n'): key = "track"; |
| 120 parse = mov_metadata_trkn; break; | |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
121 } |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
122 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
123 if (c->itunes_metadata && atom.size > 8) { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
124 int data_size = get_be32(pb); |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
125 int tag = get_le32(pb); |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
126 if (tag == MKTAG('d','a','t','a')) { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
127 get_be32(pb); // type |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
128 get_be32(pb); // unknown |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
129 str_size = data_size - 16; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
130 atom.size -= 16; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
131 } else return 0; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
132 } else if (atom.size > 4 && key && !c->itunes_metadata) { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
133 str_size = get_be16(pb); // string length |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
134 ff_mov_lang_to_iso639(get_be16(pb), language); |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
135 atom.size -= 4; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
136 } else |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
137 str_size = atom.size; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
138 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
139 #ifdef MOV_EXPORT_ALL_METADATA |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
140 if (!key) { |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
141 snprintf(tmp_key, 5, "%.4s", (char*)&atom.type); |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
142 key = tmp_key; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
143 } |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
144 #endif |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
145 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
146 if (!key) |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
147 return 0; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
148 if (atom.size < 0) |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
149 return -1; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
150 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
151 str_size = FFMIN3(sizeof(str)-1, str_size, atom.size); |
| 4728 | 152 |
| 153 if (parse) | |
| 154 parse(c, pb, str_size); | |
| 155 else { | |
| 4729 | 156 get_buffer(pb, str, str_size); |
| 157 str[str_size] = 0; | |
| 158 av_metadata_set(&c->fc->metadata, key, str); | |
| 159 if (*language && strcmp(language, "und")) { | |
| 160 snprintf(key2, sizeof(key2), "%s-%s", key, language); | |
| 161 av_metadata_set(&c->fc->metadata, key2, str); | |
| 162 } | |
| 4728 | 163 } |
|
4727
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
164 #ifdef DEBUG_METADATA |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
165 av_log(c->fc, AV_LOG_DEBUG, "lang \"%3s\" ", language); |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
166 av_log(c->fc, AV_LOG_DEBUG, "tag \"%s\" value \"%s\" atom \"%.4s\" %d %lld\n", |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
167 key, str, (char*)&atom.type, str_size, atom.size); |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
168 #endif |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
169 |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
170 return 0; |
|
245cabbfa676
move read_udta_string up to avoid forward declaration
bcoudurier
parents:
4726
diff
changeset
|
171 } |
| 4726 | 172 |
| 4079 | 173 static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 174 { |
| 175 int64_t total_size = 0; | |
| 4079 | 176 MOVAtom a; |
| 1845 | 177 int i; |
| 178 int err = 0; | |
| 179 | |
| 180 a.offset = atom.offset; | |
| 181 | |
| 182 if (atom.size < 0) | |
| 2026 | 183 atom.size = INT64_MAX; |
| 1845 | 184 while(((total_size + 8) < atom.size) && !url_feof(pb) && !err) { |
| 4726 | 185 int (*parse)(MOVContext*, ByteIOContext*, MOVAtom) = NULL; |
| 1845 | 186 a.size = atom.size; |
| 2826 | 187 a.type=0; |
| 1845 | 188 if(atom.size >= 8) { |
| 189 a.size = get_be32(pb); | |
| 190 a.type = get_le32(pb); | |
| 191 } | |
| 192 total_size += 8; | |
| 193 a.offset += 8; | |
| 2902 | 194 dprintf(c->fc, "type: %08x %.4s sz: %"PRIx64" %"PRIx64" %"PRIx64"\n", |
| 195 a.type, (char*)&a.type, a.size, atom.size, total_size); | |
| 1845 | 196 if (a.size == 1) { /* 64 bit extended size */ |
| 197 a.size = get_be64(pb) - 8; | |
| 198 a.offset += 8; | |
| 199 total_size += 8; | |
| 200 } | |
| 201 if (a.size == 0) { | |
| 202 a.size = atom.size - total_size; | |
| 203 if (a.size <= 8) | |
| 204 break; | |
| 205 } | |
|
1964
4571a481081d
move atom size check before parsing function search
bcoudurier
parents:
1963
diff
changeset
|
206 a.size -= 8; |
|
2660
022174d849d5
fix issue 225, instead of stoping when wrong atom size is found,
bcoudurier
parents:
2589
diff
changeset
|
207 if(a.size < 0) |
|
1964
4571a481081d
move atom size check before parsing function search
bcoudurier
parents:
1963
diff
changeset
|
208 break; |
| 2665 | 209 a.size = FFMIN(a.size, atom.size - total_size); |
|
1964
4571a481081d
move atom size check before parsing function search
bcoudurier
parents:
1963
diff
changeset
|
210 |
| 4726 | 211 for (i = 0; mov_default_parse_table[i].type; i++) |
| 212 if (mov_default_parse_table[i].type == a.type) { | |
| 213 parse = mov_default_parse_table[i].parse; | |
| 214 break; | |
| 215 } | |
| 1845 | 216 |
| 4726 | 217 // container is user data |
| 218 if (!parse && (atom.type == MKTAG('u','d','t','a') || | |
| 219 atom.type == MKTAG('i','l','s','t'))) | |
| 220 parse = mov_read_udta_string; | |
| 221 | |
| 222 if (!parse) { /* skip leaf atoms data */ | |
| 1845 | 223 url_fskip(pb, a.size); |
| 224 } else { | |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3967
diff
changeset
|
225 int64_t start_pos = url_ftell(pb); |
| 1845 | 226 int64_t left; |
| 4726 | 227 err = parse(c, pb, a); |
|
3166
c082ee7573b2
simplify, and only stop parsing when non streamable
bcoudurier
parents:
3164
diff
changeset
|
228 if (url_is_streamed(pb) && c->found_moov && c->found_mdat) |
| 2817 | 229 break; |
| 1845 | 230 left = a.size - url_ftell(pb) + start_pos; |
| 231 if (left > 0) /* skip garbage at atom end */ | |
| 232 url_fskip(pb, left); | |
| 233 } | |
| 234 | |
| 235 a.offset += a.size; | |
| 236 total_size += a.size; | |
| 237 } | |
| 238 | |
| 3181 | 239 if (!err && total_size < atom.size && atom.size < 0x7ffff) |
| 1845 | 240 url_fskip(pb, atom.size - total_size); |
| 241 | |
| 242 return err; | |
| 243 } | |
| 244 | |
| 4079 | 245 static int mov_read_dref(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
246 { |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
247 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
248 MOVStreamContext *sc = st->priv_data; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
249 int entries, i, j; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
250 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
251 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
|
252 entries = get_be32(pb); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
253 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
|
254 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
|
255 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
|
256 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
|
257 return AVERROR(ENOMEM); |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
258 sc->drefs_count = entries; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
259 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
260 for (i = 0; i < sc->drefs_count; i++) { |
| 4079 | 261 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
|
262 uint32_t size = get_be32(pb); |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3967
diff
changeset
|
263 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
|
264 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
265 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
|
266 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
|
267 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
|
268 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
269 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
|
270 /* macintosh alias record */ |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
271 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
|
272 char volume[28]; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
273 int16_t type; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
274 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
275 url_fskip(pb, 10); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
276 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
277 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
|
278 volume_len = FFMIN(volume_len, 27); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
279 get_buffer(pb, volume, 27); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
280 volume[volume_len] = 0; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
281 av_log(c->fc, AV_LOG_DEBUG, "volume %s, len %d\n", volume, volume_len); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
282 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
283 url_fskip(pb, 112); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
284 |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
285 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
|
286 type = get_be16(pb); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
287 len = get_be16(pb); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
288 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
|
289 if (len&1) |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
290 len += 1; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
291 if (type == 2) { // absolute path |
| 3092 | 292 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
|
293 dref->path = av_mallocz(len+1); |
| 3091 | 294 if (!dref->path) |
| 295 return AVERROR(ENOMEM); | |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
296 get_buffer(pb, dref->path, len); |
| 3090 | 297 if (len > volume_len && !strncmp(dref->path, volume, volume_len)) { |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
298 len -= volume_len; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
299 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
|
300 dref->path[len] = 0; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
301 } |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
302 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
|
303 if (dref->path[j] == ':') |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
304 dref->path[j] = '/'; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
305 av_log(c->fc, AV_LOG_DEBUG, "path %s\n", dref->path); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
306 } else |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
307 url_fskip(pb, len); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
308 } |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
309 } |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
310 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
|
311 } |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
312 return 0; |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
313 } |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
314 |
| 4079 | 315 static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 316 { |
|
4642
60d5f0997351
MOV: fix crash when 'meta' occurs before first 'trak'
alexc
parents:
4625
diff
changeset
|
317 AVStream *st; |
| 1845 | 318 uint32_t type; |
| 319 uint32_t ctype; | |
| 320 | |
|
4642
60d5f0997351
MOV: fix crash when 'meta' occurs before first 'trak'
alexc
parents:
4625
diff
changeset
|
321 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
|
322 return 0; |
|
60d5f0997351
MOV: fix crash when 'meta' occurs before first 'trak'
alexc
parents:
4625
diff
changeset
|
323 |
|
60d5f0997351
MOV: fix crash when 'meta' occurs before first 'trak'
alexc
parents:
4625
diff
changeset
|
324 st = c->fc->streams[c->fc->nb_streams-1]; |
|
60d5f0997351
MOV: fix crash when 'meta' occurs before first 'trak'
alexc
parents:
4625
diff
changeset
|
325 |
| 1845 | 326 get_byte(pb); /* version */ |
| 3145 | 327 get_be24(pb); /* flags */ |
| 1845 | 328 |
| 329 /* component type */ | |
| 330 ctype = get_le32(pb); | |
| 331 type = get_le32(pb); /* component subtype */ | |
| 332 | |
| 4730 | 333 dprintf(c->fc, "ctype= %.4s (0x%08x)\n", (char*)&ctype, ctype); |
| 334 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
|
335 |
| 3254 | 336 if (type == MKTAG('v','i','d','e')) |
| 1845 | 337 st->codec->codec_type = CODEC_TYPE_VIDEO; |
| 3253 | 338 else if(type == MKTAG('s','o','u','n')) |
| 1845 | 339 st->codec->codec_type = CODEC_TYPE_AUDIO; |
| 3253 | 340 else if(type == MKTAG('m','1','a',' ')) |
| 1845 | 341 st->codec->codec_id = CODEC_ID_MP2; |
| 4731 | 342 else if(type == MKTAG('s','u','b','p')) |
| 1845 | 343 st->codec->codec_type = CODEC_TYPE_SUBTITLE; |
| 4731 | 344 |
| 1845 | 345 get_be32(pb); /* component manufacture */ |
| 346 get_be32(pb); /* component flags */ | |
| 347 get_be32(pb); /* component flags mask */ | |
| 348 | |
| 349 if(atom.size <= 24) | |
| 350 return 0; /* nothing left to read */ | |
| 351 | |
| 352 url_fskip(pb, atom.size - (url_ftell(pb) - atom.offset)); | |
| 353 return 0; | |
| 354 } | |
| 355 | |
| 2029 | 356 static int mp4_read_descr_len(ByteIOContext *pb) |
| 1845 | 357 { |
| 358 int len = 0; | |
| 359 int count = 4; | |
| 360 while (count--) { | |
| 361 int c = get_byte(pb); | |
| 362 len = (len << 7) | (c & 0x7f); | |
| 363 if (!(c & 0x80)) | |
| 364 break; | |
| 365 } | |
| 366 return len; | |
| 367 } | |
| 368 | |
| 2029 | 369 static int mp4_read_descr(MOVContext *c, ByteIOContext *pb, int *tag) |
| 1845 | 370 { |
| 371 int len; | |
| 372 *tag = get_byte(pb); | |
| 2029 | 373 len = mp4_read_descr_len(pb); |
| 1907 | 374 dprintf(c->fc, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len); |
| 1845 | 375 return len; |
| 376 } | |
| 377 | |
| 2028 | 378 #define MP4ESDescrTag 0x03 |
| 379 #define MP4DecConfigDescrTag 0x04 | |
| 380 #define MP4DecSpecificDescrTag 0x05 | |
| 381 | |
|
3261
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
382 static const AVCodecTag mp4_audio_types[] = { |
|
4749
a0e0086f7f52
MOV: Use the AOT enum for the mp4_audio_types mapping.
alexc
parents:
4742
diff
changeset
|
383 { 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
|
384 { CODEC_ID_MP3ON4, AOT_L1 }, /* layer 1 */ |
|
a0e0086f7f52
MOV: Use the AOT enum for the mp4_audio_types mapping.
alexc
parents:
4742
diff
changeset
|
385 { CODEC_ID_MP3ON4, AOT_L2 }, /* layer 2 */ |
|
a0e0086f7f52
MOV: Use the AOT enum for the mp4_audio_types mapping.
alexc
parents:
4742
diff
changeset
|
386 { CODEC_ID_MP3ON4, AOT_L3 }, /* layer 3 */ |
|
a0e0086f7f52
MOV: Use the AOT enum for the mp4_audio_types mapping.
alexc
parents:
4742
diff
changeset
|
387 { CODEC_ID_NONE, AOT_NULL }, |
|
3261
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
388 }; |
|
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
389 |
| 4079 | 390 static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 391 { |
| 392 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 393 int tag, len; | |
| 394 | |
| 395 get_be32(pb); /* version + flags */ | |
| 2029 | 396 len = mp4_read_descr(c, pb, &tag); |
| 1845 | 397 if (tag == MP4ESDescrTag) { |
| 398 get_be16(pb); /* ID */ | |
| 399 get_byte(pb); /* priority */ | |
| 400 } else | |
| 401 get_be16(pb); /* ID */ | |
| 402 | |
| 2029 | 403 len = mp4_read_descr(c, pb, &tag); |
| 1845 | 404 if (tag == MP4DecConfigDescrTag) { |
| 2028 | 405 int object_type_id = get_byte(pb); |
| 406 get_byte(pb); /* stream type */ | |
| 407 get_be24(pb); /* buffer size db */ | |
| 408 get_be32(pb); /* max bitrate */ | |
| 409 get_be32(pb); /* avg bitrate */ | |
| 1845 | 410 |
| 2028 | 411 st->codec->codec_id= codec_get_id(ff_mp4_obj_type, object_type_id); |
| 412 dprintf(c->fc, "esds object type id %d\n", object_type_id); | |
| 2029 | 413 len = mp4_read_descr(c, pb, &tag); |
| 1845 | 414 if (tag == MP4DecSpecificDescrTag) { |
| 1907 | 415 dprintf(c->fc, "Specific MPEG4 header len=%d\n", len); |
| 3078 | 416 if((uint64_t)len > (1<<30)) |
| 417 return -1; | |
| 1845 | 418 st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); |
| 3076 | 419 if (!st->codec->extradata) |
| 420 return AVERROR(ENOMEM); | |
| 3077 | 421 get_buffer(pb, st->codec->extradata, len); |
| 422 st->codec->extradata_size = len; | |
|
3261
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
423 if (st->codec->codec_id == CODEC_ID_AAC) { |
|
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
424 MPEG4AudioConfig cfg; |
|
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
425 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
|
426 st->codec->extradata_size); |
|
3362
0dfa207c5d69
aac chan config is 0 if bitstream contains program_config_element
bcoudurier
parents:
3313
diff
changeset
|
427 if (cfg.chan_config > 7) |
|
3262
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
428 return -1; |
|
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
429 st->codec->channels = ff_mpeg4audio_channels[cfg.chan_config]; |
|
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
430 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
|
431 st->codec->sample_rate = ff_mpa_freq_tab[cfg.sampling_index]; |
|
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
432 else |
|
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
433 st->codec->sample_rate = cfg.sample_rate; // ext sample rate ? |
|
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
434 dprintf(c->fc, "mp4a config channels %d obj %d ext obj %d " |
|
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
435 "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
|
436 cfg.object_type, cfg.ext_object_type, |
|
07299732f3b8
set channels and sample rate from mpeg4audio config
bcoudurier
parents:
3261
diff
changeset
|
437 cfg.sample_rate, cfg.ext_sample_rate); |
|
3261
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
438 if (!(st->codec->codec_id = codec_get_id(mp4_audio_types, |
|
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
439 cfg.object_type))) |
|
bf5f112efcff
parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
bcoudurier
parents:
3260
diff
changeset
|
440 st->codec->codec_id = CODEC_ID_AAC; |
| 3077 | 441 } |
| 1845 | 442 } |
| 443 } | |
| 444 return 0; | |
| 445 } | |
| 446 | |
| 4080 | 447 static int mov_read_pasp(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 448 { | |
| 449 const int num = get_be32(pb); | |
| 450 const int den = get_be32(pb); | |
| 451 AVStream * const st = c->fc->streams[c->fc->nb_streams-1]; | |
| 452 if (den != 0) { | |
|
4264
bf7a9658de71
change sample aspect ratio test to be more clear, print old one
bcoudurier
parents:
4251
diff
changeset
|
453 if ((st->sample_aspect_ratio.den != 1 || st->sample_aspect_ratio.num) && // default |
|
bf7a9658de71
change sample aspect ratio test to be more clear, print old one
bcoudurier
parents:
4251
diff
changeset
|
454 (den != st->sample_aspect_ratio.den || num != st->sample_aspect_ratio.num)) |
| 4080 | 455 av_log(c->fc, AV_LOG_WARNING, |
|
4264
bf7a9658de71
change sample aspect ratio test to be more clear, print old one
bcoudurier
parents:
4251
diff
changeset
|
456 "sample aspect ratio already set to %d:%d, overriding by 'pasp' atom\n", |
|
bf7a9658de71
change sample aspect ratio test to be more clear, print old one
bcoudurier
parents:
4251
diff
changeset
|
457 st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); |
| 4080 | 458 st->sample_aspect_ratio.num = num; |
| 459 st->sample_aspect_ratio.den = den; | |
| 460 } | |
| 461 return 0; | |
| 462 } | |
| 463 | |
| 1845 | 464 /* this atom contains actual media data */ |
| 4079 | 465 static int mov_read_mdat(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 466 { |
| 467 if(atom.size == 0) /* wrong one (MP4) */ | |
| 468 return 0; | |
| 469 c->found_mdat=1; | |
| 470 return 0; /* now go for moov */ | |
| 471 } | |
| 472 | |
| 4079 | 473 static int mov_read_ftyp(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 474 { |
| 475 uint32_t type = get_le32(pb); | |
| 476 | |
| 477 if (type != MKTAG('q','t',' ',' ')) | |
| 478 c->isom = 1; | |
| 479 av_log(c->fc, AV_LOG_DEBUG, "ISO: File Type Major Brand: %.4s\n",(char *)&type); | |
| 480 get_be32(pb); /* minor version */ | |
| 481 url_fskip(pb, atom.size - 8); | |
| 482 return 0; | |
| 483 } | |
| 484 | |
| 485 /* this atom should contain all header atoms */ | |
| 4079 | 486 static int mov_read_moov(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 487 { |
|
2806
1ce39cda4a59
check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents:
2794
diff
changeset
|
488 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
|
489 return -1; |
| 1845 | 490 /* we parsed the 'moov' atom, we can terminate the parsing as soon as we find the 'mdat' */ |
| 491 /* so we don't parse the whole file if over a network */ | |
| 492 c->found_moov=1; | |
| 493 return 0; /* now go for mdat */ | |
| 494 } | |
| 495 | |
| 4079 | 496 static int mov_read_moof(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 3169 | 497 { |
| 498 c->fragment.moof_offset = url_ftell(pb) - 8; | |
| 499 dprintf(c->fc, "moof offset %llx\n", c->fragment.moof_offset); | |
| 500 return mov_read_default(c, pb, atom); | |
| 501 } | |
| 1845 | 502 |
| 4079 | 503 static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 504 { |
| 505 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 2006 | 506 MOVStreamContext *sc = st->priv_data; |
| 1845 | 507 int version = get_byte(pb); |
| 4485 | 508 char language[4] = {0}; |
| 4269 | 509 unsigned lang; |
| 1845 | 510 |
| 511 if (version > 1) | |
| 3259 | 512 return -1; /* unsupported */ |
| 1845 | 513 |
| 3145 | 514 get_be24(pb); /* flags */ |
| 1845 | 515 if (version == 1) { |
| 516 get_be64(pb); | |
| 517 get_be64(pb); | |
| 518 } else { | |
| 519 get_be32(pb); /* creation time */ | |
| 520 get_be32(pb); /* modification time */ | |
| 521 } | |
| 522 | |
| 523 sc->time_scale = get_be32(pb); | |
| 524 st->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */ | |
| 525 | |
| 526 lang = get_be16(pb); /* language */ | |
| 4485 | 527 if (ff_mov_lang_to_iso639(lang, language)) |
| 528 av_metadata_set(&st->metadata, "language", language); | |
| 1845 | 529 get_be16(pb); /* quality */ |
| 530 | |
| 531 return 0; | |
| 532 } | |
| 533 | |
| 4079 | 534 static int mov_read_mvhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 535 { |
| 536 int version = get_byte(pb); /* version */ | |
| 3145 | 537 get_be24(pb); /* flags */ |
| 1845 | 538 |
| 539 if (version == 1) { | |
| 540 get_be64(pb); | |
| 541 get_be64(pb); | |
| 542 } else { | |
| 543 get_be32(pb); /* creation time */ | |
| 544 get_be32(pb); /* modification time */ | |
| 545 } | |
| 546 c->time_scale = get_be32(pb); /* time scale */ | |
| 2044 | 547 |
| 548 dprintf(c->fc, "time scale = %i\n", c->time_scale); | |
| 549 | |
| 1845 | 550 c->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */ |
| 551 get_be32(pb); /* preferred scale */ | |
| 552 | |
| 553 get_be16(pb); /* preferred volume */ | |
| 554 | |
| 555 url_fskip(pb, 10); /* reserved */ | |
| 556 | |
| 557 url_fskip(pb, 36); /* display matrix */ | |
| 558 | |
| 559 get_be32(pb); /* preview time */ | |
| 560 get_be32(pb); /* preview duration */ | |
| 561 get_be32(pb); /* poster time */ | |
| 562 get_be32(pb); /* selection time */ | |
| 563 get_be32(pb); /* selection duration */ | |
| 564 get_be32(pb); /* current time */ | |
| 565 get_be32(pb); /* next track ID */ | |
| 566 | |
| 567 return 0; | |
| 568 } | |
| 569 | |
| 4079 | 570 static int mov_read_smi(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 571 { |
| 572 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 573 | |
| 574 if((uint64_t)atom.size > (1<<30)) | |
| 575 return -1; | |
| 576 | |
| 577 // currently SVQ3 decoder expect full STSD header - so let's fake it | |
| 578 // this should be fixed and just SMI header should be passed | |
| 579 av_free(st->codec->extradata); | |
| 3076 | 580 st->codec->extradata = av_mallocz(atom.size + 0x5a + FF_INPUT_BUFFER_PADDING_SIZE); |
| 581 if (!st->codec->extradata) | |
| 582 return AVERROR(ENOMEM); | |
| 3077 | 583 st->codec->extradata_size = 0x5a + atom.size; |
| 584 memcpy(st->codec->extradata, "SVQ3", 4); // fake | |
| 585 get_buffer(pb, st->codec->extradata + 0x5a, atom.size); | |
| 586 dprintf(c->fc, "Reading SMI %"PRId64" %s\n", atom.size, st->codec->extradata + 0x5a); | |
| 1845 | 587 return 0; |
| 588 } | |
| 589 | |
| 4079 | 590 static int mov_read_enda(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 591 { |
| 592 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 593 int little_endian = get_be16(pb); | |
| 594 | |
|
4184
bc40129f13cc
only set le if value is 1, fix boom5.mov, issue #770
bcoudurier
parents:
4123
diff
changeset
|
595 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
|
596 if (little_endian == 1) { |
| 1845 | 597 switch (st->codec->codec_id) { |
| 598 case CODEC_ID_PCM_S24BE: | |
| 599 st->codec->codec_id = CODEC_ID_PCM_S24LE; | |
| 600 break; | |
| 601 case CODEC_ID_PCM_S32BE: | |
| 602 st->codec->codec_id = CODEC_ID_PCM_S32LE; | |
| 603 break; | |
|
3738
0c46eb1cd9b3
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents:
3626
diff
changeset
|
604 case CODEC_ID_PCM_F32BE: |
|
0c46eb1cd9b3
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents:
3626
diff
changeset
|
605 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
|
606 break; |
|
0c46eb1cd9b3
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents:
3626
diff
changeset
|
607 case CODEC_ID_PCM_F64BE: |
|
0c46eb1cd9b3
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
pross
parents:
3626
diff
changeset
|
608 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
|
609 break; |
| 1845 | 610 default: |
| 611 break; | |
| 612 } | |
| 613 } | |
| 614 return 0; | |
| 615 } | |
| 616 | |
| 617 /* FIXME modify qdm2/svq3/h264 decoders to take full atom as extradata */ | |
| 4079 | 618 static int mov_read_extradata(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 619 { |
|
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
|
620 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
|
621 uint64_t size; |
|
2589
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
622 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
|
623 |
|
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
|
624 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
|
625 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
|
626 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
|
627 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
|
628 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
|
629 return -1; |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
630 buf= av_realloc(st->codec->extradata, size); |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
631 if(!buf) |
| 1845 | 632 return -1; |
|
2589
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
633 st->codec->extradata= buf; |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
634 buf+= st->codec->extradata_size; |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
635 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
|
636 AV_WB32( buf , atom.size + 8); |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
637 AV_WL32( buf + 4, atom.type); |
|
960795567b33
append extradata atoms when parsing, fix OLOCOONS_O3.mov
bcoudurier
parents:
2547
diff
changeset
|
638 get_buffer(pb, buf + 8, atom.size); |
| 1845 | 639 return 0; |
| 640 } | |
| 641 | |
| 4079 | 642 static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 643 { |
| 644 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 645 | |
| 646 if((uint64_t)atom.size > (1<<30)) | |
| 647 return -1; | |
| 648 | |
| 649 if (st->codec->codec_id == CODEC_ID_QDM2) { | |
| 650 // pass all frma atom to codec, needed at least for QDM2 | |
| 651 av_free(st->codec->extradata); | |
| 3076 | 652 st->codec->extradata = av_mallocz(atom.size + FF_INPUT_BUFFER_PADDING_SIZE); |
| 653 if (!st->codec->extradata) | |
| 654 return AVERROR(ENOMEM); | |
| 1845 | 655 st->codec->extradata_size = atom.size; |
| 3076 | 656 get_buffer(pb, st->codec->extradata, atom.size); |
| 1845 | 657 } 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
|
658 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
|
659 return -1; |
| 1845 | 660 } else |
| 661 url_fskip(pb, atom.size); | |
| 662 return 0; | |
| 663 } | |
| 664 | |
|
2837
1caef0e2fb46
supports glbl atom containing generic extradata for all codecs
bcoudurier
parents:
2826
diff
changeset
|
665 /** |
|
1caef0e2fb46
supports glbl atom containing generic extradata for all codecs
bcoudurier
parents:
2826
diff
changeset
|
666 * 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
|
667 * nor size unlike mov_read_extradata. |
|
1caef0e2fb46
supports glbl atom containing generic extradata for all codecs
bcoudurier
parents:
2826
diff
changeset
|
668 */ |
| 4079 | 669 static int mov_read_glbl(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 670 { |
| 671 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 672 | |
| 673 if((uint64_t)atom.size > (1<<30)) | |
| 674 return -1; | |
| 675 | |
| 676 av_free(st->codec->extradata); | |
| 3076 | 677 st->codec->extradata = av_mallocz(atom.size + FF_INPUT_BUFFER_PADDING_SIZE); |
| 678 if (!st->codec->extradata) | |
| 679 return AVERROR(ENOMEM); | |
| 1845 | 680 st->codec->extradata_size = atom.size; |
| 3076 | 681 get_buffer(pb, st->codec->extradata, atom.size); |
| 1845 | 682 return 0; |
| 683 } | |
| 684 | |
| 4079 | 685 static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 686 { |
| 687 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 2006 | 688 MOVStreamContext *sc = st->priv_data; |
| 1845 | 689 unsigned int i, entries; |
| 690 | |
| 691 get_byte(pb); /* version */ | |
| 3145 | 692 get_be24(pb); /* flags */ |
| 1845 | 693 |
| 694 entries = get_be32(pb); | |
| 695 | |
| 696 if(entries >= UINT_MAX/sizeof(int64_t)) | |
| 697 return -1; | |
| 698 | |
| 699 sc->chunk_offsets = av_malloc(entries * sizeof(int64_t)); | |
| 700 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
|
701 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
|
702 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
|
703 |
| 3254 | 704 if (atom.type == MKTAG('s','t','c','o')) |
| 705 for(i=0; i<entries; i++) | |
| 1845 | 706 sc->chunk_offsets[i] = get_be32(pb); |
| 3254 | 707 else if (atom.type == MKTAG('c','o','6','4')) |
| 708 for(i=0; i<entries; i++) | |
| 1845 | 709 sc->chunk_offsets[i] = get_be64(pb); |
| 3254 | 710 else |
| 1845 | 711 return -1; |
| 712 | |
| 713 return 0; | |
| 714 } | |
| 715 | |
| 3625 | 716 /** |
| 717 * Compute codec id for 'lpcm' tag. | |
| 718 * See CoreAudioTypes and AudioStreamBasicDescription at Apple. | |
| 719 */ | |
| 3967 | 720 static enum CodecID mov_get_lpcm_codec_id(int bps, int flags) |
| 3625 | 721 { |
| 722 if (flags & 1) { // floating point | |
| 723 if (flags & 2) { // big endian | |
| 724 if (bps == 32) return CODEC_ID_PCM_F32BE; | |
| 3751 | 725 else if (bps == 64) return CODEC_ID_PCM_F64BE; |
| 3625 | 726 } else { |
| 3751 | 727 if (bps == 32) return CODEC_ID_PCM_F32LE; |
| 728 else if (bps == 64) return CODEC_ID_PCM_F64LE; | |
| 3625 | 729 } |
| 730 } else { | |
| 731 if (flags & 2) { | |
| 732 if (bps == 8) | |
| 733 // signed integer | |
| 734 if (flags & 4) return CODEC_ID_PCM_S8; | |
| 735 else return CODEC_ID_PCM_U8; | |
| 736 else if (bps == 16) return CODEC_ID_PCM_S16BE; | |
| 737 else if (bps == 24) return CODEC_ID_PCM_S24BE; | |
| 738 else if (bps == 32) return CODEC_ID_PCM_S32BE; | |
| 739 } else { | |
| 740 if (bps == 8) | |
| 741 if (flags & 4) return CODEC_ID_PCM_S8; | |
| 742 else return CODEC_ID_PCM_U8; | |
| 3626 | 743 else if (bps == 16) return CODEC_ID_PCM_S16LE; |
| 3625 | 744 else if (bps == 24) return CODEC_ID_PCM_S24LE; |
| 745 else if (bps == 32) return CODEC_ID_PCM_S32LE; | |
| 746 } | |
| 747 } | |
| 3967 | 748 return CODEC_ID_NONE; |
| 3625 | 749 } |
| 750 | |
| 4079 | 751 static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 752 { |
| 753 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 2006 | 754 MOVStreamContext *sc = st->priv_data; |
| 3263 | 755 int j, entries, pseudo_stream_id; |
| 1845 | 756 |
| 757 get_byte(pb); /* version */ | |
| 3145 | 758 get_be24(pb); /* flags */ |
| 1845 | 759 |
| 760 entries = get_be32(pb); | |
| 761 | |
| 3167 | 762 for(pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) { |
| 763 //Parsing Sample description table | |
| 1845 | 764 enum CodecID id; |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
765 int dref_id; |
| 4079 | 766 MOVAtom a = { 0, 0, 0 }; |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3967
diff
changeset
|
767 int64_t start_pos = url_ftell(pb); |
| 1845 | 768 int size = get_be32(pb); /* size */ |
| 3263 | 769 uint32_t format = get_le32(pb); /* data format */ |
| 1845 | 770 |
| 771 get_be32(pb); /* reserved */ | |
| 772 get_be16(pb); /* reserved */ | |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
773 dref_id = get_be16(pb); |
| 1845 | 774 |
|
3022
800db1ceafc6
Allow the user to select which codec out of several in stsd he wants.
michael
parents:
2974
diff
changeset
|
775 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
|
776 st->codec->codec_tag != format && |
|
3022
800db1ceafc6
Allow the user to select which codec out of several in stsd he wants.
michael
parents:
2974
diff
changeset
|
777 (c->fc->video_codec_id ? codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id |
| 3253 | 778 : 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
|
779 ){ |
| 3135 | 780 /* Multiple fourcc, we skip JPEG. This is not correct, we should |
| 781 * export it as a separate AVStream but this needs a few changes | |
| 782 * in the MOV demuxer, patch welcome. */ | |
| 3300 | 783 av_log(c->fc, AV_LOG_WARNING, "multiple fourcc not supported\n"); |
| 1845 | 784 url_fskip(pb, size - (url_ftell(pb) - start_pos)); |
| 785 continue; | |
| 786 } | |
|
3299
80a497804aa8
demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451
bcoudurier
parents:
3286
diff
changeset
|
787 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
|
788 sc->dref_id= dref_id; |
| 1845 | 789 |
| 790 st->codec->codec_tag = format; | |
|
1847
922180a45610
recommit of the change below after reverting earlier cosmetic-functional mix
michael
parents:
1846
diff
changeset
|
791 id = codec_get_id(codec_movaudio_tags, format); |
| 3253 | 792 if (id<=0 && (format&0xFFFF) == 'm'+('s'<<8)) |
| 2298 | 793 id = codec_get_id(codec_wav_tags, bswap_32(format)&0xFFFF); |
| 794 | |
| 1845 | 795 if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) { |
| 796 st->codec->codec_type = CODEC_TYPE_AUDIO; | |
| 797 } else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */ | |
| 3253 | 798 format && format != MKTAG('m','p','4','s')) { /* skip old asf mpeg4 tag */ |
|
1847
922180a45610
recommit of the change below after reverting earlier cosmetic-functional mix
michael
parents:
1846
diff
changeset
|
799 id = codec_get_id(codec_movvideo_tags, format); |
| 1845 | 800 if (id <= 0) |
| 801 id = codec_get_id(codec_bmp_tags, format); | |
| 802 if (id > 0) | |
| 803 st->codec->codec_type = CODEC_TYPE_VIDEO; | |
| 2969 | 804 else if(st->codec->codec_type == CODEC_TYPE_DATA){ |
| 805 id = codec_get_id(ff_codec_movsubtitle_tags, format); | |
| 806 if(id > 0) | |
| 807 st->codec->codec_type = CODEC_TYPE_SUBTITLE; | |
| 808 } | |
| 1845 | 809 } |
| 810 | |
| 2902 | 811 dprintf(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n", size, |
| 812 (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, | |
| 813 (format >> 24) & 0xff, st->codec->codec_type); | |
| 1845 | 814 |
| 815 if(st->codec->codec_type==CODEC_TYPE_VIDEO) { | |
| 3263 | 816 uint8_t codec_name[32]; |
| 817 unsigned int color_depth; | |
| 818 int color_greyscale; | |
| 819 | |
| 1845 | 820 st->codec->codec_id = id; |
| 821 get_be16(pb); /* version */ | |
| 822 get_be16(pb); /* revision level */ | |
| 823 get_be32(pb); /* vendor */ | |
| 824 get_be32(pb); /* temporal quality */ | |
| 2730 | 825 get_be32(pb); /* spatial quality */ |
| 1845 | 826 |
| 827 st->codec->width = get_be16(pb); /* width */ | |
| 828 st->codec->height = get_be16(pb); /* height */ | |
| 829 | |
| 830 get_be32(pb); /* horiz resolution */ | |
| 831 get_be32(pb); /* vert resolution */ | |
| 832 get_be32(pb); /* data size, always 0 */ | |
| 3264 | 833 get_be16(pb); /* frames per samples */ |
| 2044 | 834 |
| 3265 | 835 get_buffer(pb, codec_name, 32); /* codec name, pascal string */ |
| 1845 | 836 if (codec_name[0] <= 31) { |
| 837 memcpy(st->codec->codec_name, &codec_name[1],codec_name[0]); | |
| 838 st->codec->codec_name[codec_name[0]] = 0; | |
| 839 } | |
| 840 | |
|
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3796
diff
changeset
|
841 st->codec->bits_per_coded_sample = get_be16(pb); /* depth */ |
| 1845 | 842 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
|
843 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
|
844 st->codec->bits_per_coded_sample, st->codec->color_table_id); |
| 1845 | 845 /* 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
|
846 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
|
847 color_greyscale = st->codec->bits_per_coded_sample & 0x20; |
| 1845 | 848 |
| 849 /* if the depth is 2, 4, or 8 bpp, file is palettized */ | |
| 850 if ((color_depth == 2) || (color_depth == 4) || | |
| 851 (color_depth == 8)) { | |
| 3257 | 852 /* for palette traversal */ |
| 853 unsigned int color_start, color_count, color_end; | |
| 854 unsigned char r, g, b; | |
| 855 | |
| 4719 | 856 st->codec->palctrl = av_malloc(sizeof(*st->codec->palctrl)); |
| 1845 | 857 if (color_greyscale) { |
| 3257 | 858 int color_index, color_dec; |
| 1845 | 859 /* compute the greyscale palette */ |
|
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3796
diff
changeset
|
860 st->codec->bits_per_coded_sample = color_depth; |
| 1845 | 861 color_count = 1 << color_depth; |
| 862 color_index = 255; | |
| 863 color_dec = 256 / (color_count - 1); | |
| 864 for (j = 0; j < color_count; j++) { | |
| 865 r = g = b = color_index; | |
| 4719 | 866 st->codec->palctrl->palette[j] = |
| 1845 | 867 (r << 16) | (g << 8) | (b); |
| 868 color_index -= color_dec; | |
| 869 if (color_index < 0) | |
| 870 color_index = 0; | |
| 871 } | |
|
3179
5f56b694f9bf
according to specs, only color table id set to 0, have it in stsd, fix 4colors.mov
bcoudurier
parents:
3178
diff
changeset
|
872 } else if (st->codec->color_table_id) { |
| 3257 | 873 const uint8_t *color_table; |
| 1845 | 874 /* if flag bit 3 is set, use the default palette */ |
| 875 color_count = 1 << color_depth; | |
| 876 if (color_depth == 2) | |
| 877 color_table = ff_qt_default_palette_4; | |
| 878 else if (color_depth == 4) | |
| 879 color_table = ff_qt_default_palette_16; | |
| 880 else | |
| 881 color_table = ff_qt_default_palette_256; | |
| 882 | |
| 883 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
|
884 r = color_table[j * 3 + 0]; |
|
d5ae967cc549
Remove alpha channel from default colorspace tables, since it is unused. See
rbultje
parents:
4782
diff
changeset
|
885 g = color_table[j * 3 + 1]; |
|
d5ae967cc549
Remove alpha channel from default colorspace tables, since it is unused. See
rbultje
parents:
4782
diff
changeset
|
886 b = color_table[j * 3 + 2]; |
| 4719 | 887 st->codec->palctrl->palette[j] = |
| 1845 | 888 (r << 16) | (g << 8) | (b); |
| 889 } | |
| 890 } else { | |
| 891 /* load the palette from the file */ | |
| 892 color_start = get_be32(pb); | |
| 893 color_count = get_be16(pb); | |
| 894 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
|
895 if ((color_start <= 255) && |
|
17086a526938
Check sanity in the palette loading operation. The addresses a potential security risk in
melanson
parents:
2807
diff
changeset
|
896 (color_end <= 255)) { |
| 2810 | 897 for (j = color_start; j <= color_end; j++) { |
| 898 /* each R, G, or B component is 16 bits; | |
| 899 * only use the top 8 bits; skip alpha bytes | |
| 900 * up front */ | |
| 901 get_byte(pb); | |
| 902 get_byte(pb); | |
| 903 r = get_byte(pb); | |
| 904 get_byte(pb); | |
| 905 g = get_byte(pb); | |
| 906 get_byte(pb); | |
| 907 b = get_byte(pb); | |
| 908 get_byte(pb); | |
| 4719 | 909 st->codec->palctrl->palette[j] = |
| 2810 | 910 (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
|
911 } |
| 1845 | 912 } |
| 913 } | |
| 914 st->codec->palctrl->palette_changed = 1; | |
| 4719 | 915 } |
| 1845 | 916 } else if(st->codec->codec_type==CODEC_TYPE_AUDIO) { |
| 3622 | 917 int bits_per_sample, flags; |
| 1845 | 918 uint16_t version = get_be16(pb); |
| 919 | |
| 920 st->codec->codec_id = id; | |
| 921 get_be16(pb); /* revision level */ | |
| 922 get_be32(pb); /* vendor */ | |
| 923 | |
| 924 st->codec->channels = get_be16(pb); /* channel count */ | |
| 1907 | 925 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
|
926 st->codec->bits_per_coded_sample = get_be16(pb); /* sample size */ |
| 1845 | 927 |
|
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
|
928 sc->audio_cid = get_be16(pb); |
| 1845 | 929 get_be16(pb); /* packet size = 0 */ |
| 930 | |
| 931 st->codec->sample_rate = ((get_be32(pb) >> 16)); | |
| 932 | |
|
3619
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
933 //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
|
934 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
|
935 if(!c->isom) { |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
936 if(version==1) { |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
937 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
|
938 get_be32(pb); /* bytes per packet */ |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
939 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
|
940 get_be32(pb); /* bytes per sample */ |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
941 } else if(version==2) { |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
942 get_be32(pb); /* sizeof struct only */ |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
943 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
|
944 st->codec->channels = get_be32(pb); |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
945 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
|
946 st->codec->bits_per_coded_sample = get_be32(pb); /* bits per channel if sound is uncompressed */ |
| 3622 | 947 flags = get_be32(pb); /* lcpm format specific flag */ |
| 3620 | 948 sc->bytes_per_frame = get_be32(pb); /* bytes per audio packet if constant */ |
| 949 sc->samples_per_frame = get_be32(pb); /* lpcm frames per audio packet if constant */ | |
| 3625 | 950 if (format == MKTAG('l','p','c','m')) |
|
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3796
diff
changeset
|
951 st->codec->codec_id = mov_get_lpcm_codec_id(st->codec->bits_per_coded_sample, flags); |
|
3619
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
952 } |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
953 } |
|
bd4b7c8fec83
move version specific parsing code before codec specific code, will be needed
bcoudurier
parents:
3615
diff
changeset
|
954 |
| 1845 | 955 switch (st->codec->codec_id) { |
| 956 case CODEC_ID_PCM_S8: | |
| 957 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
|
958 if (st->codec->bits_per_coded_sample == 16) |
| 1845 | 959 st->codec->codec_id = CODEC_ID_PCM_S16BE; |
| 960 break; | |
| 961 case CODEC_ID_PCM_S16LE: | |
| 962 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
|
963 if (st->codec->bits_per_coded_sample == 8) |
| 1845 | 964 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
|
965 else if (st->codec->bits_per_coded_sample == 24) |
|
3621
0415fc41780a
keep original codec/fourcc endianness, fix XDCAMHD.mov
bcoudurier
parents:
3620
diff
changeset
|
966 st->codec->codec_id = |
|
0415fc41780a
keep original codec/fourcc endianness, fix XDCAMHD.mov
bcoudurier
parents:
3620
diff
changeset
|
967 st->codec->codec_id == CODEC_ID_PCM_S16BE ? |
|
0415fc41780a
keep original codec/fourcc endianness, fix XDCAMHD.mov
bcoudurier
parents:
3620
diff
changeset
|
968 CODEC_ID_PCM_S24BE : CODEC_ID_PCM_S24LE; |
| 1845 | 969 break; |
|
3036
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
970 /* 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
|
971 case CODEC_ID_MACE3: |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
972 sc->samples_per_frame = 6; |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
973 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
|
974 break; |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
975 case CODEC_ID_MACE6: |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
976 sc->samples_per_frame = 6; |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
977 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
|
978 break; |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
979 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
|
980 sc->samples_per_frame = 64; |
|
62181fbfc128
remove messy and not always correct chunk size workaround, use correct values instead
bcoudurier
parents:
3034
diff
changeset
|
981 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
|
982 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
|
983 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
|
984 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
|
985 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
|
986 break; |
| 1845 | 987 default: |
| 988 break; | |
| 989 } | |
| 990 | |
| 991 bits_per_sample = av_get_bits_per_sample(st->codec->codec_id); | |
| 992 if (bits_per_sample) { | |
|
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3796
diff
changeset
|
993 st->codec->bits_per_coded_sample = bits_per_sample; |
| 1845 | 994 sc->sample_size = (bits_per_sample >> 3) * st->codec->channels; |
| 995 } | |
|
2972
bc330130bdce
Set subtitle codec id correctly, i hope this does not break anything.
michael
parents:
2970
diff
changeset
|
996 } else if(st->codec->codec_type==CODEC_TYPE_SUBTITLE){ |
|
4192
a48a6a414dfe
Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text
conrad
parents:
4184
diff
changeset
|
997 // ttxt stsd contains display flags, justification, background |
|
a48a6a414dfe
Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text
conrad
parents:
4184
diff
changeset
|
998 // 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
|
999 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
|
1000 if (format != AV_RL32("mp4s")) // mp4s contains a regular esds atom |
|
4192
a48a6a414dfe
Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text
conrad
parents:
4184
diff
changeset
|
1001 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
|
1002 st->codec->codec_id= id; |
| 4202 | 1003 st->codec->width = sc->width; |
| 1004 st->codec->height = sc->height; | |
| 1845 | 1005 } else { |
| 1006 /* other codec type, just skip (rtp, mp4s, tmcd ...) */ | |
| 1007 url_fskip(pb, size - (url_ftell(pb) - start_pos)); | |
| 1008 } | |
| 1009 /* this will read extra atoms at the end (wave, alac, damr, avcC, SMI ...) */ | |
| 1010 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
|
1011 if (a.size > 8) { |
|
1ce39cda4a59
check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents:
2794
diff
changeset
|
1012 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
|
1013 return -1; |
|
1ce39cda4a59
check mov_read_default return value where appropriate, patch by takis, fix issue 285
bcoudurier
parents:
2794
diff
changeset
|
1014 } else if (a.size > 0) |
| 1845 | 1015 url_fskip(pb, a.size); |
| 1016 } | |
| 1017 | |
| 3084 | 1018 if(st->codec->codec_type==CODEC_TYPE_AUDIO && st->codec->sample_rate==0 && sc->time_scale>1) |
| 1845 | 1019 st->codec->sample_rate= sc->time_scale; |
| 1020 | |
| 1021 /* special codec parameters handling */ | |
| 1022 switch (st->codec->codec_id) { | |
| 4206 | 1023 #if CONFIG_DV_DEMUXER |
| 1845 | 1024 case CODEC_ID_DVAUDIO: |
|
4406
146d6083662b
Replace the calls to the deprecated av_alloc_format_context() with
stefano
parents:
4399
diff
changeset
|
1025 c->dv_fctx = avformat_alloc_context(); |
| 1845 | 1026 c->dv_demux = dv_init_demux(c->dv_fctx); |
| 1027 if (!c->dv_demux) { | |
| 1028 av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n"); | |
| 1029 return -1; | |
| 1030 } | |
| 1031 sc->dv_audio_container = 1; | |
| 1032 st->codec->codec_id = CODEC_ID_PCM_S16LE; | |
| 1033 break; | |
| 1034 #endif | |
| 1035 /* 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
|
1036 case CODEC_ID_QCELP: |
|
4056
a6a5fe159af7
Commit last ok'ed parts of QCELP decoder and enable it.
vitor
parents:
4054
diff
changeset
|
1037 st->codec->frame_size= 160; |
| 4054 | 1038 st->codec->channels= 1; /* really needed */ |
|
4056
a6a5fe159af7
Commit last ok'ed parts of QCELP decoder and enable it.
vitor
parents:
4054
diff
changeset
|
1039 break; |
|
3256
b09eff5b0e89
parser should not be needed anymore, merge cases and set frame size for amr too
bcoudurier
parents:
3255
diff
changeset
|
1040 case CODEC_ID_AMR_NB: |
| 3933 | 1041 case CODEC_ID_AMR_WB: |
| 3258 | 1042 st->codec->frame_size= sc->samples_per_frame; |
| 1845 | 1043 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
|
1044 /* force sample rate for amr, stsd in 3gp does not store sample rate */ |
| 3989 | 1045 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
|
1046 st->codec->sample_rate = 8000; |
| 3989 | 1047 else if (st->codec->codec_id == CODEC_ID_AMR_WB) |
| 1048 st->codec->sample_rate = 16000; | |
| 1845 | 1049 break; |
| 1050 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
|
1051 case CODEC_ID_MP3: |
| 1845 | 1052 st->codec->codec_type = CODEC_TYPE_AUDIO; /* force type after stsd for m1a hdlr */ |
| 2023 | 1053 st->need_parsing = AVSTREAM_PARSE_FULL; |
| 1845 | 1054 break; |
| 3187 | 1055 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
|
1056 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
|
1057 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
|
1058 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
|
1059 break; |
| 3242 | 1060 case CODEC_ID_ALAC: |
|
4122
30262468fff4
set alac channels from extradata, fix alac mono in m4a
bcoudurier
parents:
4116
diff
changeset
|
1061 if (st->codec->extradata_size == 36) { |
|
4123
e536841c1aeb
cosmetics, remove useless parenthesis and whitespaces
bcoudurier
parents:
4122
diff
changeset
|
1062 st->codec->frame_size = AV_RB32(st->codec->extradata+12); |
|
e536841c1aeb
cosmetics, remove useless parenthesis and whitespaces
bcoudurier
parents:
4122
diff
changeset
|
1063 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
|
1064 } |
| 3242 | 1065 break; |
| 1845 | 1066 default: |
| 1067 break; | |
| 1068 } | |
| 1069 | |
| 1070 return 0; | |
| 1071 } | |
| 1072 | |
| 4079 | 1073 static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1074 { |
| 1075 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 2006 | 1076 MOVStreamContext *sc = st->priv_data; |
| 1845 | 1077 unsigned int i, entries; |
| 1078 | |
| 1079 get_byte(pb); /* version */ | |
| 3145 | 1080 get_be24(pb); /* flags */ |
| 1845 | 1081 |
| 1082 entries = get_be32(pb); | |
| 1083 | |
| 2044 | 1084 dprintf(c->fc, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1, entries); |
| 1085 | |
|
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
|
1086 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
|
1087 return -1; |
| 4412 | 1088 sc->stsc_data = av_malloc(entries * sizeof(*sc->stsc_data)); |
| 1089 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
|
1090 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
|
1091 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
|
1092 |
| 1845 | 1093 for(i=0; i<entries; i++) { |
| 4412 | 1094 sc->stsc_data[i].first = get_be32(pb); |
| 1095 sc->stsc_data[i].count = get_be32(pb); | |
| 1096 sc->stsc_data[i].id = get_be32(pb); | |
| 1845 | 1097 } |
| 1098 return 0; | |
| 1099 } | |
| 1100 | |
| 4079 | 1101 static int mov_read_stss(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1102 { |
| 1103 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 2006 | 1104 MOVStreamContext *sc = st->priv_data; |
| 1845 | 1105 unsigned int i, entries; |
| 1106 | |
| 1107 get_byte(pb); /* version */ | |
| 3145 | 1108 get_be24(pb); /* flags */ |
| 1845 | 1109 |
| 1110 entries = get_be32(pb); | |
| 1111 | |
|
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
|
1112 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
|
1113 |
| 2030 | 1114 if(entries >= UINT_MAX / sizeof(int)) |
| 1845 | 1115 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
|
1116 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
|
1117 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
|
1118 return AVERROR(ENOMEM); |
| 1845 | 1119 sc->keyframe_count = entries; |
| 2044 | 1120 |
| 1845 | 1121 for(i=0; i<entries; i++) { |
| 1122 sc->keyframes[i] = get_be32(pb); | |
| 2044 | 1123 //dprintf(c->fc, "keyframes[]=%d\n", sc->keyframes[i]); |
| 1845 | 1124 } |
| 1125 return 0; | |
| 1126 } | |
| 1127 | |
| 4079 | 1128 static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1129 { |
| 1130 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 2006 | 1131 MOVStreamContext *sc = st->priv_data; |
| 4739 | 1132 unsigned int i, entries, sample_size, field_size, num_bytes; |
| 1133 GetBitContext gb; | |
| 1134 unsigned char* buf; | |
| 1845 | 1135 |
| 1136 get_byte(pb); /* version */ | |
| 3145 | 1137 get_be24(pb); /* flags */ |
| 1845 | 1138 |
| 4739 | 1139 if (atom.type == MKTAG('s','t','s','z')) { |
| 4740 | 1140 sample_size = get_be32(pb); |
| 1141 if (!sc->sample_size) /* do not overwrite value computed in stsd */ | |
| 1142 sc->sample_size = sample_size; | |
| 1143 field_size = 32; | |
| 4739 | 1144 } else { |
| 1145 sample_size = 0; | |
| 1146 get_be24(pb); /* reserved */ | |
| 1147 field_size = get_byte(pb); | |
| 1148 } | |
| 1845 | 1149 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
|
1150 |
|
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
|
1151 dprintf(c->fc, "sample_size = %d sample_count = %d\n", sc->sample_size, entries); |
| 1845 | 1152 |
| 1153 sc->sample_count = entries; | |
| 1154 if (sample_size) | |
| 1155 return 0; | |
| 1156 | |
| 4739 | 1157 if (field_size != 4 && field_size != 8 && field_size != 16 && field_size != 32) { |
| 1158 av_log(c->fc, AV_LOG_ERROR, "Invalid sample field size %d\n", field_size); | |
| 1159 return -1; | |
| 1160 } | |
| 1161 | |
|
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
|
1162 if(entries >= UINT_MAX / 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
|
1163 return -1; |
| 2030 | 1164 sc->sample_sizes = av_malloc(entries * sizeof(int)); |
| 1845 | 1165 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
|
1166 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
|
1167 |
| 4739 | 1168 num_bytes = (entries*field_size+4)>>3; |
| 1169 | |
|
4782
400ca65902d2
since code now use get_bits_long, allocate padding buffer
bcoudurier
parents:
4780
diff
changeset
|
1170 buf = av_malloc(num_bytes+FF_INPUT_BUFFER_PADDING_SIZE); |
| 4739 | 1171 if (!buf) { |
| 1172 av_freep(&sc->sample_sizes); | |
| 1173 return AVERROR(ENOMEM); | |
| 1174 } | |
| 1175 | |
| 1176 if (get_buffer(pb, buf, num_bytes) < num_bytes) { | |
| 1177 av_freep(&sc->sample_sizes); | |
| 1178 av_free(buf); | |
| 1179 return -1; | |
| 1180 } | |
| 1181 | |
| 1182 init_get_bits(&gb, buf, 8*num_bytes); | |
| 1183 | |
|
3156
487b1979f195
remove useless debug print since now mov_build_index will do
bcoudurier
parents:
3155
diff
changeset
|
1184 for(i=0; i<entries; i++) |
| 4739 | 1185 sc->sample_sizes[i] = get_bits_long(&gb, field_size); |
| 1186 | |
| 1187 av_free(buf); | |
| 1845 | 1188 return 0; |
| 1189 } | |
| 1190 | |
| 4079 | 1191 static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1192 { |
| 1193 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 2006 | 1194 MOVStreamContext *sc = st->priv_data; |
| 1845 | 1195 unsigned int i, entries; |
| 1196 int64_t duration=0; | |
| 1197 int64_t total_sample_count=0; | |
| 1198 | |
| 1199 get_byte(pb); /* version */ | |
| 3145 | 1200 get_be24(pb); /* flags */ |
| 1845 | 1201 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
|
1202 |
|
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
|
1203 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
|
1204 |
| 4079 | 1205 if(entries >= UINT_MAX / sizeof(*sc->stts_data)) |
| 1845 | 1206 return -1; |
| 4079 | 1207 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
|
1208 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
|
1209 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
|
1210 sc->stts_count = entries; |
| 1845 | 1211 |
| 1212 for(i=0; i<entries; i++) { | |
| 1213 int sample_duration; | |
| 1214 int sample_count; | |
| 1215 | |
| 1216 sample_count=get_be32(pb); | |
| 1217 sample_duration = get_be32(pb); | |
| 1218 sc->stts_data[i].count= sample_count; | |
| 1219 sc->stts_data[i].duration= sample_duration; | |
| 1220 | |
| 4242 | 1221 sc->time_rate= av_gcd(sc->time_rate, sample_duration); |
| 1845 | 1222 |
| 1907 | 1223 dprintf(c->fc, "sample_count=%d, sample_duration=%d\n",sample_count,sample_duration); |
| 1845 | 1224 |
| 1225 duration+=(int64_t)sample_duration*sample_count; | |
| 1226 total_sample_count+=sample_count; | |
| 1227 } | |
| 1228 | |
| 1229 st->nb_frames= total_sample_count; | |
| 1230 if(duration) | |
| 1231 st->duration= duration; | |
| 1232 return 0; | |
| 1233 } | |
| 1234 | |
| 4079 | 1235 static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1236 { |
| 1237 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; | |
| 2006 | 1238 MOVStreamContext *sc = st->priv_data; |
| 1845 | 1239 unsigned int i, entries; |
| 1240 | |
| 1241 get_byte(pb); /* version */ | |
| 3145 | 1242 get_be24(pb); /* flags */ |
| 1845 | 1243 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
|
1244 |
|
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
|
1245 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
|
1246 |
| 4079 | 1247 if(entries >= UINT_MAX / sizeof(*sc->ctts_data)) |
| 1845 | 1248 return -1; |
| 4079 | 1249 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
|
1250 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
|
1251 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
|
1252 sc->ctts_count = entries; |
| 1845 | 1253 |
| 1254 for(i=0; i<entries; i++) { | |
| 1255 int count =get_be32(pb); | |
| 1256 int duration =get_be32(pb); | |
| 1257 | |
| 1258 if (duration < 0) { | |
|
3956
8bdecea89071
support negative ctts in some way, unset wrong dts
bcoudurier
parents:
3935
diff
changeset
|
1259 sc->wrong_dts = 1; |
|
8bdecea89071
support negative ctts in some way, unset wrong dts
bcoudurier
parents:
3935
diff
changeset
|
1260 st->codec->has_b_frames = 1; |
| 1845 | 1261 } |
| 1262 sc->ctts_data[i].count = count; | |
| 1263 sc->ctts_data[i].duration= duration; | |
| 1264 | |
| 4242 | 1265 sc->time_rate= av_gcd(sc->time_rate, FFABS(duration)); |
| 1845 | 1266 } |
| 1267 return 0; | |
| 1268 } | |
| 1269 | |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1270 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
|
1271 { |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1272 MOVStreamContext *sc = st->priv_data; |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3967
diff
changeset
|
1273 int64_t current_offset; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1274 int64_t current_dts = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1275 unsigned int stts_index = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1276 unsigned int stsc_index = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1277 unsigned int stss_index = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1278 unsigned int i, j; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1279 |
|
4399
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
1280 /* 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
|
1281 if (sc->time_offset) { |
|
4742
0496cbd94374
Extend mov edit list support to work for a first padding entry with
reimar
parents:
4740
diff
changeset
|
1282 int rescaled = sc->time_offset < 0 ? av_rescale(sc->time_offset, sc->time_scale, mov->time_scale) : sc->time_offset; |
|
4399
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
1283 assert(sc->time_offset % sc->time_rate == 0); |
|
4742
0496cbd94374
Extend mov edit list support to work for a first padding entry with
reimar
parents:
4740
diff
changeset
|
1284 current_dts = - (rescaled / sc->time_rate); |
|
4790
0493d65debd7
set wrong_dts for iMovie created files which has huge ctts delay, fix ffmpeg_sample.m4v
bcoudurier
parents:
4786
diff
changeset
|
1285 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
|
1286 /* 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
|
1287 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
|
1288 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
|
1289 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
|
1290 } |
|
4399
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
1291 } |
|
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
1292 |
|
3178
73b7ef886091
Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
bcoudurier
parents:
3175
diff
changeset
|
1293 /* only use old uncompressed audio chunk demuxing when stts specifies it */ |
|
73b7ef886091
Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
bcoudurier
parents:
3175
diff
changeset
|
1294 if (!(st->codec->codec_type == CODEC_TYPE_AUDIO && |
|
73b7ef886091
Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
bcoudurier
parents:
3175
diff
changeset
|
1295 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
|
1296 unsigned int current_sample = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1297 unsigned int stts_sample = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1298 unsigned int keyframe, sample_size; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1299 unsigned int distance = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1300 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
|
1301 |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1302 st->nb_frames = sc->sample_count; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1303 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
|
1304 current_offset = sc->chunk_offsets[i]; |
| 4412 | 1305 if (stsc_index + 1 < sc->stsc_count && |
| 1306 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
|
1307 stsc_index++; |
| 4412 | 1308 for (j = 0; j < sc->stsc_data[stsc_index].count; j++) { |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1309 if (current_sample >= sc->sample_count) { |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1310 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
|
1311 return; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1312 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1313 keyframe = !sc->keyframe_count || current_sample+key_off == sc->keyframes[stss_index]; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1314 if (keyframe) { |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1315 distance = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1316 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
|
1317 stss_index++; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1318 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1319 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
|
1320 if(sc->pseudo_stream_id == -1 || |
| 4412 | 1321 sc->stsc_data[stsc_index].id - 1 == sc->pseudo_stream_id) { |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1322 av_add_index_entry(st, current_offset, current_dts, sample_size, distance, |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1323 keyframe ? AVINDEX_KEYFRAME : 0); |
|
3301
11b6da5ffe78
only print debug info when sample is actually added
bcoudurier
parents:
3300
diff
changeset
|
1324 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
|
1325 "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
|
1326 current_offset, current_dts, sample_size, distance, keyframe); |
|
11b6da5ffe78
only print debug info when sample is actually added
bcoudurier
parents:
3300
diff
changeset
|
1327 } |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1328 |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1329 current_offset += sample_size; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1330 assert(sc->stts_data[stts_index].duration % sc->time_rate == 0); |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1331 current_dts += sc->stts_data[stts_index].duration / sc->time_rate; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1332 distance++; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1333 stts_sample++; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1334 current_sample++; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1335 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
|
1336 stts_sample = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1337 stts_index++; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1338 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1339 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1340 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1341 } else { /* read whole chunk */ |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1342 unsigned int chunk_samples, chunk_size, chunk_duration; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1343 unsigned int frames = 1; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1344 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
|
1345 current_offset = sc->chunk_offsets[i]; |
| 4412 | 1346 if (stsc_index + 1 < sc->stsc_count && |
| 1347 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
|
1348 stsc_index++; |
| 4412 | 1349 chunk_samples = sc->stsc_data[stsc_index].count; |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1350 /* get chunk size, beware of alaw/ulaw/mace */ |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1351 if (sc->samples_per_frame > 0 && |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1352 (chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0)) { |
| 3255 | 1353 if (sc->samples_per_frame < 160) |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1354 chunk_size = chunk_samples * sc->bytes_per_frame / sc->samples_per_frame; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1355 else { |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1356 chunk_size = sc->bytes_per_frame; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1357 frames = chunk_samples / sc->samples_per_frame; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1358 chunk_samples = sc->samples_per_frame; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1359 } |
|
3173
cb3eb255f80d
sample size to 1 might happen for data, fix GMCMidiaASX.mov, fallback is better than failing
bcoudurier
parents:
3170
diff
changeset
|
1360 } else |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1361 chunk_size = chunk_samples * sc->sample_size; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1362 for (j = 0; j < frames; j++) { |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1363 av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME); |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1364 /* get chunk duration */ |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1365 chunk_duration = 0; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1366 while (chunk_samples > 0) { |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1367 if (chunk_samples < sc->stts_data[stts_index].count) { |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1368 chunk_duration += sc->stts_data[stts_index].duration * chunk_samples; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1369 sc->stts_data[stts_index].count -= chunk_samples; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1370 break; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1371 } else { |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1372 chunk_duration += sc->stts_data[stts_index].duration * chunk_samples; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1373 chunk_samples -= sc->stts_data[stts_index].count; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1374 if (stts_index + 1 < sc->stts_count) |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1375 stts_index++; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1376 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1377 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1378 current_offset += sc->bytes_per_frame; |
| 3167 | 1379 dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", " |
| 1380 "size %d, duration %d\n", st->index, i, current_offset, current_dts, | |
| 1381 chunk_size, chunk_duration); | |
|
3154
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1382 assert(chunk_duration % sc->time_rate == 0); |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1383 current_dts += chunk_duration / sc->time_rate; |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1384 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1385 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1386 } |
|
01f6f3c905db
move mov_build_index before mov_read_trak to avoid useless declaration
bcoudurier
parents:
3153
diff
changeset
|
1387 } |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1388 |
| 4079 | 1389 static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1390 { |
| 1391 AVStream *st; | |
| 1392 MOVStreamContext *sc; | |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1393 int ret; |
| 1845 | 1394 |
| 1395 st = av_new_stream(c->fc, c->fc->nb_streams); | |
| 3162 | 1396 if (!st) return AVERROR(ENOMEM); |
| 1845 | 1397 sc = av_mallocz(sizeof(MOVStreamContext)); |
|
3161
60be75aa8c47
cannot free AVStream like this, and return ENOMEM
bcoudurier
parents:
3160
diff
changeset
|
1398 if (!sc) return AVERROR(ENOMEM); |
| 1845 | 1399 |
| 1400 st->priv_data = sc; | |
| 1401 st->codec->codec_type = CODEC_TYPE_DATA; | |
|
4197
84251a788a67
move ffindex set before mov_read_default so it can be used in functions
bcoudurier
parents:
4192
diff
changeset
|
1402 sc->ffindex = st->index; |
| 1845 | 1403 |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1404 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
|
1405 return ret; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1406 |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1407 /* sanity checks */ |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1408 if (sc->chunk_count && (!sc->stts_count || !sc->stsc_count || |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1409 (!sc->sample_size && !sc->sample_count))) { |
| 3180 | 1410 av_log(c->fc, AV_LOG_ERROR, "stream %d, missing mandatory atoms, broken header\n", |
| 1411 st->index); | |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1412 return 0; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1413 } |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1414 |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1415 if (!sc->time_rate) |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1416 sc->time_rate = 1; |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1417 if (!sc->time_scale) |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1418 sc->time_scale = c->time_scale; |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1419 |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1420 av_set_pts_info(st, 64, sc->time_rate, sc->time_scale); |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1421 |
|
3245
9f25267bee44
demux qcelp, so this can work with soc decoder and stream copy
bcoudurier
parents:
3242
diff
changeset
|
1422 if (st->codec->codec_type == CODEC_TYPE_AUDIO && |
|
4454
7d1460900c59
fix frame size, time rate is not stts duration anymore with time offset
bcoudurier
parents:
4453
diff
changeset
|
1423 !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
|
1424 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
|
1425 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
|
1426 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
|
1427 } |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1428 |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1429 if (st->duration != AV_NOPTS_VALUE) { |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1430 assert(st->duration % sc->time_rate == 0); |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1431 st->duration /= sc->time_rate; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1432 } |
|
4197
84251a788a67
move ffindex set before mov_read_default so it can be used in functions
bcoudurier
parents:
4192
diff
changeset
|
1433 |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1434 mov_build_index(c, st); |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1435 |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1436 if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) { |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1437 if (url_fopen(&sc->pb, sc->drefs[sc->dref_id-1].path, URL_RDONLY) < 0) |
| 3182 | 1438 av_log(c->fc, AV_LOG_ERROR, "stream %d, error opening file %s: %s\n", |
| 1439 st->index, sc->drefs[sc->dref_id-1].path, strerror(errno)); | |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1440 } else |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1441 sc->pb = c->fc->pb; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1442 |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1443 switch (st->codec->codec_id) { |
| 4206 | 1444 #if CONFIG_H261_DECODER |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1445 case CODEC_ID_H261: |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1446 #endif |
| 4206 | 1447 #if CONFIG_H263_DECODER |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1448 case CODEC_ID_H263: |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1449 #endif |
|
4780
75d9edccd39c
reset codec width/height for h264 forcing decoder to parse extradata
bcoudurier
parents:
4749
diff
changeset
|
1450 #if CONFIG_H264_DECODER |
|
75d9edccd39c
reset codec width/height for h264 forcing decoder to parse extradata
bcoudurier
parents:
4749
diff
changeset
|
1451 case CODEC_ID_H264: |
|
75d9edccd39c
reset codec width/height for h264 forcing decoder to parse extradata
bcoudurier
parents:
4749
diff
changeset
|
1452 #endif |
| 4206 | 1453 #if CONFIG_MPEG4_DECODER |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1454 case CODEC_ID_MPEG4: |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1455 #endif |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
1456 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
|
1457 st->codec->height= 0; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1458 break; |
|
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1459 } |
| 3155 | 1460 |
| 1461 /* Do not need those anymore. */ | |
| 1462 av_freep(&sc->chunk_offsets); | |
| 4412 | 1463 av_freep(&sc->stsc_data); |
| 3155 | 1464 av_freep(&sc->sample_sizes); |
| 1465 av_freep(&sc->keyframes); | |
| 1466 av_freep(&sc->stts_data); | |
| 1467 | |
|
3153
4ded3fdf5c7c
move specific end treatment when trak is detected, will be needed for fragments
bcoudurier
parents:
3145
diff
changeset
|
1468 return 0; |
| 1845 | 1469 } |
| 1470 | |
| 4079 | 1471 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
|
1472 { |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1473 int ret; |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1474 c->itunes_metadata = 1; |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1475 ret = mov_read_default(c, pb, atom); |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1476 c->itunes_metadata = 0; |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1477 return ret; |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1478 } |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1479 |
| 4079 | 1480 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
|
1481 { |
|
4724
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1482 while (atom.size > 8) { |
|
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1483 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
|
1484 atom.size -= 4; |
|
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1485 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
|
1486 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
|
1487 atom.size += 8; |
|
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1488 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
|
1489 } |
|
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1490 } |
|
13ffc02ce5f8
search for hdlr atom in meta, some files do not store version+flags
bcoudurier
parents:
4722
diff
changeset
|
1491 return 0; |
|
4033
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1492 } |
|
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1493 |
| 4079 | 1494 static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1495 { |
| 3595 | 1496 int i; |
| 1497 int width; | |
| 1498 int height; | |
| 1499 int64_t disp_transform[2]; | |
| 1500 int display_matrix[3][2]; | |
| 1845 | 1501 AVStream *st = c->fc->streams[c->fc->nb_streams-1]; |
| 4202 | 1502 MOVStreamContext *sc = st->priv_data; |
| 1845 | 1503 int version = get_byte(pb); |
| 1504 | |
| 3145 | 1505 get_be24(pb); /* flags */ |
| 1845 | 1506 /* |
| 1507 MOV_TRACK_ENABLED 0x0001 | |
| 1508 MOV_TRACK_IN_MOVIE 0x0002 | |
| 1509 MOV_TRACK_IN_PREVIEW 0x0004 | |
| 1510 MOV_TRACK_IN_POSTER 0x0008 | |
| 1511 */ | |
| 1512 | |
| 1513 if (version == 1) { | |
| 1514 get_be64(pb); | |
| 1515 get_be64(pb); | |
| 1516 } else { | |
| 1517 get_be32(pb); /* creation time */ | |
| 1518 get_be32(pb); /* modification time */ | |
| 1519 } | |
| 1520 st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/ | |
| 1521 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
|
1522 |
| 3167 | 1523 /* highlevel (considering edits) duration in movie timebase */ |
| 1524 (version == 1) ? get_be64(pb) : get_be32(pb); | |
| 1845 | 1525 get_be32(pb); /* reserved */ |
| 1526 get_be32(pb); /* reserved */ | |
| 1527 | |
| 1528 get_be16(pb); /* layer */ | |
| 1529 get_be16(pb); /* alternate group */ | |
| 1530 get_be16(pb); /* volume */ | |
| 1531 get_be16(pb); /* reserved */ | |
| 1532 | |
| 3595 | 1533 //read in the display matrix (outlined in ISO 14496-12, Section 6.2.2) |
| 1534 // they're kept in fixed point format through all calculations | |
| 1535 // ignore u,v,z b/c we don't need the scale factor to calc aspect ratio | |
| 1536 for (i = 0; i < 3; i++) { | |
| 1537 display_matrix[i][0] = get_be32(pb); // 16.16 fixed point | |
| 1538 display_matrix[i][1] = get_be32(pb); // 16.16 fixed point | |
| 1539 get_be32(pb); // 2.30 fixed point (not used) | |
| 1540 } | |
| 1541 | |
| 1542 width = get_be32(pb); // 16.16 fixed point track width | |
| 1543 height = get_be32(pb); // 16.16 fixed point track height | |
| 4202 | 1544 sc->width = width >> 16; |
| 1545 sc->height = height >> 16; | |
| 1845 | 1546 |
| 3595 | 1547 //transform the display width/height according to the matrix |
| 1548 // skip this if the display matrix is the default identity matrix | |
| 1549 // to keep the same scale, use [width height 1<<16] | |
| 1550 if (width && height && | |
| 1551 (display_matrix[0][0] != 65536 || display_matrix[0][1] || | |
| 1552 display_matrix[1][0] || display_matrix[1][1] != 65536 || | |
| 1553 display_matrix[2][0] || display_matrix[2][1])) { | |
| 1554 for (i = 0; i < 2; i++) | |
| 1555 disp_transform[i] = | |
| 1556 (int64_t) width * display_matrix[0][i] + | |
| 1557 (int64_t) height * display_matrix[1][i] + | |
| 1558 ((int64_t) display_matrix[2][i] << 16); | |
| 1845 | 1559 |
| 3595 | 1560 //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
|
1561 st->sample_aspect_ratio = av_d2q( |
| 3595 | 1562 ((double) disp_transform[0] * height) / |
| 1563 ((double) disp_transform[1] * width), INT_MAX); | |
| 1564 } | |
| 1845 | 1565 return 0; |
| 1566 } | |
| 1567 | |
| 4079 | 1568 static int mov_read_tfhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 3169 | 1569 { |
| 1570 MOVFragment *frag = &c->fragment; | |
| 1571 MOVTrackExt *trex = NULL; | |
| 1572 int flags, track_id, i; | |
| 1573 | |
| 1574 get_byte(pb); /* version */ | |
| 1575 flags = get_be24(pb); | |
| 1576 | |
| 1577 track_id = get_be32(pb); | |
| 4646 | 1578 if (!track_id) |
| 3169 | 1579 return -1; |
| 1580 frag->track_id = track_id; | |
| 1581 for (i = 0; i < c->trex_count; i++) | |
| 1582 if (c->trex_data[i].track_id == frag->track_id) { | |
| 1583 trex = &c->trex_data[i]; | |
| 1584 break; | |
| 1585 } | |
| 1586 if (!trex) { | |
| 1587 av_log(c->fc, AV_LOG_ERROR, "could not find corresponding trex\n"); | |
| 1588 return -1; | |
| 1589 } | |
| 1590 | |
| 1591 if (flags & 0x01) frag->base_data_offset = get_be64(pb); | |
| 1592 else frag->base_data_offset = frag->moof_offset; | |
| 1593 if (flags & 0x02) frag->stsd_id = get_be32(pb); | |
| 1594 else frag->stsd_id = trex->stsd_id; | |
| 1595 | |
| 1596 frag->duration = flags & 0x08 ? get_be32(pb) : trex->duration; | |
| 1597 frag->size = flags & 0x10 ? get_be32(pb) : trex->size; | |
| 1598 frag->flags = flags & 0x20 ? get_be32(pb) : trex->flags; | |
| 1599 dprintf(c->fc, "frag flags 0x%x\n", frag->flags); | |
| 1600 return 0; | |
| 1601 } | |
| 1602 | |
| 4079 | 1603 static int mov_read_trex(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 3169 | 1604 { |
| 1605 MOVTrackExt *trex; | |
| 1606 | |
| 1607 if ((uint64_t)c->trex_count+1 >= UINT_MAX / sizeof(*c->trex_data)) | |
| 1608 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
|
1609 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
|
1610 if (!trex) |
| 3169 | 1611 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
|
1612 c->trex_data = trex; |
| 3169 | 1613 trex = &c->trex_data[c->trex_count++]; |
| 1614 get_byte(pb); /* version */ | |
| 1615 get_be24(pb); /* flags */ | |
| 1616 trex->track_id = get_be32(pb); | |
| 1617 trex->stsd_id = get_be32(pb); | |
| 1618 trex->duration = get_be32(pb); | |
| 1619 trex->size = get_be32(pb); | |
| 1620 trex->flags = get_be32(pb); | |
| 1621 return 0; | |
| 1622 } | |
| 1623 | |
| 4079 | 1624 static int mov_read_trun(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 3169 | 1625 { |
| 1626 MOVFragment *frag = &c->fragment; | |
| 4646 | 1627 AVStream *st = NULL; |
| 3190 | 1628 MOVStreamContext *sc; |
| 3169 | 1629 uint64_t offset; |
| 1630 int64_t dts; | |
| 1631 int data_offset = 0; | |
| 1632 unsigned entries, first_sample_flags = frag->flags; | |
| 1633 int flags, distance, i; | |
| 1634 | |
| 4646 | 1635 for (i = 0; i < c->fc->nb_streams; i++) { |
| 1636 if (c->fc->streams[i]->id == frag->track_id) { | |
| 1637 st = c->fc->streams[i]; | |
| 1638 break; | |
| 1639 } | |
| 1640 } | |
| 1641 if (!st) { | |
| 1642 av_log(c->fc, AV_LOG_ERROR, "could not find corresponding track id %d\n", frag->track_id); | |
| 3190 | 1643 return -1; |
| 4646 | 1644 } |
| 3190 | 1645 sc = st->priv_data; |
| 3169 | 1646 if (sc->pseudo_stream_id+1 != frag->stsd_id) |
| 1647 return 0; | |
| 1648 get_byte(pb); /* version */ | |
| 1649 flags = get_be24(pb); | |
| 1650 entries = get_be32(pb); | |
| 1651 dprintf(c->fc, "flags 0x%x entries %d\n", flags, entries); | |
| 1652 if (flags & 0x001) data_offset = get_be32(pb); | |
| 1653 if (flags & 0x004) first_sample_flags = get_be32(pb); | |
| 1654 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
|
1655 MOVStts *ctts_data; |
| 3169 | 1656 if ((uint64_t)entries+sc->ctts_count >= UINT_MAX/sizeof(*sc->ctts_data)) |
| 1657 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
|
1658 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
|
1659 (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
|
1660 if (!ctts_data) |
| 3169 | 1661 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
|
1662 sc->ctts_data = ctts_data; |
| 3169 | 1663 } |
| 1664 dts = st->duration; | |
| 1665 offset = frag->base_data_offset + data_offset; | |
| 1666 distance = 0; | |
| 1667 dprintf(c->fc, "first sample flags 0x%x\n", first_sample_flags); | |
| 1668 for (i = 0; i < entries; i++) { | |
| 1669 unsigned sample_size = frag->size; | |
| 1670 int sample_flags = i ? frag->flags : first_sample_flags; | |
| 1671 unsigned sample_duration = frag->duration; | |
| 1672 int keyframe; | |
| 1673 | |
| 1674 if (flags & 0x100) sample_duration = get_be32(pb); | |
| 1675 if (flags & 0x200) sample_size = get_be32(pb); | |
| 1676 if (flags & 0x400) sample_flags = get_be32(pb); | |
| 1677 if (flags & 0x800) { | |
| 1678 sc->ctts_data[sc->ctts_count].count = 1; | |
| 1679 sc->ctts_data[sc->ctts_count].duration = get_be32(pb); | |
| 1680 sc->ctts_count++; | |
| 1681 } | |
| 1682 if ((keyframe = st->codec->codec_type == CODEC_TYPE_AUDIO || | |
| 1683 (flags & 0x004 && !i && !sample_flags) || sample_flags & 0x2000000)) | |
| 1684 distance = 0; | |
| 1685 av_add_index_entry(st, offset, dts, sample_size, distance, | |
| 1686 keyframe ? AVINDEX_KEYFRAME : 0); | |
| 1687 dprintf(c->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", " | |
| 1688 "size %d, distance %d, keyframe %d\n", st->index, sc->sample_count+i, | |
| 1689 offset, dts, sample_size, distance, keyframe); | |
| 1690 distance++; | |
| 1691 assert(sample_duration % sc->time_rate == 0); | |
| 1692 dts += sample_duration / sc->time_rate; | |
| 1693 offset += sample_size; | |
| 1694 } | |
| 1695 frag->moof_offset = offset; | |
| 1696 st->duration = dts; | |
| 1697 return 0; | |
| 1698 } | |
| 1699 | |
| 1845 | 1700 /* this atom should be null (from specs), but some buggy files put the 'moov' atom inside it... */ |
| 1701 /* like the files created with Adobe Premiere 5.0, for samples see */ | |
| 1702 /* http://graphics.tudelft.nl/~wouter/publications/soundtests/ */ | |
| 4079 | 1703 static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1704 { |
| 1705 int err; | |
| 1706 | |
| 1707 if (atom.size < 8) | |
| 1708 return 0; /* continue */ | |
| 1709 if (get_be32(pb) != 0) { /* 0 sized mdat atom... use the 'wide' atom size */ | |
| 1710 url_fskip(pb, atom.size - 4); | |
| 1711 return 0; | |
| 1712 } | |
| 1713 atom.type = get_le32(pb); | |
| 1714 atom.offset += 8; | |
| 1715 atom.size -= 8; | |
| 3253 | 1716 if (atom.type != MKTAG('m','d','a','t')) { |
| 1845 | 1717 url_fskip(pb, atom.size); |
| 1718 return 0; | |
| 1719 } | |
| 1720 err = mov_read_mdat(c, pb, atom); | |
| 1721 return err; | |
| 1722 } | |
| 1723 | |
| 4079 | 1724 static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1725 { |
| 4206 | 1726 #if CONFIG_ZLIB |
| 1845 | 1727 ByteIOContext ctx; |
| 1728 uint8_t *cmov_data; | |
| 1729 uint8_t *moov_data; /* uncompressed data */ | |
| 1730 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
|
1731 int ret = -1; |
| 1845 | 1732 |
| 1733 get_be32(pb); /* dcom atom */ | |
| 3253 | 1734 if (get_le32(pb) != MKTAG('d','c','o','m')) |
| 1845 | 1735 return -1; |
| 3253 | 1736 if (get_le32(pb) != MKTAG('z','l','i','b')) { |
| 4602 | 1737 av_log(c->fc, AV_LOG_ERROR, "unknown compression for cmov atom !"); |
| 1845 | 1738 return -1; |
| 1739 } | |
| 1740 get_be32(pb); /* cmvd atom */ | |
| 3253 | 1741 if (get_le32(pb) != MKTAG('c','m','v','d')) |
| 1845 | 1742 return -1; |
| 1743 moov_len = get_be32(pb); /* uncompressed size */ | |
| 1744 cmov_len = atom.size - 6 * 4; | |
| 1745 | |
| 1746 cmov_data = av_malloc(cmov_len); | |
| 1747 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
|
1748 return AVERROR(ENOMEM); |
| 1845 | 1749 moov_data = av_malloc(moov_len); |
| 1750 if (!moov_data) { | |
| 1751 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
|
1752 return AVERROR(ENOMEM); |
| 1845 | 1753 } |
| 1754 get_buffer(pb, cmov_data, cmov_len); | |
| 1755 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
|
1756 goto free_and_return; |
| 1845 | 1757 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
|
1758 goto free_and_return; |
| 3253 | 1759 atom.type = MKTAG('m','o','o','v'); |
| 1845 | 1760 atom.offset = 0; |
| 1761 atom.size = moov_len; | |
| 1762 #ifdef DEBUG | |
| 1763 // { int fd = open("/tmp/uncompheader.mov", O_WRONLY | O_CREAT); write(fd, moov_data, moov_len); close(fd); } | |
| 1764 #endif | |
| 1765 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
|
1766 free_and_return: |
| 1845 | 1767 av_free(moov_data); |
| 1768 av_free(cmov_data); | |
| 1769 return ret; | |
| 1770 #else | |
| 1771 av_log(c->fc, AV_LOG_ERROR, "this file requires zlib support compiled in\n"); | |
| 1772 return -1; | |
| 1773 #endif | |
| 1774 } | |
| 1775 | |
| 1776 /* edit list atom */ | |
| 4079 | 1777 static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOVAtom atom) |
| 1845 | 1778 { |
|
2824
ecbfaa8712a1
do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents:
2823
diff
changeset
|
1779 MOVStreamContext *sc = c->fc->streams[c->fc->nb_streams-1]->priv_data; |
| 1845 | 1780 int i, edit_count; |
| 1781 | |
| 1782 get_byte(pb); /* version */ | |
| 3145 | 1783 get_be24(pb); /* flags */ |
| 4410 | 1784 edit_count = get_be32(pb); /* entries */ |
| 1845 | 1785 |
| 1786 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
|
1787 int time; |
|
4742
0496cbd94374
Extend mov edit list support to work for a first padding entry with
reimar
parents:
4740
diff
changeset
|
1788 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
|
1789 time = get_be32(pb); /* Media time */ |
| 1845 | 1790 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
|
1791 if (i == 0 && time >= -1) { |
|
0496cbd94374
Extend mov edit list support to work for a first padding entry with
reimar
parents:
4740
diff
changeset
|
1792 sc->time_offset = time != -1 ? time : -duration; |
|
0496cbd94374
Extend mov edit list support to work for a first padding entry with
reimar
parents:
4740
diff
changeset
|
1793 sc->time_rate = av_gcd(sc->time_rate, FFABS(sc->time_offset)); |
| 4447 | 1794 } |
| 1845 | 1795 } |
|
4399
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
1796 |
|
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
1797 if(edit_count > 1) |
|
530e55405feb
offset dts according to edit list, hackish but works, based on patch by Reimar
bcoudurier
parents:
4369
diff
changeset
|
1798 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
|
1799 "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
|
1800 |
|
4429
7ed870203bfe
fix compilation with DEBUG defined, field does not exist anymore
bcoudurier
parents:
4412
diff
changeset
|
1801 dprintf(c->fc, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, edit_count); |
| 1845 | 1802 return 0; |
| 1803 } | |
| 1804 | |
| 1805 static const MOVParseTableEntry mov_default_parse_table[] = { | |
|
3496
cdbf302a3c00
chinese avs demuxing support, demux AVSFileFormat.mp4
bcoudurier
parents:
3487
diff
changeset
|
1806 { MKTAG('a','v','s','s'), mov_read_extradata }, |
| 3253 | 1807 { MKTAG('c','o','6','4'), mov_read_stco }, |
| 1808 { MKTAG('c','t','t','s'), mov_read_ctts }, /* composition time to sample */ | |
| 1809 { MKTAG('d','i','n','f'), mov_read_default }, | |
| 1810 { MKTAG('d','r','e','f'), mov_read_dref }, | |
| 1811 { MKTAG('e','d','t','s'), mov_read_default }, | |
| 1812 { MKTAG('e','l','s','t'), mov_read_elst }, | |
| 1813 { MKTAG('e','n','d','a'), mov_read_enda }, | |
| 1814 { MKTAG('f','i','e','l'), mov_read_extradata }, | |
| 1815 { MKTAG('f','t','y','p'), mov_read_ftyp }, | |
| 1816 { MKTAG('g','l','b','l'), mov_read_glbl }, | |
| 1817 { MKTAG('h','d','l','r'), mov_read_hdlr }, | |
|
4033
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1818 { MKTAG('i','l','s','t'), mov_read_ilst }, |
| 3253 | 1819 { MKTAG('j','p','2','h'), mov_read_extradata }, |
| 1820 { MKTAG('m','d','a','t'), mov_read_mdat }, | |
| 1821 { MKTAG('m','d','h','d'), mov_read_mdhd }, | |
| 1822 { MKTAG('m','d','i','a'), mov_read_default }, | |
|
4033
836e25632f0b
read itunes metadata, code based on Reimar's patch
bcoudurier
parents:
4028
diff
changeset
|
1823 { MKTAG('m','e','t','a'), mov_read_meta }, |
| 3253 | 1824 { MKTAG('m','i','n','f'), mov_read_default }, |
| 1825 { MKTAG('m','o','o','f'), mov_read_moof }, | |
| 1826 { MKTAG('m','o','o','v'), mov_read_moov }, | |
| 1827 { MKTAG('m','v','e','x'), mov_read_default }, | |
| 1828 { MKTAG('m','v','h','d'), mov_read_mvhd }, | |
| 1829 { MKTAG('S','M','I',' '), mov_read_smi }, /* Sorenson extension ??? */ | |
| 1830 { MKTAG('a','l','a','c'), mov_read_extradata }, /* alac specific atom */ | |
| 1831 { MKTAG('a','v','c','C'), mov_read_glbl }, | |
| 4080 | 1832 { MKTAG('p','a','s','p'), mov_read_pasp }, |
| 3253 | 1833 { MKTAG('s','t','b','l'), mov_read_default }, |
| 1834 { MKTAG('s','t','c','o'), mov_read_stco }, | |
| 1835 { MKTAG('s','t','s','c'), mov_read_stsc }, | |
| 1836 { MKTAG('s','t','s','d'), mov_read_stsd }, /* sample description */ | |
| 1837 { MKTAG('s','t','s','s'), mov_read_stss }, /* sync sample */ | |
| 1838 { MKTAG('s','t','s','z'), mov_read_stsz }, /* sample size */ | |
| 1839 { MKTAG('s','t','t','s'), mov_read_stts }, | |
| 4739 | 1840 { MKTAG('s','t','z','2'), mov_read_stsz }, /* compact sample size */ |
| 3253 | 1841 { MKTAG('t','k','h','d'), mov_read_tkhd }, /* track header */ |
| 1842 { MKTAG('t','f','h','d'), mov_read_tfhd }, /* track fragment header */ | |
| 1843 { MKTAG('t','r','a','k'), mov_read_trak }, | |
| 1844 { MKTAG('t','r','a','f'), mov_read_default }, | |
| 1845 { MKTAG('t','r','e','x'), mov_read_trex }, | |
| 1846 { MKTAG('t','r','u','n'), mov_read_trun }, | |
| 4028 | 1847 { MKTAG('u','d','t','a'), mov_read_default }, |
| 3253 | 1848 { MKTAG('w','a','v','e'), mov_read_wave }, |
| 1849 { MKTAG('e','s','d','s'), mov_read_esds }, | |
| 1850 { MKTAG('w','i','d','e'), mov_read_wide }, /* place holder */ | |
| 1851 { MKTAG('c','m','o','v'), mov_read_cmov }, | |
| 2826 | 1852 { 0, NULL } |
| 1845 | 1853 }; |
| 1854 | |
| 1855 static int mov_probe(AVProbeData *p) | |
| 1856 { | |
| 1857 unsigned int offset; | |
| 1858 uint32_t tag; | |
| 1859 int score = 0; | |
| 1860 | |
| 1861 /* check file header */ | |
| 1862 offset = 0; | |
| 1863 for(;;) { | |
| 1864 /* ignore invalid offset */ | |
| 1865 if ((offset + 8) > (unsigned int)p->buf_size) | |
| 1866 return score; | |
| 1867 tag = AV_RL32(p->buf + offset + 4); | |
| 1868 switch(tag) { | |
| 1869 /* check for obvious tags */ | |
| 3253 | 1870 case MKTAG('j','P',' ',' '): /* jpeg 2000 signature */ |
| 1871 case MKTAG('m','o','o','v'): | |
| 1872 case MKTAG('m','d','a','t'): | |
| 1873 case MKTAG('p','n','o','t'): /* detect movs with preview pics like ew.mov and april.mov */ | |
| 1874 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
|
1875 case MKTAG('f','t','y','p'): |
| 1845 | 1876 return AVPROBE_SCORE_MAX; |
| 1877 /* those are more common words, so rate then a bit less */ | |
| 3253 | 1878 case MKTAG('e','d','i','w'): /* xdcam files have reverted first tags */ |
| 1879 case MKTAG('w','i','d','e'): | |
| 1880 case MKTAG('f','r','e','e'): | |
| 1881 case MKTAG('j','u','n','k'): | |
| 1882 case MKTAG('p','i','c','t'): | |
| 1845 | 1883 return AVPROBE_SCORE_MAX - 5; |
| 3588 | 1884 case MKTAG(0x82,0x82,0x7f,0x7d): |
| 3253 | 1885 case MKTAG('s','k','i','p'): |
| 1886 case MKTAG('u','u','i','d'): | |
| 1887 case MKTAG('p','r','f','l'): | |
| 1845 | 1888 offset = AV_RB32(p->buf+offset) + offset; |
| 1889 /* if we only find those cause probedata is too small at least rate them */ | |
| 1890 score = AVPROBE_SCORE_MAX - 50; | |
| 1891 break; | |
| 1892 default: | |
| 1893 /* unrecognized tag */ | |
| 1894 return score; | |
| 1895 } | |
| 1896 } | |
| 1897 return score; | |
| 1898 } | |
| 1899 | |
| 1900 static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) | |
| 1901 { | |
| 2006 | 1902 MOVContext *mov = s->priv_data; |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2730
diff
changeset
|
1903 ByteIOContext *pb = s->pb; |
| 3155 | 1904 int err; |
| 4079 | 1905 MOVAtom atom = { 0, 0, 0 }; |
| 1845 | 1906 |
| 1907 mov->fc = s; | |
| 3167 | 1908 /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ |
| 1909 if(!url_is_streamed(pb)) | |
| 1845 | 1910 atom.size = url_fsize(pb); |
| 1911 else | |
| 2026 | 1912 atom.size = INT64_MAX; |
| 1845 | 1913 |
| 1914 /* check MOV header */ | |
| 3204 | 1915 if ((err = mov_read_default(mov, pb, atom)) < 0) { |
| 1916 av_log(s, AV_LOG_ERROR, "error reading header: %d\n", err); | |
| 1917 return err; | |
| 1918 } | |
| 1919 if (!mov->found_moov) { | |
| 1920 av_log(s, AV_LOG_ERROR, "moov atom not found\n"); | |
| 1845 | 1921 return -1; |
| 1922 } | |
| 3205 | 1923 dprintf(mov->fc, "on_parse_exit_offset=%lld\n", url_ftell(pb)); |
| 1845 | 1924 |
| 1925 return 0; | |
| 1926 } | |
| 1927 | |
| 1928 static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) | |
| 1929 { | |
| 1930 MOVContext *mov = s->priv_data; | |
| 1931 MOVStreamContext *sc = 0; | |
| 1932 AVIndexEntry *sample = 0; | |
| 1933 int64_t best_dts = INT64_MAX; | |
| 4561 | 1934 int i, ret; |
| 3170 | 1935 retry: |
| 2823 | 1936 for (i = 0; i < s->nb_streams; i++) { |
|
2824
ecbfaa8712a1
do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents:
2823
diff
changeset
|
1937 AVStream *st = s->streams[i]; |
|
ecbfaa8712a1
do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents:
2823
diff
changeset
|
1938 MOVStreamContext *msc = st->priv_data; |
|
4717
ee2dd1b3afc3
do not modify sample_count, check against index entries
bcoudurier
parents:
4690
diff
changeset
|
1939 if (st->discard != AVDISCARD_ALL && msc->pb && msc->current_sample < st->nb_index_entries) { |
|
2824
ecbfaa8712a1
do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents:
2823
diff
changeset
|
1940 AVIndexEntry *current_sample = &st->index_entries[msc->current_sample]; |
| 2902 | 1941 int64_t dts = av_rescale(current_sample->timestamp * (int64_t)msc->time_rate, |
| 1942 AV_TIME_BASE, msc->time_scale); | |
| 2030 | 1943 dprintf(s, "stream %d, sample %d, dts %"PRId64"\n", i, msc->current_sample, dts); |
| 2817 | 1944 if (!sample || (url_is_streamed(s->pb) && current_sample->pos < sample->pos) || |
| 1945 (!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
|
1946 ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb && |
| 2817 | 1947 ((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
|
1948 (FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))))) { |
| 1845 | 1949 sample = current_sample; |
| 1950 best_dts = dts; | |
| 1951 sc = msc; | |
| 1952 } | |
| 1953 } | |
| 1954 } | |
| 3170 | 1955 if (!sample) { |
| 1956 mov->found_mdat = 0; | |
| 1957 if (!url_is_streamed(s->pb) || | |
| 4079 | 1958 mov_read_default(mov, s->pb, (MOVAtom){ 0, 0, INT64_MAX }) < 0 || |
| 3170 | 1959 url_feof(s->pb)) |
| 1960 return -1; | |
| 1961 dprintf(s, "read fragments, offset 0x%llx\n", url_ftell(s->pb)); | |
| 1962 goto retry; | |
| 1963 } | |
| 1845 | 1964 /* must be done just before reading, to avoid infinite loop on sample */ |
| 1965 sc->current_sample++; | |
|
3085
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
1966 if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) { |
| 2902 | 1967 av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n", |
| 1968 sc->ffindex, sample->pos); | |
| 1845 | 1969 return -1; |
| 1970 } | |
| 4561 | 1971 ret = av_get_packet(sc->pb, pkt, sample->size); |
| 1972 if (ret < 0) | |
| 1973 return ret; | |
| 4206 | 1974 #if CONFIG_DV_DEMUXER |
| 3027 | 1975 if (mov->dv_demux && sc->dv_audio_container) { |
| 1976 dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size); | |
| 1977 av_free(pkt->data); | |
| 3034 | 1978 pkt->size = 0; |
| 1979 if (dv_get_packet(mov->dv_demux, pkt) < 0) | |
| 1980 return -1; | |
| 3027 | 1981 } |
| 1845 | 1982 #endif |
| 1983 pkt->stream_index = sc->ffindex; | |
| 1984 pkt->dts = sample->timestamp; | |
| 1985 if (sc->ctts_data) { | |
| 4411 | 1986 assert(sc->ctts_data[sc->ctts_index].duration % sc->time_rate == 0); |
| 1987 pkt->pts = pkt->dts + sc->ctts_data[sc->ctts_index].duration / sc->time_rate; | |
| 1845 | 1988 /* update ctts context */ |
| 4411 | 1989 sc->ctts_sample++; |
| 1990 if (sc->ctts_index < sc->ctts_count && | |
| 1991 sc->ctts_data[sc->ctts_index].count == sc->ctts_sample) { | |
| 1992 sc->ctts_index++; | |
| 1993 sc->ctts_sample = 0; | |
| 1845 | 1994 } |
|
3956
8bdecea89071
support negative ctts in some way, unset wrong dts
bcoudurier
parents:
3935
diff
changeset
|
1995 if (sc->wrong_dts) |
|
8bdecea89071
support negative ctts in some way, unset wrong dts
bcoudurier
parents:
3935
diff
changeset
|
1996 pkt->dts = AV_NOPTS_VALUE; |
| 1845 | 1997 } else { |
| 3267 | 1998 AVStream *st = s->streams[sc->ffindex]; |
|
4717
ee2dd1b3afc3
do not modify sample_count, check against index entries
bcoudurier
parents:
4690
diff
changeset
|
1999 int64_t next_dts = (sc->current_sample < st->nb_index_entries) ? |
| 3267 | 2000 st->index_entries[sc->current_sample].timestamp : st->duration; |
| 2001 pkt->duration = next_dts - pkt->dts; | |
| 1845 | 2002 pkt->pts = pkt->dts; |
| 2003 } | |
| 2004 pkt->flags |= sample->flags & AVINDEX_KEYFRAME ? PKT_FLAG_KEY : 0; | |
| 2005 pkt->pos = sample->pos; | |
| 2902 | 2006 dprintf(s, "stream %d, pts %"PRId64", dts %"PRId64", pos 0x%"PRIx64", duration %d\n", |
| 2007 pkt->stream_index, pkt->pts, pkt->dts, pkt->pos, pkt->duration); | |
| 1845 | 2008 return 0; |
| 2009 } | |
| 2010 | |
| 2011 static int mov_seek_stream(AVStream *st, int64_t timestamp, int flags) | |
| 2012 { | |
| 2013 MOVStreamContext *sc = st->priv_data; | |
| 2014 int sample, time_sample; | |
| 2015 int i; | |
| 2016 | |
| 2017 sample = av_index_search_timestamp(st, timestamp, flags); | |
| 1907 | 2018 dprintf(st->codec, "stream %d, timestamp %"PRId64", sample %d\n", st->index, timestamp, sample); |
| 1845 | 2019 if (sample < 0) /* not sure what to do */ |
| 2020 return -1; | |
| 2021 sc->current_sample = sample; | |
| 2030 | 2022 dprintf(st->codec, "stream %d, found sample %d\n", st->index, sc->current_sample); |
| 1845 | 2023 /* adjust ctts index */ |
| 2024 if (sc->ctts_data) { | |
| 2025 time_sample = 0; | |
| 2026 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
|
2027 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
|
2028 if (next > sc->current_sample) { |
| 4411 | 2029 sc->ctts_index = i; |
| 2030 sc->ctts_sample = sc->current_sample - time_sample; | |
| 1845 | 2031 break; |
| 2032 } | |
|
2083
2c3887f02739
fix ctts index computation when seeking, check must be done against next ctts sample, thanks to Uoti
bcoudurier
parents:
2046
diff
changeset
|
2033 time_sample = next; |
| 1845 | 2034 } |
| 2035 } | |
| 2036 return sample; | |
| 2037 } | |
| 2038 | |
| 2039 static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_time, int flags) | |
| 2040 { | |
| 2041 AVStream *st; | |
| 2042 int64_t seek_timestamp, timestamp; | |
| 2043 int sample; | |
| 2044 int i; | |
| 2045 | |
| 2046 if (stream_index >= s->nb_streams) | |
| 2047 return -1; | |
| 4290 | 2048 if (sample_time < 0) |
| 2049 sample_time = 0; | |
| 1845 | 2050 |
| 2051 st = s->streams[stream_index]; | |
| 2052 sample = mov_seek_stream(st, sample_time, flags); | |
| 2053 if (sample < 0) | |
| 2054 return -1; | |
| 2055 | |
| 2056 /* adjust seek timestamp to found sample timestamp */ | |
| 2057 seek_timestamp = st->index_entries[sample].timestamp; | |
| 2058 | |
| 2059 for (i = 0; i < s->nb_streams; i++) { | |
| 2060 st = s->streams[i]; | |
| 2061 if (stream_index == i || st->discard == AVDISCARD_ALL) | |
| 2062 continue; | |
| 2063 | |
| 2064 timestamp = av_rescale_q(seek_timestamp, s->streams[stream_index]->time_base, st->time_base); | |
| 2065 mov_seek_stream(st, timestamp, flags); | |
| 2066 } | |
| 2067 return 0; | |
| 2068 } | |
| 2069 | |
| 2070 static int mov_read_close(AVFormatContext *s) | |
| 2071 { | |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2072 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
|
2073 int i, j; |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2074 |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2075 for (i = 0; i < s->nb_streams; i++) { |
| 4719 | 2076 AVStream *st = s->streams[i]; |
| 2077 MOVStreamContext *sc = st->priv_data; | |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2078 |
|
2824
ecbfaa8712a1
do not retain useless pointers to avstream priv_data, use it directly
bcoudurier
parents:
2823
diff
changeset
|
2079 av_freep(&sc->ctts_data); |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2080 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
|
2081 av_freep(&sc->drefs[j].path); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
2082 av_freep(&sc->drefs); |
|
bae59276377f
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
bcoudurier
parents:
3084
diff
changeset
|
2083 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
|
2084 url_fclose(sc->pb); |
| 4719 | 2085 |
| 2086 av_freep(&st->codec->palctrl); | |
| 2084 | 2087 } |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2088 |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2089 if (mov->dv_demux) { |
|
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2090 for(i = 0; i < mov->dv_fctx->nb_streams; i++) { |
| 1845 | 2091 av_freep(&mov->dv_fctx->streams[i]->codec); |
| 2092 av_freep(&mov->dv_fctx->streams[i]); | |
| 2093 } | |
| 2094 av_freep(&mov->dv_fctx); | |
| 2095 av_freep(&mov->dv_demux); | |
| 2096 } | |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2097 |
| 3169 | 2098 av_freep(&mov->trex_data); |
|
4718
7bf091a4b6d9
cosmetics, add some whitespaces and empty lines
bcoudurier
parents:
4717
diff
changeset
|
2099 |
| 1845 | 2100 return 0; |
| 2101 } | |
| 2102 | |
| 2103 AVInputFormat mov_demuxer = { | |
| 2104 "mov,mp4,m4a,3gp,3g2,mj2", | |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3362
diff
changeset
|
2105 NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"), |
| 1845 | 2106 sizeof(MOVContext), |
| 2107 mov_probe, | |
| 2108 mov_read_header, | |
| 2109 mov_read_packet, | |
| 2110 mov_read_close, | |
| 2111 mov_read_seek, | |
| 2112 }; |
