Mercurial > mplayer.hg
annotate libmpdemux/demux_mkv.c @ 32220:2494181f252b
Add many integer overflow checks to mkv demuxer.
Patch by Yuriy Kaminskiy [yumkam mail ru] with some
minor modifications by me.
author | reimar |
---|---|
date | Sat, 18 Sep 2010 17:18:22 +0000 |
parents | ef21cbba62ee |
children | 4034fb538bc1 |
rev | line source |
---|---|
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1 /* |
29238
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
2 * Matroska demuxer |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
3 * Copyright (C) 2004 Aurelien Jacobs <aurel@gnuage.org> |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
4 * Based on the one written by Ronald Bultje for gstreamer |
29238
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
5 * and on demux_mkv.cpp from Moritz Bunkus. |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
6 * |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
7 * This file is part of MPlayer. |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
8 * |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
9 * MPlayer is free software; you can redistribute it and/or modify |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
10 * it under the terms of the GNU General Public License as published by |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
11 * the Free Software Foundation; either version 2 of the License, or |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
12 * (at your option) any later version. |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
13 * |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
14 * MPlayer is distributed in the hope that it will be useful, |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
17 * GNU General Public License for more details. |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
18 * |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
19 * You should have received a copy of the GNU General Public License along |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
20 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
28468
diff
changeset
|
21 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
22 */ |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
23 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
24 #include "config.h" |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
25 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
26 #include <stdlib.h> |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
27 #include <stdio.h> |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
28 #include <ctype.h> |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18507
diff
changeset
|
29 #include <inttypes.h> |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
30 |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22445
diff
changeset
|
31 #include "stream/stream.h" |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
32 #include "demuxer.h" |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
33 #include "stheader.h" |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
34 #include "ebml.h" |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
35 #include "matroska.h" |
30573
02420b32391b
Add separate header for real_fix_timestamp(); avoids forward declarations.
diego
parents:
30085
diff
changeset
|
36 #include "demux_real.h" |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
37 |
32209 | 38 #include "ass_mp.h" |
20680 | 39 #include "mp_msg.h" |
40 #include "help_mp.h" | |
41 | |
25292
a6a49a7a4be0
Move vobsub palette->yuv convert code into a common function.
ulion
parents:
25289
diff
changeset
|
42 #include "vobsub.h" |
17012 | 43 #include "subreader.h" |
44 #include "libvo/sub.h" | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
45 |
22616 | 46 #include "libavutil/common.h" |
47 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26752
diff
changeset
|
48 #ifdef CONFIG_QTX_CODECS |
22606
97343cedd966
Use explicit path for headers from the loader/ directory.
diego
parents:
22605
diff
changeset
|
49 #include "loader/qtx/qtxsdk/components.h" |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
50 #endif |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
51 |
28440 | 52 #if CONFIG_ZLIB |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
53 #include <zlib.h> |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
54 #endif |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
55 |
22081 | 56 #include "libavutil/lzo.h" |
23386
585d2136f018
Get rid of __attribute__((__packed__)) in Matroska demuxer
reimar
parents:
23310
diff
changeset
|
57 #include "libavutil/intreadwrite.h" |
23703
9fb716ab06a3
Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents:
23630
diff
changeset
|
58 #include "libavutil/avstring.h" |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
59 |
31177 | 60 static const unsigned char sipr_swaps[38][2] = { |
18036 | 61 {0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68}, |
62 {13,39},{14,73},{15,53},{16,69},{17,57},{19,88},{20,34},{21,71},{24,46}, | |
63 {25,94},{26,54},{28,75},{29,50},{32,70},{33,92},{35,74},{38,85},{40,56}, | |
64 {42,87},{43,65},{45,59},{48,79},{49,93},{51,89},{55,95},{61,76},{67,83}, | |
31177 | 65 {77,80} |
66 }; | |
18036 | 67 |
68 // Map flavour to bytes per second | |
69 #define SIPR_FLAVORS 4 | |
70 #define ATRC_FLAVORS 8 | |
71 #define COOK_FLAVORS 34 | |
31177 | 72 static const int sipr_fl2bps[SIPR_FLAVORS] = { 813, 1062, 625, 2000 }; |
73 static const int atrc_fl2bps[ATRC_FLAVORS] = { | |
74 8269, 11714, 13092, 16538, 18260, 22050, 33075, 44100 }; | |
75 static const int cook_fl2bps[COOK_FLAVORS] = { | |
76 1000, 1378, 2024, 2584, 4005, 5513, 8010, 4005, 750, 2498, | |
77 4048, 5513, 8010, 11973, 8010, 2584, 4005, 2067, 2584, 2584, | |
78 4005, 4005, 5513, 5513, 8010, 12059, 1550, 8010, 12059, 5513, | |
79 12016, 16408, 22911, 33506 | |
80 }; | |
81 | |
82 typedef struct { | |
83 uint32_t order, type, scope; | |
84 uint32_t comp_algo; | |
85 uint8_t *comp_settings; | |
32220 | 86 size_t comp_settings_len; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
87 } mkv_content_encoding_t; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
88 |
31177 | 89 typedef struct mkv_track { |
90 int tnum; | |
91 char *name; | |
92 | |
93 char *codec_id; | |
94 int ms_compat; | |
95 char *language; | |
96 | |
97 int type; | |
98 | |
99 uint32_t v_width, v_height, v_dwidth, v_dheight; | |
100 float v_frate; | |
101 | |
102 uint32_t a_formattag; | |
103 uint32_t a_channels, a_bps; | |
104 float a_sfreq; | |
105 | |
106 float default_duration; | |
107 | |
108 int default_track; | |
109 | |
110 void *private_data; | |
32220 | 111 size_t private_size; |
31177 | 112 |
113 /* stuff for realmedia */ | |
114 int realmedia; | |
115 int64_t rv_kf_base; | |
116 int rv_kf_pts; | |
117 float rv_pts; /* previous video timestamp */ | |
118 float ra_pts; /* previous audio timestamp */ | |
119 | |
120 /** realaudio descrambling */ | |
121 int sub_packet_size; ///< sub packet size, per stream | |
122 int sub_packet_h; ///< number of coded frames per block | |
123 int coded_framesize; ///< coded frame size, per stream | |
124 int audiopk_size; ///< audio packet size | |
125 unsigned char *audio_buf; ///< place to store reordered audio data | |
126 float *audio_timestamp; ///< timestamp for each audio packet | |
127 int sub_packet_cnt; ///< number of subpacket already received | |
128 int audio_filepos; ///< file position of first audio packet in block | |
129 | |
130 /* stuff for quicktime */ | |
131 int fix_i_bps; | |
132 float qt_last_a_pts; | |
133 | |
134 int subtitle_type; | |
135 | |
136 /* The timecodes of video frames might have to be reordered if they're | |
137 in display order (the timecodes, not the frames themselves!). In this | |
138 case demux packets have to be cached with the help of these variables. */ | |
139 int reorder_timecodes; | |
140 demux_packet_t **cached_dps; | |
141 int num_cached_dps, num_allocated_dps; | |
142 float max_pts; | |
143 | |
144 /* generic content encoding support */ | |
145 mkv_content_encoding_t *encodings; | |
146 int num_encodings; | |
147 | |
148 /* For VobSubs and SSA/ASS */ | |
149 sh_sub_t *sh_sub; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
150 } mkv_track_t; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
151 |
31177 | 152 typedef struct mkv_index { |
153 int tnum; | |
154 uint64_t timecode, filepos; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
155 } mkv_index_t; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
156 |
31177 | 157 typedef struct mkv_demuxer { |
158 off_t segment_start; | |
159 | |
160 float duration, last_pts; | |
161 uint64_t last_filepos; | |
162 | |
163 mkv_track_t **tracks; | |
164 int num_tracks; | |
165 | |
166 uint64_t tc_scale, cluster_tc, first_tc; | |
167 int has_first_tc; | |
168 | |
169 uint64_t cluster_size; | |
170 uint64_t blockgroup_size; | |
171 | |
172 mkv_index_t *indexes; | |
173 int num_indexes; | |
174 | |
175 off_t *parsed_cues; | |
176 int parsed_cues_num; | |
177 off_t *parsed_seekhead; | |
178 int parsed_seekhead_num; | |
179 | |
180 uint64_t *cluster_positions; | |
181 int num_cluster_pos; | |
182 | |
183 int64_t skip_to_timecode; | |
184 int v_skip_to_keyframe, a_skip_to_keyframe; | |
185 | |
186 int64_t stop_timecode; | |
187 | |
188 int last_aid; | |
189 int audio_tracks[MAX_A_STREAMS]; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
190 } mkv_demuxer_t; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
191 |
23386
585d2136f018
Get rid of __attribute__((__packed__)) in Matroska demuxer
reimar
parents:
23310
diff
changeset
|
192 #define REALHEADER_SIZE 16 |
585d2136f018
Get rid of __attribute__((__packed__)) in Matroska demuxer
reimar
parents:
23310
diff
changeset
|
193 #define RVPROPERTIES_SIZE 34 |
585d2136f018
Get rid of __attribute__((__packed__)) in Matroska demuxer
reimar
parents:
23310
diff
changeset
|
194 #define RAPROPERTIES4_SIZE 56 |
585d2136f018
Get rid of __attribute__((__packed__)) in Matroska demuxer
reimar
parents:
23310
diff
changeset
|
195 #define RAPROPERTIES5_SIZE 70 |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
196 |
20140
1861d40674ca
Simplify (by using realloc with NULL parameter) and refactor code to grow
reimar
parents:
20137
diff
changeset
|
197 /** |
1861d40674ca
Simplify (by using realloc with NULL parameter) and refactor code to grow
reimar
parents:
20137
diff
changeset
|
198 * \brief ensures there is space for at least one additional element |
29691
183ea012e25b
Change grow_array argument from void ** to void *, this avoids a aliasing
reimar
parents:
29490
diff
changeset
|
199 * \param arrayp array to grow |
20140
1861d40674ca
Simplify (by using realloc with NULL parameter) and refactor code to grow
reimar
parents:
20137
diff
changeset
|
200 * \param nelem current number of elements in array |
1861d40674ca
Simplify (by using realloc with NULL parameter) and refactor code to grow
reimar
parents:
20137
diff
changeset
|
201 * \param elsize size of one array element |
1861d40674ca
Simplify (by using realloc with NULL parameter) and refactor code to grow
reimar
parents:
20137
diff
changeset
|
202 */ |
31177 | 203 static void av_noinline grow_array(void *arrayp, int nelem, size_t elsize) |
204 { | |
205 void **array = arrayp; | |
206 void *oldp = *array; | |
207 if (nelem & 31) | |
208 return; | |
209 if (nelem > UINT_MAX / elsize - 32) | |
210 *array = NULL; | |
211 else | |
212 *array = realloc(*array, (nelem + 32) * elsize); | |
213 if (!*array) | |
214 free(oldp); | |
20140
1861d40674ca
Simplify (by using realloc with NULL parameter) and refactor code to grow
reimar
parents:
20137
diff
changeset
|
215 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
216 |
31177 | 217 static mkv_track_t *demux_mkv_find_track_by_num(mkv_demuxer_t *d, int n, |
218 int type) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
219 { |
31177 | 220 int i, id; |
221 | |
222 for (i = 0, id = 0; i < d->num_tracks; i++) | |
223 if (d->tracks[i] != NULL && d->tracks[i]->type == type) | |
224 if (id++ == n) | |
225 return d->tracks[i]; | |
226 | |
227 return NULL; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
228 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
229 |
31177 | 230 static void add_cluster_position(mkv_demuxer_t *mkv_d, uint64_t position) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
231 { |
31177 | 232 int i = mkv_d->num_cluster_pos; |
233 | |
234 while (i--) | |
235 if (mkv_d->cluster_positions[i] == position) | |
236 return; | |
237 | |
238 grow_array(&mkv_d->cluster_positions, mkv_d->num_cluster_pos, | |
239 sizeof(uint64_t)); | |
240 if (!mkv_d->cluster_positions) { | |
241 mkv_d->num_cluster_pos = 0; | |
242 return; | |
243 } | |
244 mkv_d->cluster_positions[mkv_d->num_cluster_pos++] = position; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
245 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
246 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
247 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
248 #define AAC_SYNC_EXTENSION_TYPE 0x02b7 |
31177 | 249 static int aac_get_sample_rate_index(uint32_t sample_rate) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
250 { |
31177 | 251 static const int srates[] = { |
252 92017, 75132, 55426, 46009, 37566, 27713, | |
253 23004, 18783, 13856, 11502, 9391, 0 | |
254 }; | |
255 int i = 0; | |
256 while (sample_rate < srates[i]) | |
257 i++; | |
258 return i; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
259 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
260 |
14054 | 261 /** \brief Free cached demux packets |
262 * | |
263 * Reordering the timecodes requires caching of demux packets. This function | |
264 * frees all these cached packets and the memory for the cached pointers | |
265 * itself. | |
266 * | |
267 * \param demuxer The demuxer for which the cache is to be freed. | |
268 */ | |
31177 | 269 static void free_cached_dps(demuxer_t *demuxer) |
14054 | 270 { |
31177 | 271 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
272 mkv_track_t *track; | |
273 int i, k; | |
274 | |
275 for (k = 0; k < mkv_d->num_tracks; k++) { | |
276 track = mkv_d->tracks[k]; | |
277 for (i = 0; i < track->num_cached_dps; i++) | |
278 free_demux_packet(track->cached_dps[i]); | |
279 free(track->cached_dps); | |
280 track->cached_dps = NULL; | |
281 track->num_cached_dps = 0; | |
282 track->num_allocated_dps = 0; | |
283 track->max_pts = 0; | |
14054 | 284 } |
285 } | |
286 | |
31177 | 287 static int demux_mkv_decode(mkv_track_t *track, uint8_t *src, |
32220 | 288 uint8_t **dest, size_t *size, uint32_t type) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
289 { |
31177 | 290 int i, result; |
291 int modified = 0; | |
292 | |
293 *dest = src; | |
294 if (track->num_encodings <= 0) | |
295 return 0; | |
296 | |
297 for (i = 0; i < track->num_encodings; i++) { | |
298 if (!(track->encodings[i].scope & type)) | |
299 continue; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
300 |
28440 | 301 #if CONFIG_ZLIB |
31177 | 302 if (track->encodings[i].comp_algo == 0) { |
303 /* zlib encoded track */ | |
304 z_stream zstream; | |
305 | |
306 zstream.zalloc = (alloc_func) 0; | |
307 zstream.zfree = (free_func) 0; | |
308 zstream.opaque = (voidpf) 0; | |
309 if (inflateInit(&zstream) != Z_OK) { | |
310 mp_msg(MSGT_DEMUX, MSGL_WARN, | |
311 MSGTR_MPDEMUX_MKV_ZlibInitializationFailed); | |
312 return modified; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
313 } |
31177 | 314 zstream.next_in = (Bytef *) src; |
315 zstream.avail_in = *size; | |
316 | |
317 modified = 1; | |
318 *dest = NULL; | |
319 zstream.avail_out = *size; | |
320 do { | |
32220 | 321 if (*size > SIZE_MAX - 4000) |
322 goto zlib_fail; | |
323 | |
31177 | 324 *size += 4000; |
325 *dest = realloc(*dest, *size); | |
326 zstream.next_out = (Bytef *) (*dest + zstream.total_out); | |
327 result = inflate(&zstream, Z_NO_FLUSH); | |
328 if (result != Z_OK && result != Z_STREAM_END) { | |
32220 | 329 zlib_fail: |
31177 | 330 mp_msg(MSGT_DEMUX, MSGL_WARN, |
331 MSGTR_MPDEMUX_MKV_ZlibDecompressionFailed); | |
332 free(*dest); | |
333 *dest = NULL; | |
334 inflateEnd(&zstream); | |
335 return modified; | |
336 } | |
337 zstream.avail_out += 4000; | |
338 } while (zstream.avail_out == 4000 && zstream.avail_in != 0 | |
339 && result != Z_STREAM_END); | |
340 | |
341 *size = zstream.total_out; | |
342 inflateEnd(&zstream); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
343 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
344 #endif |
31177 | 345 if (track->encodings[i].comp_algo == 2) { |
346 /* lzo encoded track */ | |
32220 | 347 int dstlen = *size > SIZE_MAX/3 ? *size : *size * 3; |
31177 | 348 |
349 *dest = NULL; | |
350 while (1) { | |
351 int srclen = *size; | |
352 if (dstlen > SIZE_MAX - AV_LZO_OUTPUT_PADDING) | |
353 goto lzo_fail; | |
354 *dest = realloc(*dest, dstlen + AV_LZO_OUTPUT_PADDING); | |
355 result = av_lzo1x_decode(*dest, &dstlen, src, &srclen); | |
356 if (result == 0) | |
357 break; | |
358 if (!(result & AV_LZO_OUTPUT_FULL)) { | |
359 lzo_fail: | |
360 mp_msg(MSGT_DEMUX, MSGL_WARN, | |
361 MSGTR_MPDEMUX_MKV_LzoDecompressionFailed); | |
362 free(*dest); | |
363 *dest = NULL; | |
364 return modified; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
365 } |
31177 | 366 mp_msg(MSGT_DEMUX, MSGL_DBG2, |
367 "[mkv] lzo decompression buffer too small.\n"); | |
32220 | 368 if (dstlen > (SIZE_MAX - AV_LZO_OUTPUT_PADDING)/2) |
369 goto lzo_fail; | |
31177 | 370 dstlen *= 2; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
371 } |
31177 | 372 *size = dstlen; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
373 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
374 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
375 |
31177 | 376 return modified; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
377 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
378 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
379 |
31177 | 380 static int demux_mkv_read_info(demuxer_t *demuxer) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
381 { |
31177 | 382 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
383 stream_t *s = demuxer->stream; | |
384 uint64_t length, l; | |
385 int il; | |
386 uint64_t tc_scale = 1000000; | |
387 long double duration = 0.; | |
388 | |
389 length = ebml_read_length(s, NULL); | |
390 while (length > 0) { | |
391 switch (ebml_read_id(s, &il)) { | |
392 case MATROSKA_ID_TIMECODESCALE: | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
393 { |
31177 | 394 uint64_t num = ebml_read_uint(s, &l); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
395 if (num == EBML_UINT_INVALID) |
31177 | 396 return 1; |
19809
99d375aab4db
Fix movie duration calculation in case when TimecodeScale element comes after
eugeni
parents:
19645
diff
changeset
|
397 tc_scale = num; |
31177 | 398 mp_msg(MSGT_DEMUX, MSGL_V, |
399 "[mkv] | + timecode scale: %" PRIu64 "\n", tc_scale); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
400 break; |
31177 | 401 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
402 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
403 case MATROSKA_ID_DURATION: |
31177 | 404 { |
405 long double num = ebml_read_float(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
406 if (num == EBML_FLOAT_INVALID) |
31177 | 407 return 1; |
19809
99d375aab4db
Fix movie duration calculation in case when TimecodeScale element comes after
eugeni
parents:
19645
diff
changeset
|
408 duration = num; |
31177 | 409 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + duration: %.3Lfs\n", |
410 duration * tc_scale / 1000000000.0); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
411 break; |
31177 | 412 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
413 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
414 default: |
31177 | 415 ebml_read_skip(s, &l); |
416 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
417 } |
31177 | 418 length -= l + il; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
419 } |
31177 | 420 mkv_d->tc_scale = tc_scale; |
421 mkv_d->duration = duration * tc_scale / 1000000000.0; | |
422 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
423 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
424 |
20133 | 425 /** |
426 * \brief free array of kv_content_encoding_t | |
427 * \param encodings pointer to array | |
428 * \param numencodings number of encodings in array | |
429 */ | |
31177 | 430 static void demux_mkv_free_encodings(mkv_content_encoding_t *encodings, |
431 int numencodings) | |
20133 | 432 { |
31177 | 433 while (numencodings-- > 0) |
434 free(encodings[numencodings].comp_settings); | |
435 free(encodings); | |
20133 | 436 } |
437 | |
31177 | 438 static int demux_mkv_read_trackencodings(demuxer_t *demuxer, |
439 mkv_track_t *track) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
440 { |
31177 | 441 stream_t *s = demuxer->stream; |
442 mkv_content_encoding_t *ce, e; | |
443 uint64_t len, length, l; | |
444 int il, n; | |
445 | |
446 ce = malloc(sizeof(*ce)); | |
447 n = 0; | |
448 | |
449 len = length = ebml_read_length(s, &il); | |
450 len += il; | |
451 while (length > 0) { | |
452 switch (ebml_read_id(s, &il)) { | |
453 case MATROSKA_ID_CONTENTENCODING: | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
454 { |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
455 uint64_t len; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
456 int i; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
457 |
31177 | 458 memset(&e, 0, sizeof(e)); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
459 e.scope = 1; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
460 |
31177 | 461 len = ebml_read_length(s, &i); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
462 l = len + i; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
463 |
31177 | 464 while (len > 0) { |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
465 uint64_t num, l; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
466 int il; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
467 |
31177 | 468 switch (ebml_read_id(s, &il)) { |
469 case MATROSKA_ID_CONTENTENCODINGORDER: | |
470 num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
471 if (num == EBML_UINT_INVALID) |
31177 | 472 goto err_out; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
473 e.order = num; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
474 break; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
475 |
31177 | 476 case MATROSKA_ID_CONTENTENCODINGSCOPE: |
477 num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
478 if (num == EBML_UINT_INVALID) |
31177 | 479 goto err_out; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
480 e.scope = num; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
481 break; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
482 |
31177 | 483 case MATROSKA_ID_CONTENTENCODINGTYPE: |
484 num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
485 if (num == EBML_UINT_INVALID) |
31177 | 486 goto err_out; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
487 e.type = num; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
488 break; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
489 |
31177 | 490 case MATROSKA_ID_CONTENTCOMPRESSION: |
491 { | |
492 uint64_t le; | |
493 | |
494 le = ebml_read_length(s, &i); | |
495 l = le + i; | |
496 | |
497 while (le > 0) { | |
498 uint64_t l; | |
499 int il; | |
500 | |
501 switch (ebml_read_id(s, &il)) { | |
502 case MATROSKA_ID_CONTENTCOMPALGO: | |
503 num = ebml_read_uint(s, &l); | |
504 if (num == EBML_UINT_INVALID) | |
20133 | 505 goto err_out; |
31177 | 506 e.comp_algo = num; |
507 break; | |
508 | |
509 case MATROSKA_ID_CONTENTCOMPSETTINGS: | |
510 l = ebml_read_length(s, &i); | |
32220 | 511 if (l > SIZE_MAX) |
512 goto err_out; | |
31177 | 513 e.comp_settings = malloc(l); |
514 stream_read(s, e.comp_settings, l); | |
515 e.comp_settings_len = l; | |
516 l += i; | |
517 break; | |
518 | |
519 default: | |
520 ebml_read_skip(s, &l); | |
521 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
522 } |
31177 | 523 le -= l + il; |
524 } | |
525 | |
526 if (e.type == 1) { | |
527 mp_msg(MSGT_DEMUX, MSGL_WARN, | |
528 MSGTR_MPDEMUX_MKV_TrackEncrypted, | |
529 track->tnum); | |
530 } else if (e.type != 0) { | |
531 mp_msg(MSGT_DEMUX, MSGL_WARN, | |
532 MSGTR_MPDEMUX_MKV_UnknownContentEncoding, | |
533 track->tnum); | |
534 } | |
535 | |
536 if (e.comp_algo != 0 && e.comp_algo != 2) { | |
537 mp_msg(MSGT_DEMUX, MSGL_WARN, | |
538 MSGTR_MPDEMUX_MKV_UnknownCompression, | |
539 track->tnum, e.comp_algo); | |
540 } | |
28440 | 541 #if !CONFIG_ZLIB |
31177 | 542 else if (e.comp_algo == 0) { |
543 mp_msg(MSGT_DEMUX, MSGL_WARN, | |
544 MSGTR_MPDEMUX_MKV_ZlibCompressionUnsupported, | |
545 track->tnum); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
546 } |
31177 | 547 #endif |
548 | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
549 break; |
31177 | 550 } |
551 | |
552 default: | |
553 ebml_read_skip(s, &l); | |
554 break; | |
555 } | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
556 len -= l + il; |
31177 | 557 } |
558 for (i = 0; i < n; i++) | |
559 if (e.order <= ce[i].order) | |
560 break; | |
561 ce = realloc(ce, (n + 1) * sizeof(*ce)); | |
562 memmove(ce + i + 1, ce + i, (n - i) * sizeof(*ce)); | |
563 memcpy(ce + i, &e, sizeof(e)); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
564 n++; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
565 break; |
31177 | 566 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
567 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
568 default: |
31177 | 569 ebml_read_skip(s, &l); |
570 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
571 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
572 |
31177 | 573 length -= l + il; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
574 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
575 |
31177 | 576 track->encodings = ce; |
577 track->num_encodings = n; | |
578 return len; | |
20133 | 579 |
580 err_out: | |
31177 | 581 demux_mkv_free_encodings(ce, n); |
582 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
583 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
584 |
31177 | 585 static int demux_mkv_read_trackaudio(demuxer_t *demuxer, mkv_track_t *track) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
586 { |
31177 | 587 stream_t *s = demuxer->stream; |
588 uint64_t len, length, l; | |
589 int il; | |
590 | |
591 track->a_sfreq = 8000.0; | |
592 track->a_channels = 1; | |
593 | |
594 len = length = ebml_read_length(s, &il); | |
595 len += il; | |
596 while (length > 0) { | |
597 switch (ebml_read_id(s, &il)) { | |
598 case MATROSKA_ID_AUDIOSAMPLINGFREQ: | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
599 { |
31177 | 600 long double num = ebml_read_float(s, &l); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
601 if (num == EBML_FLOAT_INVALID) |
31177 | 602 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
603 track->a_sfreq = num; |
31177 | 604 mp_msg(MSGT_DEMUX, MSGL_V, |
605 "[mkv] | + Sampling frequency: %f\n", track->a_sfreq); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
606 break; |
31177 | 607 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
608 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
609 case MATROSKA_ID_AUDIOBITDEPTH: |
31177 | 610 { |
611 uint64_t num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
612 if (num == EBML_UINT_INVALID) |
31177 | 613 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
614 track->a_bps = num; |
31177 | 615 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Bit depth: %u\n", |
616 track->a_bps); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
617 break; |
31177 | 618 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
619 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
620 case MATROSKA_ID_AUDIOCHANNELS: |
31177 | 621 { |
622 uint64_t num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
623 if (num == EBML_UINT_INVALID) |
31177 | 624 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
625 track->a_channels = num; |
31177 | 626 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Channels: %u\n", |
627 track->a_channels); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
628 break; |
31177 | 629 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
630 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
631 default: |
31177 | 632 ebml_read_skip(s, &l); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
633 break; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
634 } |
31177 | 635 length -= l + il; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
636 } |
31177 | 637 return len; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
638 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
639 |
31177 | 640 static int demux_mkv_read_trackvideo(demuxer_t *demuxer, mkv_track_t *track) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
641 { |
31177 | 642 stream_t *s = demuxer->stream; |
643 uint64_t len, length, l; | |
644 int il; | |
645 | |
646 len = length = ebml_read_length(s, &il); | |
647 len += il; | |
648 while (length > 0) { | |
649 switch (ebml_read_id(s, &il)) { | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
650 case MATROSKA_ID_VIDEOFRAMERATE: |
31177 | 651 { |
652 long double num = ebml_read_float(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
653 if (num == EBML_FLOAT_INVALID) |
31177 | 654 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
655 track->v_frate = num; |
31177 | 656 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Frame rate: %f\n", |
657 track->v_frate); | |
14058
4dee22ed8608
Make use of the default duration for one frame if it is present in the file. This produces much smoother timecodes for laced audio frames. And I REALLY don't know why I missed that before...
mosu
parents:
14054
diff
changeset
|
658 if (track->v_frate > 0) |
31177 | 659 track->default_duration = 1 / track->v_frate; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
660 break; |
31177 | 661 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
662 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
663 case MATROSKA_ID_VIDEODISPLAYWIDTH: |
31177 | 664 { |
665 uint64_t num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
666 if (num == EBML_UINT_INVALID) |
31177 | 667 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
668 track->v_dwidth = num; |
31177 | 669 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Display width: %u\n", |
670 track->v_dwidth); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
671 break; |
31177 | 672 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
673 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
674 case MATROSKA_ID_VIDEODISPLAYHEIGHT: |
31177 | 675 { |
676 uint64_t num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
677 if (num == EBML_UINT_INVALID) |
31177 | 678 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
679 track->v_dheight = num; |
31177 | 680 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Display height: %u\n", |
681 track->v_dheight); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
682 break; |
31177 | 683 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
684 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
685 case MATROSKA_ID_VIDEOPIXELWIDTH: |
31177 | 686 { |
687 uint64_t num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
688 if (num == EBML_UINT_INVALID) |
31177 | 689 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
690 track->v_width = num; |
31177 | 691 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Pixel width: %u\n", |
692 track->v_width); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
693 break; |
31177 | 694 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
695 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
696 case MATROSKA_ID_VIDEOPIXELHEIGHT: |
31177 | 697 { |
698 uint64_t num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
699 if (num == EBML_UINT_INVALID) |
31177 | 700 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
701 track->v_height = num; |
31177 | 702 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Pixel height: %u\n", |
703 track->v_height); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
704 break; |
31177 | 705 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
706 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
707 default: |
31177 | 708 ebml_read_skip(s, &l); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
709 break; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
710 } |
31177 | 711 length -= l + il; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
712 } |
31177 | 713 return len; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
714 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
715 |
20135
7079d029d27c
Free track data if error occurs while reading trackentry
reimar
parents:
20133
diff
changeset
|
716 /** |
7079d029d27c
Free track data if error occurs while reading trackentry
reimar
parents:
20133
diff
changeset
|
717 * \brief free any data associated with given track |
7079d029d27c
Free track data if error occurs while reading trackentry
reimar
parents:
20133
diff
changeset
|
718 * \param track track of which to free data |
7079d029d27c
Free track data if error occurs while reading trackentry
reimar
parents:
20133
diff
changeset
|
719 */ |
31177 | 720 static void demux_mkv_free_trackentry(mkv_track_t *track) |
721 { | |
722 free(track->name); | |
723 free(track->codec_id); | |
724 free(track->language); | |
725 free(track->private_data); | |
726 free(track->audio_buf); | |
727 free(track->audio_timestamp); | |
728 demux_mkv_free_encodings(track->encodings, track->num_encodings); | |
729 free(track); | |
20135
7079d029d27c
Free track data if error occurs while reading trackentry
reimar
parents:
20133
diff
changeset
|
730 } |
7079d029d27c
Free track data if error occurs while reading trackentry
reimar
parents:
20133
diff
changeset
|
731 |
31177 | 732 static int demux_mkv_read_trackentry(demuxer_t *demuxer) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
733 { |
31177 | 734 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
735 stream_t *s = demuxer->stream; | |
736 mkv_track_t *track; | |
737 uint64_t len, length, l; | |
738 int il; | |
739 | |
740 track = calloc(1, sizeof(*track)); | |
741 /* set default values */ | |
742 track->default_track = 1; | |
743 track->name = 0; | |
744 track->language = strdup("eng"); | |
745 | |
746 len = length = ebml_read_length(s, &il); | |
747 len += il; | |
748 while (length > 0) { | |
749 switch (ebml_read_id(s, &il)) { | |
750 case MATROSKA_ID_TRACKNUMBER: | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
751 { |
31177 | 752 uint64_t num = ebml_read_uint(s, &l); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
753 if (num == EBML_UINT_INVALID) |
31177 | 754 goto err_out; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
755 track->tnum = num; |
31177 | 756 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Track number: %u\n", |
757 track->tnum); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
758 break; |
31177 | 759 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
760 |
19640 | 761 case MATROSKA_ID_TRACKNAME: |
31177 | 762 track->name = ebml_read_utf8(s, &l); |
19640 | 763 if (track->name == NULL) |
31177 | 764 goto err_out; |
765 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Name: %s\n", | |
766 track->name); | |
19640 | 767 break; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29238
diff
changeset
|
768 |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
769 case MATROSKA_ID_TRACKTYPE: |
31177 | 770 { |
771 uint64_t num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
772 if (num == EBML_UINT_INVALID) |
31177 | 773 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
774 track->type = num; |
31177 | 775 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Track type: "); |
776 switch (track->type) { | |
777 case MATROSKA_TRACK_AUDIO: | |
778 mp_msg(MSGT_DEMUX, MSGL_V, "Audio\n"); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
779 break; |
31177 | 780 case MATROSKA_TRACK_VIDEO: |
781 mp_msg(MSGT_DEMUX, MSGL_V, "Video\n"); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
782 break; |
31177 | 783 case MATROSKA_TRACK_SUBTITLE: |
784 mp_msg(MSGT_DEMUX, MSGL_V, "Subtitle\n"); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
785 break; |
31177 | 786 default: |
787 mp_msg(MSGT_DEMUX, MSGL_V, "unknown\n"); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
788 break; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
789 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
790 break; |
31177 | 791 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
792 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
793 case MATROSKA_ID_TRACKAUDIO: |
31177 | 794 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Audio track\n"); |
795 l = demux_mkv_read_trackaudio(demuxer, track); | |
796 if (l == 0) | |
797 goto err_out; | |
798 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
799 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
800 case MATROSKA_ID_TRACKVIDEO: |
31177 | 801 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Video track\n"); |
802 l = demux_mkv_read_trackvideo(demuxer, track); | |
803 if (l == 0) | |
804 goto err_out; | |
805 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
806 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
807 case MATROSKA_ID_CODECID: |
31177 | 808 track->codec_id = ebml_read_ascii(s, &l); |
809 if (track->codec_id == NULL) | |
810 goto err_out; | |
811 if (!strcmp(track->codec_id, MKV_V_MSCOMP) | |
812 || !strcmp(track->codec_id, MKV_A_ACM)) | |
813 track->ms_compat = 1; | |
814 else if (!strcmp(track->codec_id, MKV_S_VOBSUB)) | |
815 track->subtitle_type = MATROSKA_SUBTYPE_VOBSUB; | |
816 else if (!strcmp(track->codec_id, MKV_S_TEXTSSA) | |
817 || !strcmp(track->codec_id, MKV_S_TEXTASS) | |
818 || !strcmp(track->codec_id, MKV_S_SSA) | |
819 || !strcmp(track->codec_id, MKV_S_ASS)) { | |
820 track->subtitle_type = MATROSKA_SUBTYPE_SSA; | |
821 } else if (!strcmp(track->codec_id, MKV_S_TEXTASCII)) | |
822 track->subtitle_type = MATROSKA_SUBTYPE_TEXT; | |
823 if (!strcmp(track->codec_id, MKV_S_TEXTUTF8)) { | |
824 track->subtitle_type = MATROSKA_SUBTYPE_TEXT; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
825 } |
31177 | 826 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Codec ID: %s\n", |
827 track->codec_id); | |
828 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
829 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
830 case MATROSKA_ID_CODECPRIVATE: |
31177 | 831 { |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
832 int x; |
31177 | 833 uint64_t num = ebml_read_length(s, &x); |
834 // audit: cheap guard against overflows later.. | |
835 if (num > SIZE_MAX - 1000) | |
836 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
837 l = x + num; |
31177 | 838 track->private_data = malloc(num + AV_LZO_INPUT_PADDING); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
839 if (stream_read(s, track->private_data, num) != (int) num) |
31177 | 840 goto err_out; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
841 track->private_size = num; |
31177 | 842 mp_msg(MSGT_DEMUX, MSGL_V, |
843 "[mkv] | + CodecPrivate, length " "%u\n", | |
844 track->private_size); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
845 break; |
31177 | 846 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
847 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
848 case MATROSKA_ID_TRACKLANGUAGE: |
31177 | 849 free(track->language); |
850 track->language = ebml_read_utf8(s, &l); | |
851 if (track->language == NULL) | |
852 goto err_out; | |
853 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Language: %s\n", | |
854 track->language); | |
855 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
856 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
857 case MATROSKA_ID_TRACKFLAGDEFAULT: |
31177 | 858 { |
859 uint64_t num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
860 if (num == EBML_UINT_INVALID) |
31177 | 861 goto err_out; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
862 track->default_track = num; |
31177 | 863 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Default flag: %u\n", |
864 track->default_track); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
865 break; |
31177 | 866 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
867 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
868 case MATROSKA_ID_TRACKDEFAULTDURATION: |
31177 | 869 { |
870 uint64_t num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
871 if (num == EBML_UINT_INVALID) |
31177 | 872 goto err_out; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
873 if (num == 0) |
31177 | 874 mp_msg(MSGT_DEMUX, MSGL_V, |
875 "[mkv] | + Default duration: 0"); | |
876 else { | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
877 track->v_frate = 1000000000.0 / num; |
14058
4dee22ed8608
Make use of the default duration for one frame if it is present in the file. This produces much smoother timecodes for laced audio frames. And I REALLY don't know why I missed that before...
mosu
parents:
14054
diff
changeset
|
878 track->default_duration = num / 1000000000.0; |
31177 | 879 mp_msg(MSGT_DEMUX, MSGL_V, |
880 "[mkv] | + Default duration: " | |
881 "%.3fms ( = %.3f fps)\n", num / 1000000.0, | |
882 track->v_frate); | |
883 } | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
884 break; |
31177 | 885 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
886 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
887 case MATROSKA_ID_TRACKENCODINGS: |
31177 | 888 l = demux_mkv_read_trackencodings(demuxer, track); |
889 if (l == 0) | |
890 goto err_out; | |
891 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
892 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
893 default: |
31177 | 894 ebml_read_skip(s, &l); |
895 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
896 } |
31177 | 897 length -= l + il; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
898 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
899 |
31177 | 900 mkv_d->tracks[mkv_d->num_tracks++] = track; |
901 return len; | |
20135
7079d029d27c
Free track data if error occurs while reading trackentry
reimar
parents:
20133
diff
changeset
|
902 |
7079d029d27c
Free track data if error occurs while reading trackentry
reimar
parents:
20133
diff
changeset
|
903 err_out: |
31177 | 904 demux_mkv_free_trackentry(track); |
905 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
906 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
907 |
31177 | 908 static int demux_mkv_read_tracks(demuxer_t *demuxer) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
909 { |
31177 | 910 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
911 stream_t *s = demuxer->stream; | |
912 uint64_t length, l; | |
913 int il; | |
914 | |
915 mkv_d->tracks = malloc(sizeof(*mkv_d->tracks)); | |
916 mkv_d->num_tracks = 0; | |
917 | |
918 length = ebml_read_length(s, NULL); | |
919 while (length > 0) { | |
920 switch (ebml_read_id(s, &il)) { | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
921 case MATROSKA_ID_TRACKENTRY: |
31177 | 922 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + a track...\n"); |
923 mkv_d->tracks = realloc(mkv_d->tracks, (mkv_d->num_tracks + 1) | |
924 * sizeof(*mkv_d->tracks)); | |
925 l = demux_mkv_read_trackentry(demuxer); | |
926 if (l == 0) | |
927 return 1; | |
928 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
929 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
930 default: |
31177 | 931 ebml_read_skip(s, &l); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
932 break; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
933 } |
31177 | 934 length -= l + il; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
935 } |
31177 | 936 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
937 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
938 |
31177 | 939 static int demux_mkv_read_cues(demuxer_t *demuxer) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
940 { |
31177 | 941 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
942 stream_t *s = demuxer->stream; | |
943 uint64_t length, l, time, track, pos; | |
944 off_t off; | |
945 int i, il; | |
946 | |
947 if (index_mode == 0) { | |
948 ebml_read_skip(s, NULL); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
949 return 0; |
31177 | 950 } |
951 off = stream_tell(s); | |
952 for (i = 0; i < mkv_d->parsed_cues_num; i++) | |
953 if (mkv_d->parsed_cues[i] == off) { | |
954 ebml_read_skip(s, NULL); | |
955 return 0; | |
956 } | |
957 mkv_d->parsed_cues = realloc(mkv_d->parsed_cues, | |
958 (mkv_d->parsed_cues_num + 1) * sizeof(off_t)); | |
959 mkv_d->parsed_cues[mkv_d->parsed_cues_num++] = off; | |
960 | |
961 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] /---- [ parsing cues ] -----------\n"); | |
962 length = ebml_read_length(s, NULL); | |
963 | |
964 while (length > 0) { | |
965 time = track = pos = EBML_UINT_INVALID; | |
966 | |
967 switch (ebml_read_id(s, &il)) { | |
968 case MATROSKA_ID_POINTENTRY: | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
969 { |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
970 uint64_t len; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
971 |
31177 | 972 len = ebml_read_length(s, &i); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
973 l = len + i; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
974 |
31177 | 975 while (len > 0) { |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
976 uint64_t l; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
977 int il; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
978 |
31177 | 979 switch (ebml_read_id(s, &il)) { |
980 case MATROSKA_ID_CUETIME: | |
981 time = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
982 break; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
983 |
31177 | 984 case MATROSKA_ID_CUETRACKPOSITION: |
985 { | |
986 uint64_t le; | |
987 | |
988 le = ebml_read_length(s, &i); | |
989 l = le + i; | |
990 | |
991 while (le > 0) { | |
992 uint64_t l; | |
993 int il; | |
994 | |
995 switch (ebml_read_id(s, &il)) { | |
996 case MATROSKA_ID_CUETRACK: | |
997 track = ebml_read_uint(s, &l); | |
998 break; | |
999 | |
1000 case MATROSKA_ID_CUECLUSTERPOSITION: | |
1001 pos = ebml_read_uint(s, &l); | |
1002 break; | |
1003 | |
1004 default: | |
1005 ebml_read_skip(s, &l); | |
1006 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1007 } |
31177 | 1008 le -= l + il; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1009 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1010 break; |
31177 | 1011 } |
1012 | |
1013 default: | |
1014 ebml_read_skip(s, &l); | |
1015 break; | |
1016 } | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1017 len -= l + il; |
31177 | 1018 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1019 break; |
31177 | 1020 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1021 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1022 default: |
31177 | 1023 ebml_read_skip(s, &l); |
1024 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1025 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1026 |
31177 | 1027 length -= l + il; |
1028 | |
1029 if (time != EBML_UINT_INVALID && track != EBML_UINT_INVALID | |
1030 && pos != EBML_UINT_INVALID) { | |
1031 grow_array(&mkv_d->indexes, mkv_d->num_indexes, | |
1032 sizeof(mkv_index_t)); | |
1033 if (!mkv_d->indexes) { | |
1034 mkv_d->num_indexes = 0; | |
1035 break; | |
1036 } | |
1037 mkv_d->indexes[mkv_d->num_indexes].tnum = track; | |
1038 mkv_d->indexes[mkv_d->num_indexes].timecode = time; | |
1039 mkv_d->indexes[mkv_d->num_indexes].filepos = mkv_d->segment_start | |
1040 + pos; | |
1041 mp_msg(MSGT_DEMUX, MSGL_DBG2, | |
1042 "[mkv] |+ found cue point " "for track %" PRIu64 | |
1043 ": timecode %" PRIu64 ", filepos: %" PRIu64 "\n", track, | |
1044 time, mkv_d->segment_start + pos); | |
1045 mkv_d->num_indexes++; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1046 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1047 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1048 |
31177 | 1049 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] \\---- [ parsing cues ] -----------\n"); |
1050 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1051 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1052 |
31177 | 1053 static int demux_mkv_read_chapters(demuxer_t *demuxer) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1054 { |
31177 | 1055 stream_t *s = demuxer->stream; |
1056 uint64_t length, l; | |
1057 int il; | |
1058 | |
1059 if (demuxer->chapters) { | |
1060 ebml_read_skip(s, NULL); | |
1061 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1062 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1063 |
31177 | 1064 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] /---- [ parsing chapters ] ---------\n"); |
1065 length = ebml_read_length(s, NULL); | |
1066 | |
1067 while (length > 0) { | |
1068 switch (ebml_read_id(s, &il)) { | |
1069 case MATROSKA_ID_EDITIONENTRY: | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1070 { |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1071 uint64_t len; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1072 int i; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1073 |
31177 | 1074 len = ebml_read_length(s, &i); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1075 l = len + i; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1076 |
31177 | 1077 while (len > 0) { |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1078 uint64_t l; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1079 int il; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1080 |
31177 | 1081 switch (ebml_read_id(s, &il)) { |
1082 case MATROSKA_ID_CHAPTERATOM: | |
1083 { | |
1084 uint64_t len, start = 0, end = 0; | |
1085 char *name = 0; | |
1086 int i; | |
1087 int cid; | |
1088 | |
1089 len = ebml_read_length(s, &i); | |
1090 l = len + i; | |
1091 | |
1092 while (len > 0) { | |
1093 uint64_t l; | |
1094 int il; | |
1095 | |
1096 switch (ebml_read_id(s, &il)) { | |
1097 case MATROSKA_ID_CHAPTERTIMESTART: | |
1098 start = ebml_read_uint(s, &l) / 1000000; | |
1099 break; | |
1100 | |
1101 case MATROSKA_ID_CHAPTERTIMEEND: | |
1102 end = ebml_read_uint(s, &l) / 1000000; | |
1103 break; | |
1104 | |
1105 case MATROSKA_ID_CHAPTERDISPLAY: | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1106 { |
31177 | 1107 uint64_t len; |
1108 int i; | |
1109 | |
1110 len = ebml_read_length(s, &i); | |
1111 l = len + i; | |
1112 while (len > 0) { | |
1113 uint64_t l; | |
1114 int il; | |
1115 | |
1116 switch (ebml_read_id(s, &il)) { | |
1117 case MATROSKA_ID_CHAPSTRING: | |
1118 name = ebml_read_utf8(s, &l); | |
1119 break; | |
1120 default: | |
1121 ebml_read_skip(s, &l); | |
1122 break; | |
1123 } | |
1124 len -= l + il; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1125 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1126 } |
31177 | 1127 break; |
1128 | |
1129 default: | |
1130 ebml_read_skip(s, &l); | |
1131 break; | |
1132 } | |
1133 len -= l + il; | |
1134 } | |
1135 | |
1136 if (!name) | |
19342 | 1137 name = strdup("(unnamed)"); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29238
diff
changeset
|
1138 |
31177 | 1139 cid = demuxer_add_chapter(demuxer, name, start, end); |
1140 | |
1141 mp_msg(MSGT_DEMUX, MSGL_V, | |
1142 "[mkv] Chapter %u from %02d:%02d:%02d." | |
1143 "%03d to %02d:%02d:%02d.%03d, %s\n", cid, | |
1144 (int) (start / 60 / 60 / 1000), | |
1145 (int) ((start / 60 / 1000) % 60), | |
1146 (int) ((start / 1000) % 60), | |
1147 (int) (start % 1000), | |
1148 (int) (end / 60 / 60 / 1000), | |
1149 (int) ((end / 60 / 1000) % 60), | |
1150 (int) ((end / 1000) % 60), | |
1151 (int) (end % 1000), name); | |
1152 | |
1153 free(name); | |
1154 break; | |
1155 } | |
1156 | |
1157 default: | |
1158 ebml_read_skip(s, &l); | |
1159 break; | |
1160 } | |
1161 len -= l + il; | |
1162 } | |
1163 break; | |
1164 } | |
1165 | |
1166 default: | |
1167 ebml_read_skip(s, &l); | |
1168 break; | |
1169 } | |
1170 | |
1171 length -= l + il; | |
1172 } | |
1173 | |
1174 mp_msg(MSGT_DEMUX, MSGL_V, | |
1175 "[mkv] \\---- [ parsing chapters ] ---------\n"); | |
1176 return 0; | |
1177 } | |
1178 | |
1179 static int demux_mkv_read_tags(demuxer_t *demuxer) | |
1180 { | |
1181 ebml_read_skip(demuxer->stream, NULL); | |
1182 return 0; | |
1183 } | |
1184 | |
1185 static int demux_mkv_read_attachments(demuxer_t *demuxer) | |
1186 { | |
1187 stream_t *s = demuxer->stream; | |
1188 uint64_t length, l; | |
1189 int il; | |
1190 | |
1191 mp_msg(MSGT_DEMUX, MSGL_V, | |
1192 "[mkv] /---- [ parsing attachments ] ---------\n"); | |
1193 length = ebml_read_length(s, NULL); | |
1194 | |
1195 while (length > 0) { | |
1196 switch (ebml_read_id(s, &il)) { | |
1197 case MATROSKA_ID_ATTACHEDFILE: | |
1198 { | |
1199 uint64_t len; | |
1200 int i; | |
1201 char *name = NULL; | |
1202 char *mime = NULL; | |
1203 char *data = NULL; | |
1204 int data_size = 0; | |
1205 | |
1206 len = ebml_read_length(s, &i); | |
1207 l = len + i; | |
1208 | |
1209 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + an attachment...\n"); | |
1210 | |
1211 while (len > 0) { | |
1212 uint64_t l; | |
1213 int il; | |
1214 | |
1215 switch (ebml_read_id(s, &il)) { | |
1216 case MATROSKA_ID_FILENAME: | |
1217 name = ebml_read_utf8(s, &l); | |
1218 if (name == NULL) | |
1219 return 0; | |
1220 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + FileName: %s\n", | |
1221 name); | |
1222 break; | |
1223 | |
1224 case MATROSKA_ID_FILEMIMETYPE: | |
1225 mime = ebml_read_ascii(s, &l); | |
1226 if (mime == NULL) | |
1227 return 0; | |
1228 mp_msg(MSGT_DEMUX, MSGL_V, | |
1229 "[mkv] | + FileMimeType: %s\n", mime); | |
1230 break; | |
1231 | |
1232 case MATROSKA_ID_FILEDATA: | |
1233 { | |
1234 int x; | |
1235 uint64_t num = ebml_read_length(s, &x); | |
1236 l = x + num; | |
1237 free(data); | |
32220 | 1238 if (num > SIZE_MAX) |
1239 return 0; | |
31177 | 1240 data = malloc(num); |
1241 if (stream_read(s, data, num) != (int) num) { | |
1242 free(data); | |
1243 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1244 } |
31177 | 1245 data_size = num; |
1246 mp_msg(MSGT_DEMUX, MSGL_V, | |
1247 "[mkv] | + FileData, length " "%u\n", | |
1248 data_size); | |
1249 break; | |
1250 } | |
1251 | |
1252 default: | |
1253 ebml_read_skip(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1254 break; |
31177 | 1255 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1256 len -= l + il; |
31177 | 1257 } |
1258 | |
1259 demuxer_add_attachment(demuxer, name, mime, data, data_size); | |
1260 mp_msg(MSGT_DEMUX, MSGL_V, | |
1261 "[mkv] Attachment: %s, %s, %u bytes\n", name, mime, | |
1262 data_size); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1263 break; |
31177 | 1264 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1265 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1266 default: |
31177 | 1267 ebml_read_skip(s, &l); |
1268 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1269 } |
31177 | 1270 length -= l + il; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1271 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1272 |
31177 | 1273 mp_msg(MSGT_DEMUX, MSGL_V, |
1274 "[mkv] \\---- [ parsing attachments ] ---------\n"); | |
1275 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1276 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1277 |
31177 | 1278 static int demux_mkv_read_seekhead(demuxer_t *demuxer) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1279 { |
31177 | 1280 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
1281 stream_t *s = demuxer->stream; | |
1282 uint64_t length, l, seek_pos, saved_pos, num; | |
1283 uint32_t seek_id; | |
1284 int i, il, res = 0; | |
1285 off_t off; | |
1286 | |
1287 off = stream_tell(s); | |
1288 for (i = 0; i < mkv_d->parsed_seekhead_num; i++) | |
1289 if (mkv_d->parsed_seekhead[i] == off) { | |
1290 ebml_read_skip(s, NULL); | |
1291 return 0; | |
1292 } | |
32220 | 1293 if (mkv_d->parsed_seekhead_num >= INT_MAX || |
1294 mkv_d->parsed_seekhead_num > SIZE_MAX/sizeof(off_t)) | |
1295 return 0; | |
31177 | 1296 mkv_d->parsed_seekhead = realloc(mkv_d->parsed_seekhead, |
1297 (mkv_d->parsed_seekhead_num + 1) | |
1298 * sizeof(off_t)); | |
1299 mkv_d->parsed_seekhead[mkv_d->parsed_seekhead_num++] = off; | |
1300 | |
1301 mp_msg(MSGT_DEMUX, MSGL_V, | |
1302 "[mkv] /---- [ parsing seek head ] ---------\n"); | |
1303 length = ebml_read_length(s, NULL); | |
1304 /* off now holds the position of the next element after the seek head. */ | |
1305 off = stream_tell(s) + length; | |
1306 while (length > 0 && !res) { | |
1307 | |
1308 seek_id = 0; | |
1309 seek_pos = EBML_UINT_INVALID; | |
1310 | |
1311 switch (ebml_read_id(s, &il)) { | |
1312 case MATROSKA_ID_SEEKENTRY: | |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1313 { |
31177 | 1314 uint64_t len; |
1315 | |
1316 len = ebml_read_length(s, &i); | |
1317 l = len + i; | |
1318 | |
1319 while (len > 0) { | |
1320 uint64_t l; | |
1321 int il; | |
1322 | |
1323 switch (ebml_read_id(s, &il)) { | |
1324 case MATROSKA_ID_SEEKID: | |
1325 num = ebml_read_uint(s, &l); | |
1326 if (num != EBML_UINT_INVALID) | |
1327 seek_id = num; | |
1328 break; | |
1329 | |
1330 case MATROSKA_ID_SEEKPOSITION: | |
1331 seek_pos = ebml_read_uint(s, &l); | |
1332 break; | |
1333 | |
1334 default: | |
1335 ebml_read_skip(s, &l); | |
1336 break; | |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1337 } |
31177 | 1338 len -= l + il; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1339 } |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1340 |
31177 | 1341 break; |
1342 } | |
1343 | |
1344 default: | |
1345 ebml_read_skip(s, &l); | |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1346 break; |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1347 } |
31177 | 1348 length -= l + il; |
1349 | |
1350 if (seek_id == 0 || seek_id == MATROSKA_ID_CLUSTER | |
1351 || seek_pos == EBML_UINT_INVALID | |
1352 || ((mkv_d->segment_start + seek_pos) >= | |
1353 (uint64_t) demuxer->movi_end)) | |
1354 continue; | |
1355 | |
1356 saved_pos = stream_tell(s); | |
1357 if (!stream_seek(s, mkv_d->segment_start + seek_pos)) | |
1358 res = 1; | |
1359 else { | |
1360 if (ebml_read_id(s, &il) != seek_id) | |
1361 res = 1; | |
1362 else | |
1363 switch (seek_id) { | |
1364 case MATROSKA_ID_CUES: | |
1365 if (demux_mkv_read_cues(demuxer)) | |
1366 res = 1; | |
1367 break; | |
1368 | |
1369 case MATROSKA_ID_TAGS: | |
1370 if (demux_mkv_read_tags(demuxer)) | |
1371 res = 1; | |
1372 break; | |
1373 | |
1374 case MATROSKA_ID_SEEKHEAD: | |
1375 if (demux_mkv_read_seekhead(demuxer)) | |
1376 res = 1; | |
1377 break; | |
1378 | |
1379 case MATROSKA_ID_CHAPTERS: | |
1380 if (demux_mkv_read_chapters(demuxer)) | |
1381 res = 1; | |
1382 break; | |
1383 } | |
1384 } | |
1385 | |
1386 stream_seek(s, saved_pos); | |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1387 } |
31177 | 1388 if (res) { |
1389 /* If there was an error then try to skip this seek head. */ | |
1390 if (stream_seek(s, off)) | |
1391 res = 0; | |
1392 } else if (length > 0) | |
1393 stream_seek(s, stream_tell(s) + length); | |
1394 mp_msg(MSGT_DEMUX, MSGL_V, | |
1395 "[mkv] \\---- [ parsing seek head ] ---------\n"); | |
1396 return res; | |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1397 } |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1398 |
31177 | 1399 static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track, |
1400 int vid); | |
1401 static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, | |
1402 int aid); | |
1403 static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track, | |
1404 int sid); | |
1405 | |
1406 static void display_create_tracks(demuxer_t *demuxer) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1407 { |
31177 | 1408 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
1409 int i, vid = 0, aid = 0, sid = 0; | |
1410 | |
1411 for (i = 0; i < mkv_d->num_tracks; i++) { | |
1412 char *type = "unknown", str[32]; | |
1413 *str = '\0'; | |
1414 switch (mkv_d->tracks[i]->type) { | |
1415 case MATROSKA_TRACK_VIDEO: | |
1416 type = "video"; | |
1417 demux_mkv_open_video(demuxer, mkv_d->tracks[i], vid); | |
1418 if (mkv_d->tracks[i]->name) | |
1419 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VID_%d_NAME=%s\n", vid, | |
1420 mkv_d->tracks[i]->name); | |
1421 sprintf(str, "-vid %u", vid++); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1422 break; |
31177 | 1423 case MATROSKA_TRACK_AUDIO: |
1424 type = "audio"; | |
1425 demux_mkv_open_audio(demuxer, mkv_d->tracks[i], aid); | |
1426 if (mkv_d->tracks[i]->name) | |
1427 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_NAME=%s\n", aid, | |
1428 mkv_d->tracks[i]->name); | |
1429 sprintf(str, "-aid %u, -alang %.5s", aid++, | |
1430 mkv_d->tracks[i]->language); | |
1431 break; | |
1432 case MATROSKA_TRACK_SUBTITLE: | |
1433 type = "subtitles"; | |
1434 demux_mkv_open_sub(demuxer, mkv_d->tracks[i], sid); | |
1435 if (mkv_d->tracks[i]->name) | |
1436 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_NAME=%s\n", sid, | |
1437 mkv_d->tracks[i]->name); | |
1438 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", sid, | |
1439 mkv_d->tracks[i]->language); | |
1440 sprintf(str, "-sid %u, -slang %.5s", sid++, | |
1441 mkv_d->tracks[i]->language); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1442 break; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1443 } |
31177 | 1444 if (mkv_d->tracks[i]->name) |
1445 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_MPDEMUX_MKV_TrackIDName, | |
1446 mkv_d->tracks[i]->tnum, type, mkv_d->tracks[i]->codec_id, | |
1447 mkv_d->tracks[i]->name, str); | |
1448 else | |
1449 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_MPDEMUX_MKV_TrackID, | |
1450 mkv_d->tracks[i]->tnum, type, mkv_d->tracks[i]->codec_id, | |
1451 str); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1452 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1453 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1454 |
23270
f094c9256137
Avoid code duplication in mkv demuxer for standard fourcc/extradata handling
reimar
parents:
23187
diff
changeset
|
1455 typedef struct { |
31177 | 1456 char *id; |
1457 int fourcc; | |
1458 int extradata; | |
23270
f094c9256137
Avoid code duplication in mkv demuxer for standard fourcc/extradata handling
reimar
parents:
23187
diff
changeset
|
1459 } videocodec_info_t; |
f094c9256137
Avoid code duplication in mkv demuxer for standard fourcc/extradata handling
reimar
parents:
23187
diff
changeset
|
1460 |
f094c9256137
Avoid code duplication in mkv demuxer for standard fourcc/extradata handling
reimar
parents:
23187
diff
changeset
|
1461 static const videocodec_info_t vinfo[] = { |
31177 | 1462 {MKV_V_MPEG1, mmioFOURCC('m', 'p', 'g', '1'), 0}, |
1463 {MKV_V_MPEG2, mmioFOURCC('m', 'p', 'g', '2'), 0}, | |
1464 {MKV_V_MPEG4_SP, mmioFOURCC('m', 'p', '4', 'v'), 1}, | |
1465 {MKV_V_MPEG4_ASP, mmioFOURCC('m', 'p', '4', 'v'), 1}, | |
1466 {MKV_V_MPEG4_AP, mmioFOURCC('m', 'p', '4', 'v'), 1}, | |
1467 {MKV_V_MPEG4_AVC, mmioFOURCC('a', 'v', 'c', '1'), 1}, | |
1468 {MKV_V_THEORA, mmioFOURCC('t', 'h', 'e', 'o'), 1}, | |
31263 | 1469 {MKV_V_VP8, mmioFOURCC('V', 'P', '8', '0'), 0}, |
31177 | 1470 {NULL, 0, 0} |
23270
f094c9256137
Avoid code duplication in mkv demuxer for standard fourcc/extradata handling
reimar
parents:
23187
diff
changeset
|
1471 }; |
f094c9256137
Avoid code duplication in mkv demuxer for standard fourcc/extradata handling
reimar
parents:
23187
diff
changeset
|
1472 |
31177 | 1473 static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track, |
1474 int vid) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1475 { |
31177 | 1476 BITMAPINFOHEADER *bih; |
1477 void *ImageDesc = NULL; | |
1478 sh_video_t *sh_v; | |
1479 | |
1480 if (track->ms_compat) { /* MS compatibility mode */ | |
1481 BITMAPINFOHEADER *src; | |
1482 | |
1483 if (track->private_data == NULL | |
32220 | 1484 || track->private_size >= INT_MAX - 1000 |
32111 | 1485 || track->private_size < sizeof(*bih)) |
31177 | 1486 return 1; |
1487 | |
1488 src = (BITMAPINFOHEADER *) track->private_data; | |
1489 bih = calloc(1, track->private_size); | |
1490 bih->biSize = le2me_32(src->biSize); | |
1491 bih->biWidth = le2me_32(src->biWidth); | |
1492 bih->biHeight = le2me_32(src->biHeight); | |
1493 bih->biPlanes = le2me_16(src->biPlanes); | |
1494 bih->biBitCount = le2me_16(src->biBitCount); | |
1495 bih->biCompression = le2me_32(src->biCompression); | |
1496 bih->biSizeImage = le2me_32(src->biSizeImage); | |
1497 bih->biXPelsPerMeter = le2me_32(src->biXPelsPerMeter); | |
1498 bih->biYPelsPerMeter = le2me_32(src->biYPelsPerMeter); | |
1499 bih->biClrUsed = le2me_32(src->biClrUsed); | |
1500 bih->biClrImportant = le2me_32(src->biClrImportant); | |
32111 | 1501 memcpy(bih + 1, |
1502 src + 1, | |
1503 track->private_size - sizeof(*bih)); | |
31177 | 1504 |
1505 if (track->v_width == 0) | |
1506 track->v_width = bih->biWidth; | |
1507 if (track->v_height == 0) | |
1508 track->v_height = bih->biHeight; | |
1509 } else { | |
32111 | 1510 bih = calloc(1, sizeof(*bih)); |
1511 bih->biSize = sizeof(*bih); | |
31177 | 1512 bih->biWidth = track->v_width; |
1513 bih->biHeight = track->v_height; | |
1514 bih->biBitCount = 24; | |
1515 bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount / 8; | |
1516 | |
1517 if (track->private_size >= RVPROPERTIES_SIZE | |
1518 && (!strcmp(track->codec_id, MKV_V_REALV10) | |
1519 || !strcmp(track->codec_id, MKV_V_REALV20) | |
1520 || !strcmp(track->codec_id, MKV_V_REALV30) | |
1521 || !strcmp(track->codec_id, MKV_V_REALV40))) { | |
1522 unsigned char *dst, *src; | |
1523 uint32_t type2; | |
32220 | 1524 size_t cnt; |
31177 | 1525 |
1526 src = (uint8_t *) track->private_data + RVPROPERTIES_SIZE; | |
1527 | |
1528 cnt = track->private_size - RVPROPERTIES_SIZE; | |
32220 | 1529 if (cnt > INT_MAX - sizeof(*bih) - 8) { |
1530 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Integer overflow!\n"); | |
1531 return 1; | |
1532 } | |
32111 | 1533 bih = realloc(bih, sizeof(*bih) + 8 + cnt); |
31177 | 1534 bih->biSize = 48 + cnt; |
1535 bih->biPlanes = 1; | |
1536 type2 = AV_RB32(src - 4); | |
1537 if (type2 == 0x10003000 || type2 == 0x10003001) | |
1538 bih->biCompression = mmioFOURCC('R', 'V', '1', '3'); | |
1539 else | |
1540 bih->biCompression = | |
1541 mmioFOURCC('R', 'V', track->codec_id[9], '0'); | |
1542 dst = (unsigned char *) (bih + 1); | |
1543 // copy type1 and type2 info from rv properties | |
1544 memcpy(dst, src - 8, 8); | |
1545 stream_read(demuxer->stream, dst + 8, cnt); | |
1546 track->realmedia = 1; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1547 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26752
diff
changeset
|
1548 #ifdef CONFIG_QTX_CODECS |
31177 | 1549 } else if (track->private_size >= sizeof(ImageDescription) |
1550 && !strcmp(track->codec_id, MKV_V_QUICKTIME)) { | |
1551 ImageDescriptionPtr idesc; | |
1552 | |
1553 idesc = (ImageDescriptionPtr) track->private_data; | |
1554 idesc->idSize = be2me_32(idesc->idSize); | |
1555 idesc->cType = be2me_32(idesc->cType); | |
1556 idesc->version = be2me_16(idesc->version); | |
1557 idesc->revisionLevel = be2me_16(idesc->revisionLevel); | |
1558 idesc->vendor = be2me_32(idesc->vendor); | |
1559 idesc->temporalQuality = be2me_32(idesc->temporalQuality); | |
1560 idesc->spatialQuality = be2me_32(idesc->spatialQuality); | |
1561 idesc->width = be2me_16(idesc->width); | |
1562 idesc->height = be2me_16(idesc->height); | |
1563 idesc->hRes = be2me_32(idesc->hRes); | |
1564 idesc->vRes = be2me_32(idesc->vRes); | |
1565 idesc->dataSize = be2me_32(idesc->dataSize); | |
1566 idesc->frameCount = be2me_16(idesc->frameCount); | |
1567 idesc->depth = be2me_16(idesc->depth); | |
1568 idesc->clutID = be2me_16(idesc->clutID); | |
1569 bih->biPlanes = 1; | |
1570 bih->biCompression = idesc->cType; | |
1571 ImageDesc = idesc; | |
1572 #endif /* CONFIG_QTX_CODECS */ | |
1573 | |
1574 } else { | |
1575 const videocodec_info_t *vi = vinfo; | |
1576 while (vi->id && strcmp(vi->id, track->codec_id)) | |
1577 vi++; | |
1578 bih->biCompression = vi->fourcc; | |
1579 if (vi->extradata && track->private_data | |
1580 && (track->private_size > 0)) { | |
1581 bih->biSize += track->private_size; | |
1582 bih = realloc(bih, bih->biSize); | |
1583 memcpy(bih + 1, track->private_data, track->private_size); | |
19154 | 1584 } |
31177 | 1585 track->reorder_timecodes = user_correct_pts == 0; |
1586 if (!vi->id) { | |
1587 mp_msg(MSGT_DEMUX, MSGL_WARN, MSGTR_MPDEMUX_MKV_UnknownCodecID, | |
1588 track->codec_id, track->tnum); | |
1589 free(bih); | |
1590 return 1; | |
1591 } | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1592 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1593 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1594 |
31177 | 1595 sh_v = new_sh_video_vid(demuxer, track->tnum, vid); |
1596 sh_v->bih = bih; | |
1597 sh_v->format = sh_v->bih->biCompression; | |
1598 if (track->v_frate == 0.0) | |
1599 track->v_frate = 25.0; | |
1600 sh_v->fps = track->v_frate; | |
1601 sh_v->frametime = 1 / track->v_frate; | |
1602 sh_v->aspect = 0; | |
1603 if (!track->realmedia) { | |
1604 sh_v->disp_w = track->v_width; | |
1605 sh_v->disp_h = track->v_height; | |
1606 if (track->v_dheight) | |
1607 sh_v->aspect = (float) track->v_dwidth / (float) track->v_dheight; | |
1608 } else { | |
1609 // vd_realvid.c will set aspect to disp_w/disp_h and rederive | |
1610 // disp_w and disp_h from the RealVideo stream contents returned | |
1611 // by the Real DLLs. If DisplayWidth/DisplayHeight was not set in | |
1612 // the Matroska file then it has already been set to PixelWidth/Height | |
1613 // by check_track_information. | |
1614 sh_v->disp_w = track->v_dwidth; | |
1615 sh_v->disp_h = track->v_dheight; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1616 } |
31177 | 1617 sh_v->ImageDesc = ImageDesc; |
1618 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Aspect: %f\n", sh_v->aspect); | |
1619 | |
1620 sh_v->ds = demuxer->video; | |
1621 return 0; | |
1622 } | |
1623 | |
1624 static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, | |
1625 int aid) | |
1626 { | |
1627 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; | |
31609
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31602
diff
changeset
|
1628 sh_audio_t *sh_a = new_sh_audio_aid(demuxer, track->tnum, aid, |
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31602
diff
changeset
|
1629 track->language); |
31177 | 1630 demux_packet_t *dp; |
1631 if (!sh_a) | |
1632 return 1; | |
1633 mkv_d->audio_tracks[mkv_d->last_aid] = track->tnum; | |
1634 | |
1635 sh_a->default_track = track->default_track; | |
1636 sh_a->ds = demuxer->audio; | |
32111 | 1637 sh_a->wf = malloc(sizeof(*sh_a->wf)); |
32113 | 1638 if (track->ms_compat && (track->private_size >= sizeof(*sh_a->wf))) { |
31177 | 1639 WAVEFORMATEX *wf = (WAVEFORMATEX *) track->private_data; |
32220 | 1640 if (track->private_size > USHRT_MAX + sizeof(WAVEFORMATEX)) { |
1641 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Integer overflow!\n"); | |
1642 free_sh_audio(demuxer, track->tnum); | |
1643 return 1; | |
1644 } | |
31177 | 1645 sh_a->wf = realloc(sh_a->wf, track->private_size); |
1646 sh_a->wf->wFormatTag = le2me_16(wf->wFormatTag); | |
1647 sh_a->wf->nChannels = le2me_16(wf->nChannels); | |
1648 sh_a->wf->nSamplesPerSec = le2me_32(wf->nSamplesPerSec); | |
1649 sh_a->wf->nAvgBytesPerSec = le2me_32(wf->nAvgBytesPerSec); | |
1650 sh_a->wf->nBlockAlign = le2me_16(wf->nBlockAlign); | |
1651 sh_a->wf->wBitsPerSample = le2me_16(wf->wBitsPerSample); | |
32113 | 1652 sh_a->wf->cbSize = track->private_size - sizeof(*sh_a->wf); |
31177 | 1653 memcpy(sh_a->wf + 1, wf + 1, |
32113 | 1654 track->private_size - sizeof(*sh_a->wf)); |
31177 | 1655 if (track->a_sfreq == 0.0) |
1656 track->a_sfreq = sh_a->wf->nSamplesPerSec; | |
1657 if (track->a_channels == 0) | |
1658 track->a_channels = sh_a->wf->nChannels; | |
1659 if (track->a_bps == 0) | |
1660 track->a_bps = sh_a->wf->wBitsPerSample; | |
1661 track->a_formattag = sh_a->wf->wFormatTag; | |
1662 } else { | |
32113 | 1663 memset(sh_a->wf, 0, sizeof(*sh_a->wf)); |
31177 | 1664 if (!strcmp(track->codec_id, MKV_A_MP3) |
1665 || !strcmp(track->codec_id, MKV_A_MP2)) | |
1666 track->a_formattag = 0x0055; | |
1667 else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3))) | |
1668 track->a_formattag = 0x2000; | |
1669 else if (!strcmp(track->codec_id, MKV_A_DTS)) | |
1670 track->a_formattag = 0x2001; | |
1671 else if (!strcmp(track->codec_id, MKV_A_PCM) | |
1672 || !strcmp(track->codec_id, MKV_A_PCM_BE)) | |
1673 track->a_formattag = 0x0001; | |
1674 else if (!strcmp(track->codec_id, MKV_A_AAC_2MAIN) | |
1675 || !strncmp(track->codec_id, MKV_A_AAC_2LC, | |
1676 strlen(MKV_A_AAC_2LC)) | |
1677 || !strcmp(track->codec_id, MKV_A_AAC_2SSR) | |
1678 || !strcmp(track->codec_id, MKV_A_AAC_4MAIN) | |
1679 || !strncmp(track->codec_id, MKV_A_AAC_4LC, | |
1680 strlen(MKV_A_AAC_4LC)) | |
1681 || !strcmp(track->codec_id, MKV_A_AAC_4SSR) | |
1682 || !strcmp(track->codec_id, MKV_A_AAC_4LTP) | |
1683 || !strcmp(track->codec_id, MKV_A_AAC)) | |
1684 track->a_formattag = mmioFOURCC('M', 'P', '4', 'A'); | |
1685 else if (!strcmp(track->codec_id, MKV_A_VORBIS)) { | |
1686 if (track->private_data == NULL) | |
1687 return 1; | |
1688 track->a_formattag = mmioFOURCC('v', 'r', 'b', 's'); | |
1689 } else if (!strcmp(track->codec_id, MKV_A_QDMC)) | |
1690 track->a_formattag = mmioFOURCC('Q', 'D', 'M', 'C'); | |
1691 else if (!strcmp(track->codec_id, MKV_A_QDMC2)) | |
1692 track->a_formattag = mmioFOURCC('Q', 'D', 'M', '2'); | |
1693 else if (!strcmp(track->codec_id, MKV_A_WAVPACK)) | |
1694 track->a_formattag = mmioFOURCC('W', 'V', 'P', 'K'); | |
1695 else if (!strcmp(track->codec_id, MKV_A_TRUEHD)) | |
1696 track->a_formattag = mmioFOURCC('T', 'R', 'H', 'D'); | |
1697 else if (!strcmp(track->codec_id, MKV_A_FLAC)) { | |
1698 if (track->private_data == NULL || track->private_size == 0) { | |
1699 mp_msg(MSGT_DEMUX, MSGL_WARN, | |
1700 MSGTR_MPDEMUX_MKV_FlacTrackDoesNotContainValidHeaders); | |
1701 return 1; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1702 } |
31177 | 1703 track->a_formattag = mmioFOURCC('f', 'L', 'a', 'C'); |
1704 } else if (track->private_size >= RAPROPERTIES4_SIZE) { | |
1705 if (!strcmp(track->codec_id, MKV_A_REAL28)) | |
1706 track->a_formattag = mmioFOURCC('2', '8', '_', '8'); | |
1707 else if (!strcmp(track->codec_id, MKV_A_REALATRC)) | |
1708 track->a_formattag = mmioFOURCC('a', 't', 'r', 'c'); | |
1709 else if (!strcmp(track->codec_id, MKV_A_REALCOOK)) | |
1710 track->a_formattag = mmioFOURCC('c', 'o', 'o', 'k'); | |
1711 else if (!strcmp(track->codec_id, MKV_A_REALDNET)) | |
1712 track->a_formattag = mmioFOURCC('d', 'n', 'e', 't'); | |
1713 else if (!strcmp(track->codec_id, MKV_A_REALSIPR)) | |
1714 track->a_formattag = mmioFOURCC('s', 'i', 'p', 'r'); | |
1715 } else { | |
1716 mp_msg(MSGT_DEMUX, MSGL_WARN, MSGTR_MPDEMUX_MKV_UnknownAudioCodec, | |
1717 track->codec_id, track->tnum); | |
1718 free_sh_audio(demuxer, track->tnum); | |
1719 return 1; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1720 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1721 } |
31177 | 1722 |
1723 sh_a->format = track->a_formattag; | |
1724 sh_a->wf->wFormatTag = track->a_formattag; | |
1725 sh_a->channels = track->a_channels; | |
1726 sh_a->wf->nChannels = track->a_channels; | |
1727 sh_a->samplerate = (uint32_t) track->a_sfreq; | |
1728 sh_a->wf->nSamplesPerSec = (uint32_t) track->a_sfreq; | |
1729 if (track->a_bps == 0) { | |
1730 sh_a->samplesize = 2; | |
1731 sh_a->wf->wBitsPerSample = 16; | |
1732 } else { | |
1733 sh_a->samplesize = track->a_bps / 8; | |
1734 sh_a->wf->wBitsPerSample = track->a_bps; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1735 } |
31177 | 1736 if (track->a_formattag == 0x0055) { /* MP3 || MP2 */ |
1737 sh_a->wf->nAvgBytesPerSec = 16000; | |
1738 sh_a->wf->nBlockAlign = 1152; | |
1739 } else if ((track->a_formattag == 0x2000) || /* AC3 */ | |
1740 (track->a_formattag == 0x2001)) { /* DTS */ | |
1741 free(sh_a->wf); | |
1742 sh_a->wf = NULL; | |
1743 } else if (track->a_formattag == 0x0001) { /* PCM || PCM_BE */ | |
1744 sh_a->wf->nAvgBytesPerSec = sh_a->channels * sh_a->samplerate * 2; | |
1745 sh_a->wf->nBlockAlign = sh_a->wf->nAvgBytesPerSec; | |
1746 if (!strcmp(track->codec_id, MKV_A_PCM_BE)) | |
1747 sh_a->format = mmioFOURCC('t', 'w', 'o', 's'); | |
1748 } else if (!strcmp(track->codec_id, MKV_A_QDMC) | |
1749 || !strcmp(track->codec_id, MKV_A_QDMC2)) { | |
1750 sh_a->wf->nAvgBytesPerSec = 16000; | |
1751 sh_a->wf->nBlockAlign = 1486; | |
1752 track->fix_i_bps = 1; | |
1753 track->qt_last_a_pts = 0.0; | |
1754 if (track->private_data != NULL) { | |
32220 | 1755 if (track->private_size > INT_MAX) { |
1756 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Integer overflow!\n"); | |
1757 free_sh_audio(demuxer, track->tnum); | |
1758 return 1; | |
1759 } | |
31177 | 1760 sh_a->codecdata = malloc(track->private_size); |
1761 memcpy(sh_a->codecdata, track->private_data, track->private_size); | |
1762 sh_a->codecdata_len = track->private_size; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1763 } |
31177 | 1764 } else if (track->a_formattag == mmioFOURCC('M', 'P', '4', 'A')) { |
1765 int profile, srate_idx; | |
1766 | |
1767 sh_a->wf->nAvgBytesPerSec = 16000; | |
1768 sh_a->wf->nBlockAlign = 1024; | |
1769 | |
1770 if (!strcmp(track->codec_id, MKV_A_AAC) | |
1771 && (NULL != track->private_data)) { | |
32220 | 1772 if (track->private_size > INT_MAX) { |
1773 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Integer overflow!\n"); | |
1774 free_sh_audio(demuxer, track->tnum); | |
1775 return 1; | |
1776 } | |
31177 | 1777 sh_a->codecdata = malloc(track->private_size); |
1778 memcpy(sh_a->codecdata, track->private_data, track->private_size); | |
1779 sh_a->codecdata_len = track->private_size; | |
1780 return 0; | |
1781 } | |
1782 | |
1783 /* Recreate the 'private data' */ | |
1784 /* which faad2 uses in its initialization */ | |
1785 srate_idx = aac_get_sample_rate_index(sh_a->samplerate); | |
1786 if (!strncmp(&track->codec_id[12], "MAIN", 4)) | |
1787 profile = 0; | |
1788 else if (!strncmp(&track->codec_id[12], "LC", 2)) | |
1789 profile = 1; | |
1790 else if (!strncmp(&track->codec_id[12], "SSR", 3)) | |
1791 profile = 2; | |
1792 else | |
1793 profile = 3; | |
1794 sh_a->codecdata = malloc(5); | |
1795 sh_a->codecdata[0] = ((profile + 1) << 3) | ((srate_idx & 0xE) >> 1); | |
1796 sh_a->codecdata[1] = | |
1797 ((srate_idx & 0x1) << 7) | (track->a_channels << 3); | |
1798 | |
1799 if (strstr(track->codec_id, "SBR") != NULL) { | |
1800 /* HE-AAC (aka SBR AAC) */ | |
1801 sh_a->codecdata_len = 5; | |
1802 | |
1803 sh_a->samplerate *= 2; | |
1804 sh_a->wf->nSamplesPerSec *= 2; | |
1805 srate_idx = aac_get_sample_rate_index(sh_a->samplerate); | |
1806 sh_a->codecdata[2] = AAC_SYNC_EXTENSION_TYPE >> 3; | |
1807 sh_a->codecdata[3] = ((AAC_SYNC_EXTENSION_TYPE & 0x07) << 5) | 5; | |
1808 sh_a->codecdata[4] = (1 << 7) | (srate_idx << 3); | |
1809 track->default_duration = 1024.0 / (sh_a->samplerate / 2); | |
1810 } else { | |
1811 sh_a->codecdata_len = 2; | |
1812 track->default_duration = 1024.0 / (float) sh_a->samplerate; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1813 } |
31177 | 1814 } else if (track->a_formattag == mmioFOURCC('v', 'r', 'b', 's')) { /* VORBIS */ |
32220 | 1815 if (track->private_size > USHRT_MAX) { |
1816 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Integer overflow!\n"); | |
1817 free_sh_audio(demuxer, track->tnum); | |
1818 return 1; | |
1819 } | |
31177 | 1820 sh_a->wf->cbSize = track->private_size; |
32113 | 1821 sh_a->wf = realloc(sh_a->wf, sizeof(*sh_a->wf) + sh_a->wf->cbSize); |
31177 | 1822 memcpy((unsigned char *) (sh_a->wf + 1), track->private_data, |
1823 sh_a->wf->cbSize); | |
1824 } else if (track->private_size >= RAPROPERTIES4_SIZE | |
1825 && !strncmp(track->codec_id, MKV_A_REALATRC, 7)) { | |
1826 /* Common initialization for all RealAudio codecs */ | |
1827 unsigned char *src = track->private_data; | |
1828 int codecdata_length, version; | |
1829 int flavor; | |
1830 | |
1831 sh_a->wf->nAvgBytesPerSec = 0; /* FIXME !? */ | |
1832 | |
1833 version = AV_RB16(src + 4); | |
1834 flavor = AV_RB16(src + 22); | |
1835 track->coded_framesize = AV_RB32(src + 24); | |
1836 track->sub_packet_h = AV_RB16(src + 40); | |
1837 sh_a->wf->nBlockAlign = track->audiopk_size = AV_RB16(src + 42); | |
1838 track->sub_packet_size = AV_RB16(src + 44); | |
1839 if (version == 4) { | |
1840 src += RAPROPERTIES4_SIZE; | |
1841 src += src[0] + 1; | |
1842 src += src[0] + 1; | |
1843 } else | |
1844 src += RAPROPERTIES5_SIZE; | |
1845 | |
1846 src += 3; | |
1847 if (version == 5) | |
1848 src++; | |
1849 codecdata_length = AV_RB32(src); | |
1850 src += 4; | |
1851 sh_a->wf->cbSize = codecdata_length; | |
32113 | 1852 sh_a->wf = realloc(sh_a->wf, sizeof(*sh_a->wf) + sh_a->wf->cbSize); |
31177 | 1853 memcpy(((char *) (sh_a->wf + 1)), src, codecdata_length); |
1854 | |
1855 switch (track->a_formattag) { | |
1856 case mmioFOURCC('a', 't', 'r', 'c'): | |
1857 sh_a->wf->nAvgBytesPerSec = atrc_fl2bps[flavor]; | |
1858 sh_a->wf->nBlockAlign = track->sub_packet_size; | |
1859 track->audio_buf = | |
1860 malloc(track->sub_packet_h * track->audiopk_size); | |
1861 track->audio_timestamp = | |
1862 malloc(track->sub_packet_h * sizeof(float)); | |
1863 break; | |
1864 case mmioFOURCC('c', 'o', 'o', 'k'): | |
1865 sh_a->wf->nAvgBytesPerSec = cook_fl2bps[flavor]; | |
1866 sh_a->wf->nBlockAlign = track->sub_packet_size; | |
1867 track->audio_buf = | |
1868 malloc(track->sub_packet_h * track->audiopk_size); | |
1869 track->audio_timestamp = | |
1870 malloc(track->sub_packet_h * sizeof(float)); | |
1871 break; | |
1872 case mmioFOURCC('s', 'i', 'p', 'r'): | |
1873 sh_a->wf->nAvgBytesPerSec = sipr_fl2bps[flavor]; | |
1874 sh_a->wf->nBlockAlign = track->coded_framesize; | |
1875 track->audio_buf = | |
1876 malloc(track->sub_packet_h * track->audiopk_size); | |
1877 track->audio_timestamp = | |
1878 malloc(track->sub_packet_h * sizeof(float)); | |
1879 break; | |
1880 case mmioFOURCC('2', '8', '_', '8'): | |
1881 sh_a->wf->nAvgBytesPerSec = 3600; | |
1882 sh_a->wf->nBlockAlign = track->coded_framesize; | |
1883 track->audio_buf = | |
1884 malloc(track->sub_packet_h * track->audiopk_size); | |
1885 track->audio_timestamp = | |
1886 malloc(track->sub_packet_h * sizeof(float)); | |
1887 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1888 } |
31177 | 1889 |
1890 track->realmedia = 1; | |
1891 } else if (!strcmp(track->codec_id, MKV_A_FLAC) | |
1892 || (track->a_formattag == 0xf1ac)) { | |
1893 unsigned char *ptr; | |
32220 | 1894 size_t size; |
31177 | 1895 free(sh_a->wf); |
1896 sh_a->wf = NULL; | |
1897 | |
1898 if (track->a_formattag == mmioFOURCC('f', 'L', 'a', 'C')) { | |
1899 ptr = track->private_data; | |
1900 size = track->private_size; | |
1901 } else { | |
1902 sh_a->format = mmioFOURCC('f', 'L', 'a', 'C'); | |
32113 | 1903 ptr = (unsigned char *) track->private_data + sizeof(*sh_a->wf); |
1904 size = track->private_size - sizeof(*sh_a->wf); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1905 } |
31177 | 1906 if (size < 4 || ptr[0] != 'f' || ptr[1] != 'L' || ptr[2] != 'a' |
1907 || ptr[3] != 'C') { | |
1908 dp = new_demux_packet(4); | |
1909 memcpy(dp->buffer, "fLaC", 4); | |
1910 } else { | |
1911 dp = new_demux_packet(size); | |
1912 memcpy(dp->buffer, ptr, size); | |
1913 } | |
1914 dp->pts = 0; | |
1915 dp->flags = 0; | |
1916 ds_add_packet(demuxer->audio, dp); | |
1917 } else if (track->a_formattag == mmioFOURCC('W', 'V', 'P', 'K') || | |
1918 track->a_formattag == mmioFOURCC('T', 'R', 'H', 'D')) { | |
1919 /* do nothing, still works */ | |
1920 } else if (!track->ms_compat | |
32113 | 1921 || (track->private_size < sizeof(*sh_a->wf))) { |
31177 | 1922 free_sh_audio(demuxer, track->tnum); |
1923 return 1; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1924 } |
31177 | 1925 |
1926 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1927 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1928 |
31177 | 1929 static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track, |
1930 int sid) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1931 { |
31177 | 1932 if (track->subtitle_type != MATROSKA_SUBTYPE_UNKNOWN) { |
32220 | 1933 size_t size; |
1934 int m; | |
31177 | 1935 uint8_t *buffer; |
31609
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31602
diff
changeset
|
1936 sh_sub_t *sh = new_sh_sub_sid(demuxer, track->tnum, sid, track->language); |
31177 | 1937 track->sh_sub = sh; |
1938 sh->type = 't'; | |
1939 if (track->subtitle_type == MATROSKA_SUBTYPE_VOBSUB) | |
1940 sh->type = 'v'; | |
1941 if (track->subtitle_type == MATROSKA_SUBTYPE_SSA) | |
1942 sh->type = 'a'; | |
1943 size = track->private_size; | |
1944 m = demux_mkv_decode(track, track->private_data, &buffer, &size, 2); | |
1945 if (buffer && m) { | |
1946 free(track->private_data); | |
1947 track->private_data = buffer; | |
1948 track->private_size = size; | |
25651
3d5fb36693ac
Factorize private data decoding for subtitle tracks in mkv demuxer.
eugeni
parents:
25432
diff
changeset
|
1949 } |
32220 | 1950 if (track->private_size > INT_MAX) { |
1951 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Integer overflow!\n"); | |
1952 return 1; | |
1953 } | |
31177 | 1954 sh->extradata = malloc(track->private_size); |
1955 memcpy(sh->extradata, track->private_data, track->private_size); | |
1956 sh->extradata_len = track->private_size; | |
1957 sh->default_track = track->default_track; | |
1958 } else { | |
1959 mp_msg(MSGT_DEMUX, MSGL_ERR, | |
1960 MSGTR_MPDEMUX_MKV_SubtitleTypeNotSupported, track->codec_id); | |
1961 return 1; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1962 } |
31177 | 1963 |
1964 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1965 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1966 |
31177 | 1967 static int demux_mkv_open(demuxer_t *demuxer) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1968 { |
31177 | 1969 stream_t *s = demuxer->stream; |
1970 mkv_demuxer_t *mkv_d; | |
1971 mkv_track_t *track; | |
1972 int i, version, cont = 0; | |
1973 char *str; | |
1974 | |
1975 stream_seek(s, s->start_pos); | |
1976 str = ebml_read_header(s, &version); | |
31263 | 1977 if (str == NULL || (strcmp(str, "matroska") && strcmp(str, "webm")) || version > 2) { |
31177 | 1978 mp_msg(MSGT_DEMUX, MSGL_DBG2, "[mkv] no head found\n"); |
1979 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1980 } |
31177 | 1981 free(str); |
1982 | |
1983 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Found the head...\n"); | |
1984 | |
1985 if (ebml_read_id(s, NULL) != MATROSKA_ID_SEGMENT) { | |
1986 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] but no segment :(\n"); | |
1987 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
1988 } |
31177 | 1989 ebml_read_length(s, NULL); /* return bytes number until EOF */ |
1990 | |
1991 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] + a segment...\n"); | |
1992 | |
1993 mkv_d = calloc(1, sizeof(mkv_demuxer_t)); | |
1994 demuxer->priv = mkv_d; | |
1995 mkv_d->tc_scale = 1000000; | |
1996 mkv_d->segment_start = stream_tell(s); | |
1997 mkv_d->parsed_cues = malloc(sizeof(off_t)); | |
1998 mkv_d->parsed_seekhead = malloc(sizeof(off_t)); | |
1999 | |
2000 while (!cont) { | |
2001 switch (ebml_read_id(s, NULL)) { | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2002 case MATROSKA_ID_INFO: |
31177 | 2003 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ segment information...\n"); |
2004 cont = demux_mkv_read_info(demuxer); | |
2005 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2006 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2007 case MATROSKA_ID_TRACKS: |
31177 | 2008 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ segment tracks...\n"); |
2009 cont = demux_mkv_read_tracks(demuxer); | |
2010 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2011 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2012 case MATROSKA_ID_CUES: |
31177 | 2013 cont = demux_mkv_read_cues(demuxer); |
2014 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2015 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2016 case MATROSKA_ID_TAGS: |
31177 | 2017 cont = demux_mkv_read_tags(demuxer); |
2018 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2019 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2020 case MATROSKA_ID_SEEKHEAD: |
31177 | 2021 cont = demux_mkv_read_seekhead(demuxer); |
2022 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2023 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2024 case MATROSKA_ID_CHAPTERS: |
31177 | 2025 cont = demux_mkv_read_chapters(demuxer); |
2026 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2027 |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
2028 case MATROSKA_ID_ATTACHMENTS: |
31177 | 2029 cont = demux_mkv_read_attachments(demuxer); |
2030 break; | |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
2031 |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2032 case MATROSKA_ID_CLUSTER: |
31177 | 2033 { |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2034 int p, l; |
31177 | 2035 mp_msg(MSGT_DEMUX, MSGL_V, |
2036 "[mkv] |+ found cluster, headers are " | |
2037 "parsed completely :)\n"); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2038 /* get the first cluster timecode */ |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2039 p = stream_tell(s); |
31177 | 2040 l = ebml_read_length(s, NULL); |
2041 while (ebml_read_id(s, NULL) != MATROSKA_ID_CLUSTERTIMECODE) { | |
2042 ebml_read_skip(s, NULL); | |
2043 if (stream_tell(s) >= p + l) | |
2044 break; | |
2045 } | |
2046 if (stream_tell(s) < p + l) { | |
2047 uint64_t num = ebml_read_uint(s, NULL); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2048 if (num == EBML_UINT_INVALID) |
31177 | 2049 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2050 mkv_d->first_tc = num * mkv_d->tc_scale / 1000000.0; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2051 mkv_d->has_first_tc = 1; |
31177 | 2052 } |
2053 stream_seek(s, p - 4); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2054 cont = 1; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2055 break; |
31177 | 2056 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2057 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2058 default: |
31177 | 2059 cont = 1; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2060 case EBML_ID_VOID: |
31177 | 2061 ebml_read_skip(s, NULL); |
18754
e0077bdf5ee5
feed any audio track present in the mux; switch to any of the available audio tracks
nicodvb
parents:
18708
diff
changeset
|
2062 break; |
e0077bdf5ee5
feed any audio track present in the mux; switch to any of the available audio tracks
nicodvb
parents:
18708
diff
changeset
|
2063 } |
e0077bdf5ee5
feed any audio track present in the mux; switch to any of the available audio tracks
nicodvb
parents:
18708
diff
changeset
|
2064 } |
e0077bdf5ee5
feed any audio track present in the mux; switch to any of the available audio tracks
nicodvb
parents:
18708
diff
changeset
|
2065 |
31177 | 2066 display_create_tracks(demuxer); |
2067 | |
2068 /* select video track */ | |
2069 track = NULL; | |
2070 if (demuxer->video->id == -1) { /* automatically select a video track */ | |
2071 /* search for a video track that has the 'default' flag set */ | |
2072 for (i = 0; i < mkv_d->num_tracks; i++) | |
2073 if (mkv_d->tracks[i]->type == MATROSKA_TRACK_VIDEO | |
2074 && mkv_d->tracks[i]->default_track) { | |
2075 track = mkv_d->tracks[i]; | |
2076 break; | |
2077 } | |
2078 | |
2079 if (track == NULL) | |
2080 /* no track has the 'default' flag set */ | |
2081 /* let's take the first video track */ | |
2082 for (i = 0; i < mkv_d->num_tracks; i++) | |
2083 if (mkv_d->tracks[i]->type == MATROSKA_TRACK_VIDEO) { | |
2084 track = mkv_d->tracks[i]; | |
2085 break; | |
2086 } | |
2087 } else if (demuxer->video->id != -2) /* -2 = no video at all */ | |
2088 track = demux_mkv_find_track_by_num(mkv_d, demuxer->video->id, | |
2089 MATROSKA_TRACK_VIDEO); | |
2090 | |
2091 if (track && demuxer->v_streams[track->tnum]) { | |
2092 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_MPDEMUX_MKV_WillPlayVideoTrack, | |
2093 track->tnum); | |
2094 demuxer->video->id = track->tnum; | |
2095 demuxer->video->sh = demuxer->v_streams[track->tnum]; | |
2096 } else { | |
2097 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_MPDEMUX_MKV_NoVideoTrackFound); | |
2098 demuxer->video->id = -2; | |
2099 } | |
2100 | |
2101 /* select audio track */ | |
2102 track = NULL; | |
2103 if (track == NULL) | |
2104 /* search for an audio track that has the 'default' flag set */ | |
2105 for (i = 0; i < mkv_d->num_tracks; i++) | |
2106 if (mkv_d->tracks[i]->type == MATROSKA_TRACK_AUDIO | |
2107 && mkv_d->tracks[i]->default_track) { | |
2108 track = mkv_d->tracks[i]; | |
2109 break; | |
2110 } | |
2111 | |
2112 if (track == NULL) | |
2113 /* no track has the 'default' flag set */ | |
2114 /* let's take the first audio track */ | |
2115 for (i = 0; i < mkv_d->num_tracks; i++) | |
2116 if (mkv_d->tracks[i]->type == MATROSKA_TRACK_AUDIO) { | |
2117 track = mkv_d->tracks[i]; | |
2118 break; | |
2119 } | |
2120 | |
2121 if (track && demuxer->a_streams[track->tnum]) { | |
2122 demuxer->audio->id = track->tnum; | |
2123 demuxer->audio->sh = demuxer->a_streams[track->tnum]; | |
2124 } else { | |
2125 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_MPDEMUX_MKV_NoAudioTrackFound); | |
2126 demuxer->audio->id = -2; | |
2127 } | |
2128 | |
2129 | |
2130 if (demuxer->audio->id != -2) | |
2131 for (i = 0; i < mkv_d->num_tracks; i++) { | |
2132 if (mkv_d->tracks[i]->type != MATROSKA_TRACK_AUDIO) | |
2133 continue; | |
2134 if (demuxer->a_streams[track->tnum]) { | |
2135 mkv_d->last_aid++; | |
2136 if (mkv_d->last_aid == MAX_A_STREAMS) | |
2137 break; | |
2138 } | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2139 } |
31177 | 2140 |
2141 if (demuxer->chapters) { | |
2142 for (i = 0; i < (int) demuxer->num_chapters; i++) { | |
2143 demuxer->chapters[i].start -= mkv_d->first_tc; | |
2144 demuxer->chapters[i].end -= mkv_d->first_tc; | |
2145 } | |
2146 if (dvd_last_chapter > 0 && dvd_last_chapter <= demuxer->num_chapters) { | |
2147 if (demuxer->chapters[dvd_last_chapter - 1].end != 0) | |
2148 mkv_d->stop_timecode = | |
2149 demuxer->chapters[dvd_last_chapter - 1].end; | |
2150 else if (dvd_last_chapter + 1 <= demuxer->num_chapters) | |
2151 mkv_d->stop_timecode = | |
2152 demuxer->chapters[dvd_last_chapter].start; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2153 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2154 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2155 |
31177 | 2156 if (s->end_pos == 0 || (mkv_d->indexes == NULL && index_mode < 0)) |
2157 demuxer->seekable = 0; | |
2158 else { | |
2159 demuxer->movi_start = s->start_pos; | |
2160 demuxer->movi_end = s->end_pos; | |
2161 demuxer->seekable = 1; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2162 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2163 |
31177 | 2164 return DEMUXER_TYPE_MATROSKA; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2165 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2166 |
31177 | 2167 static void demux_close_mkv(demuxer_t *demuxer) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2168 { |
31177 | 2169 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
2170 | |
2171 if (mkv_d) { | |
2172 int i; | |
2173 free_cached_dps(demuxer); | |
2174 if (mkv_d->tracks) { | |
2175 for (i = 0; i < mkv_d->num_tracks; i++) | |
2176 demux_mkv_free_trackentry(mkv_d->tracks[i]); | |
2177 free(mkv_d->tracks); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2178 } |
31177 | 2179 free(mkv_d->indexes); |
2180 free(mkv_d->cluster_positions); | |
2181 free(mkv_d->parsed_cues); | |
2182 free(mkv_d->parsed_seekhead); | |
2183 free(mkv_d); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2184 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2185 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2186 |
31177 | 2187 static int demux_mkv_read_block_lacing(uint8_t *buffer, uint64_t *size, |
2188 uint8_t *laces, | |
2189 uint32_t **all_lace_sizes) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2190 { |
31177 | 2191 uint32_t total = 0, *lace_size; |
2192 uint8_t flags; | |
2193 int i; | |
2194 | |
2195 *all_lace_sizes = NULL; | |
2196 lace_size = NULL; | |
2197 /* lacing flags */ | |
2198 flags = *buffer++; | |
2199 (*size)--; | |
2200 | |
2201 switch ((flags & 0x06) >> 1) { | |
2202 case 0: /* no lacing */ | |
2203 *laces = 1; | |
2204 lace_size = calloc(*laces, sizeof(uint32_t)); | |
2205 lace_size[0] = *size; | |
2206 break; | |
2207 | |
2208 case 1: /* xiph lacing */ | |
2209 case 2: /* fixed-size lacing */ | |
2210 case 3: /* EBML lacing */ | |
2211 *laces = *buffer++; | |
2212 (*size)--; | |
2213 (*laces)++; | |
2214 lace_size = calloc(*laces, sizeof(uint32_t)); | |
2215 | |
2216 switch ((flags & 0x06) >> 1) { | |
2217 case 1: /* xiph lacing */ | |
2218 for (i = 0; i < *laces - 1; i++) { | |
2219 lace_size[i] = 0; | |
2220 do { | |
2221 lace_size[i] += *buffer; | |
2222 (*size)--; | |
2223 } while (*buffer++ == 0xFF); | |
2224 total += lace_size[i]; | |
2225 } | |
2226 lace_size[i] = *size - total; | |
2227 break; | |
2228 | |
2229 case 2: /* fixed-size lacing */ | |
2230 for (i = 0; i < *laces; i++) | |
2231 lace_size[i] = *size / *laces; | |
2232 break; | |
2233 | |
2234 case 3: /* EBML lacing */ | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2235 { |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2236 int l; |
31177 | 2237 uint64_t num = ebml_read_vlen_uint(buffer, &l); |
12065 | 2238 if (num == EBML_UINT_INVALID) { |
31177 | 2239 free(lace_size); |
2240 return 1; | |
12065 | 2241 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2242 buffer += l; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2243 *size -= l; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2244 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2245 total = lace_size[0] = num; |
31177 | 2246 for (i = 1; i < *laces - 1; i++) { |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2247 int64_t snum; |
31177 | 2248 snum = ebml_read_vlen_int(buffer, &l); |
12065 | 2249 if (snum == EBML_INT_INVALID) { |
31177 | 2250 free(lace_size); |
2251 return 1; | |
12065 | 2252 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2253 buffer += l; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2254 *size -= l; |
31177 | 2255 lace_size[i] = lace_size[i - 1] + snum; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2256 total += lace_size[i]; |
31177 | 2257 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2258 lace_size[i] = *size - total; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2259 break; |
31177 | 2260 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2261 } |
31177 | 2262 break; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2263 } |
31177 | 2264 *all_lace_sizes = lace_size; |
2265 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2266 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2267 |
31177 | 2268 static void handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, |
2269 char *block, int64_t size, | |
2270 uint64_t block_duration, uint64_t timecode) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2271 { |
31177 | 2272 demux_packet_t *dp; |
2273 | |
2274 if (block_duration == 0) { | |
2275 mp_msg(MSGT_DEMUX, MSGL_WARN, | |
2276 MSGTR_MPDEMUX_MKV_NoBlockDurationForSubtitleTrackFound); | |
2277 return; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2278 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2279 |
31177 | 2280 sub_utf8 = 1; |
2281 dp = new_demux_packet(size); | |
2282 memcpy(dp->buffer, block, size); | |
2283 dp->pts = timecode / 1000.0f; | |
2284 dp->endpts = (timecode + block_duration) / 1000.0f; | |
2285 ds_add_packet(demuxer->sub, dp); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2286 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2287 |
31177 | 2288 static void handle_realvideo(demuxer_t *demuxer, mkv_track_t *track, |
2289 uint8_t *buffer, uint32_t size, int block_bref) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2290 { |
31177 | 2291 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
2292 demux_packet_t *dp; | |
2293 uint32_t timestamp = mkv_d->last_pts * 1000; | |
2294 | |
2295 dp = new_demux_packet(size); | |
2296 memcpy(dp->buffer, buffer, size); | |
2297 | |
2298 if (mkv_d->v_skip_to_keyframe) { | |
2299 dp->pts = mkv_d->last_pts; | |
2300 track->rv_kf_base = 0; | |
2301 track->rv_kf_pts = timestamp; | |
2302 } else | |
2303 dp->pts = | |
2304 real_fix_timestamp(dp->buffer, timestamp, | |
2305 ((sh_video_t *) demuxer->video->sh)->bih-> | |
2306 biCompression, &track->rv_kf_base, | |
2307 &track->rv_kf_pts, NULL); | |
2308 dp->pos = demuxer->filepos; | |
2309 dp->flags = block_bref ? 0 : 0x10; | |
2310 | |
2311 ds_add_packet(demuxer->video, dp); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2312 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2313 |
31177 | 2314 static void handle_realaudio(demuxer_t *demuxer, mkv_track_t *track, |
2315 uint8_t *buffer, uint32_t size, int block_bref) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2316 { |
31177 | 2317 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
2318 int sps = track->sub_packet_size; | |
2319 int sph = track->sub_packet_h; | |
2320 int cfs = track->coded_framesize; | |
2321 int w = track->audiopk_size; | |
2322 int spc = track->sub_packet_cnt; | |
2323 demux_packet_t *dp; | |
2324 int x; | |
2325 | |
2326 if ((track->a_formattag == mmioFOURCC('2', '8', '_', '8')) | |
2327 || (track->a_formattag == mmioFOURCC('c', 'o', 'o', 'k')) | |
2328 || (track->a_formattag == mmioFOURCC('a', 't', 'r', 'c')) | |
2329 || (track->a_formattag == mmioFOURCC('s', 'i', 'p', 'r'))) { | |
18036 | 2330 // if(!block_bref) |
2331 // spc = track->sub_packet_cnt = 0; | |
31177 | 2332 switch (track->a_formattag) { |
18036 | 2333 case mmioFOURCC('2', '8', '_', '8'): |
31177 | 2334 for (x = 0; x < sph / 2; x++) |
2335 memcpy(track->audio_buf + x * 2 * w + spc * cfs, | |
2336 buffer + cfs * x, cfs); | |
2337 break; | |
18036 | 2338 case mmioFOURCC('c', 'o', 'o', 'k'): |
2339 case mmioFOURCC('a', 't', 'r', 'c'): | |
31177 | 2340 for (x = 0; x < w / sps; x++) |
2341 memcpy(track->audio_buf + | |
2342 sps * (sph * x + ((sph + 1) / 2) * (spc & 1) + | |
2343 (spc >> 1)), buffer + sps * x, sps); | |
2344 break; | |
18036 | 2345 case mmioFOURCC('s', 'i', 'p', 'r'): |
31177 | 2346 memcpy(track->audio_buf + spc * w, buffer, w); |
2347 if (spc == sph - 1) { | |
2348 int n; | |
2349 int bs = sph * w * 2 / 96; // nibbles per subpacket | |
2350 // Perform reordering | |
2351 for (n = 0; n < 38; n++) { | |
2352 int j; | |
2353 int i = bs * sipr_swaps[n][0]; | |
2354 int o = bs * sipr_swaps[n][1]; | |
2355 // swap nibbles of block 'i' with 'o' TODO: optimize | |
2356 for (j = 0; j < bs; j++) { | |
2357 int x = (i & 1) ? | |
2358 (track->audio_buf[i >> 1] >> 4) : | |
2359 (track->audio_buf[i >> 1] & 0x0F); | |
2360 int y = (o & 1) ? | |
2361 (track->audio_buf[o >> 1] >> 4) : | |
2362 (track->audio_buf[o >> 1] & 0x0F); | |
2363 if (o & 1) | |
2364 track->audio_buf[o >> 1] = | |
2365 (track->audio_buf[o >> 1] & 0x0F) | (x << 4); | |
2366 else | |
2367 track->audio_buf[o >> 1] = | |
2368 (track->audio_buf[o >> 1] & 0xF0) | x; | |
2369 if (i & 1) | |
2370 track->audio_buf[i >> 1] = | |
2371 (track->audio_buf[i >> 1] & 0x0F) | (y << 4); | |
2372 else | |
2373 track->audio_buf[i >> 1] = | |
2374 (track->audio_buf[i >> 1] & 0xF0) | y; | |
2375 ++i; | |
2376 ++o; | |
18036 | 2377 } |
2378 } | |
2379 } | |
31177 | 2380 break; |
18036 | 2381 } |
31177 | 2382 track->audio_timestamp[track->sub_packet_cnt] = |
2383 (track->ra_pts == mkv_d->last_pts) ? 0 : (mkv_d->last_pts); | |
2384 track->ra_pts = mkv_d->last_pts; | |
2385 if (track->sub_packet_cnt == 0) | |
2386 track->audio_filepos = demuxer->filepos; | |
2387 if (++(track->sub_packet_cnt) == sph) { | |
2388 int apk_usize = | |
32112 | 2389 ((sh_audio_t *) demuxer->audio->sh)->wf->nBlockAlign; |
31177 | 2390 track->sub_packet_cnt = 0; |
2391 // Release all the audio packets | |
2392 for (x = 0; x < sph * w / apk_usize; x++) { | |
2393 dp = new_demux_packet(apk_usize); | |
2394 memcpy(dp->buffer, track->audio_buf + x * apk_usize, | |
2395 apk_usize); | |
2396 /* Put timestamp only on packets that correspond to original | |
2397 * audio packets in file */ | |
2398 dp->pts = (x * apk_usize % w) ? 0 : | |
2399 track->audio_timestamp[x * apk_usize / w]; | |
2400 dp->pos = track->audio_filepos; // all equal | |
2401 dp->flags = x ? 0 : 0x10; // Mark first packet as keyframe | |
2402 ds_add_packet(demuxer->audio, dp); | |
2403 } | |
2404 } | |
2405 } else { // Not a codec that require reordering | |
2406 dp = new_demux_packet(size); | |
2407 memcpy(dp->buffer, buffer, size); | |
2408 if (track->ra_pts == mkv_d->last_pts && !mkv_d->a_skip_to_keyframe) | |
2409 dp->pts = 0; | |
2410 else | |
2411 dp->pts = mkv_d->last_pts; | |
2412 track->ra_pts = mkv_d->last_pts; | |
2413 | |
2414 dp->pos = demuxer->filepos; | |
2415 dp->flags = block_bref ? 0 : 0x10; | |
2416 ds_add_packet(demuxer->audio, dp); | |
2417 } | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2418 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2419 |
14054 | 2420 /** Reorder timecodes and add cached demux packets to the queues. |
2421 * | |
2422 * Timecode reordering is needed if a video track contains B frames that | |
2423 * are timestamped in display order (e.g. MPEG-1, MPEG-2 or "native" MPEG-4). | |
2424 * MPlayer doesn't like timestamps in display order. This function adjusts | |
2425 * the timestamp of cached frames (which are exactly one I/P frame followed | |
2426 * by one or more B frames) so that they are in coding order again. | |
2427 * | |
2428 * Example: The track with 25 FPS contains four frames with the timecodes | |
2429 * I at 0ms, P at 120ms, B at 40ms and B at 80ms. As soon as the next I | |
2430 * or P frame arrives these timecodes can be changed to I at 0ms, P at 40ms, | |
2431 * B at 80ms and B at 120ms. | |
2432 * | |
16912
4dea8b8f3b65
sort timestamps instead of assuming conventional B-frame order. (fixes x264 B-pyramid)
lorenm
parents:
16877
diff
changeset
|
2433 * This works for simple H.264 B-frame pyramids, but not for arbitrary orders. |
4dea8b8f3b65
sort timestamps instead of assuming conventional B-frame order. (fixes x264 B-pyramid)
lorenm
parents:
16877
diff
changeset
|
2434 * |
14054 | 2435 * \param demuxer The Matroska demuxer struct for this instance. |
2436 * \param track The track structure whose cache should be handled. | |
2437 */ | |
31177 | 2438 static void flush_cached_dps(demuxer_t *demuxer, mkv_track_t *track) |
14054 | 2439 { |
31177 | 2440 int i, ok; |
2441 | |
2442 if (track->num_cached_dps == 0) | |
2443 return; | |
2444 | |
2445 do { | |
2446 ok = 1; | |
2447 for (i = 1; i < track->num_cached_dps; i++) | |
2448 if (track->cached_dps[i - 1]->pts > track->cached_dps[i]->pts) { | |
2449 float tmp_pts = track->cached_dps[i - 1]->pts; | |
2450 track->cached_dps[i - 1]->pts = track->cached_dps[i]->pts; | |
2451 track->cached_dps[i]->pts = tmp_pts; | |
2452 ok = 0; | |
2453 } | |
2454 } while (!ok); | |
2455 | |
2456 for (i = 0; i < track->num_cached_dps; i++) | |
2457 ds_add_packet(demuxer->video, track->cached_dps[i]); | |
2458 track->num_cached_dps = 0; | |
14054 | 2459 } |
2460 | |
2461 /** Cache video frames if timecodes have to be reordered. | |
2462 * | |
2463 * Timecode reordering is needed if a video track contains B frames that | |
2464 * are timestamped in display order (e.g. MPEG-1, MPEG-2 or "native" MPEG-4). | |
2465 * This function takes in a Matroska block read from the file, allocates a | |
2466 * demux packet for it, fills in its values, allocates space for storing | |
2467 * pointers to the cached demux packets and adds the packet to it. If | |
2468 * the packet contains an I or a P frame then ::flush_cached_dps is called | |
2469 * in order to send the old cached frames downstream. | |
2470 * | |
2471 * \param demuxer The Matroska demuxer struct for this instance. | |
2472 * \param track The packet is meant for this track. | |
2473 * \param buffer The actual frame contents. | |
2474 * \param size The frame size in bytes. | |
2475 * \param block_bref A relative timecode (backward reference). If it is \c 0 | |
2476 * then the frame is an I frame. | |
2477 * \param block_fref A relative timecode (forward reference). If it is \c 0 | |
2478 * then the frame is either an I frame or a P frame depending on the value | |
2479 * of \a block_bref. Otherwise it's a B frame. | |
2480 */ | |
31177 | 2481 static void handle_video_bframes(demuxer_t *demuxer, mkv_track_t *track, |
2482 uint8_t *buffer, uint32_t size, | |
2483 int block_bref, int block_fref) | |
14054 | 2484 { |
31177 | 2485 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
2486 demux_packet_t *dp; | |
2487 | |
2488 dp = new_demux_packet(size); | |
2489 memcpy(dp->buffer, buffer, size); | |
2490 dp->pos = demuxer->filepos; | |
2491 dp->pts = mkv_d->last_pts; | |
2492 if ((track->num_cached_dps > 0) && (dp->pts < track->max_pts)) | |
2493 block_fref = 1; | |
2494 if (block_fref == 0) /* I or P frame */ | |
2495 flush_cached_dps(demuxer, track); | |
2496 if (block_bref != 0) /* I frame, don't cache it */ | |
2497 dp->flags = 0x10; | |
2498 if ((track->num_cached_dps + 1) > track->num_allocated_dps) { | |
2499 track->cached_dps = (demux_packet_t **) | |
2500 realloc(track->cached_dps, | |
2501 (track->num_cached_dps + 10) * sizeof(demux_packet_t *)); | |
2502 track->num_allocated_dps += 10; | |
14054 | 2503 } |
31177 | 2504 track->cached_dps[track->num_cached_dps] = dp; |
2505 track->num_cached_dps++; | |
2506 if (dp->pts > track->max_pts) | |
2507 track->max_pts = dp->pts; | |
14054 | 2508 } |
2509 | |
31177 | 2510 static int handle_block(demuxer_t *demuxer, uint8_t *block, uint64_t length, |
2511 uint64_t block_duration, int64_t block_bref, | |
2512 int64_t block_fref, uint8_t simpleblock) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2513 { |
31177 | 2514 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
2515 mkv_track_t *track = NULL; | |
2516 demux_stream_t *ds = NULL; | |
2517 uint64_t old_length; | |
2518 int64_t tc; | |
2519 uint32_t *lace_size; | |
2520 uint8_t laces, flags; | |
2521 int i, num, tmp, use_this_block = 1; | |
2522 float current_pts; | |
2523 int16_t time; | |
2524 | |
2525 /* first byte(s): track num */ | |
2526 num = ebml_read_vlen_uint(block, &tmp); | |
2527 block += tmp; | |
2528 /* time (relative to cluster time) */ | |
2529 time = block[0] << 8 | block[1]; | |
2530 block += 2; | |
2531 length -= tmp + 2; | |
2532 old_length = length; | |
2533 flags = block[0]; | |
2534 if (demux_mkv_read_block_lacing(block, &length, &laces, &lace_size)) | |
2535 return 0; | |
2536 block += old_length - length; | |
2537 | |
2538 tc = ((time * mkv_d->tc_scale + mkv_d->cluster_tc) / 1000000.0 - | |
2539 mkv_d->first_tc); | |
2540 if (tc < 0) | |
2541 tc = 0; | |
2542 if (mkv_d->stop_timecode > 0 && tc > mkv_d->stop_timecode) { | |
2543 free(lace_size); | |
2544 return -1; | |
12721
44895a7161c8
Do not dereference NULL if no track could be found for a block.
mosu
parents:
12550
diff
changeset
|
2545 } |
31177 | 2546 current_pts = tc / 1000.0; |
2547 | |
2548 for (i = 0; i < mkv_d->num_tracks; i++) | |
2549 if (mkv_d->tracks[i]->tnum == num) { | |
2550 track = mkv_d->tracks[i]; | |
2551 break; | |
19977 | 2552 } |
31177 | 2553 if (track == NULL) { |
2554 free(lace_size); | |
2555 return 1; | |
2556 } | |
2557 if (num == demuxer->audio->id) { | |
2558 ds = demuxer->audio; | |
2559 | |
2560 if (mkv_d->a_skip_to_keyframe) { | |
2561 if (simpleblock) { | |
2562 if (!(flags & 0x80)) /*current frame isn't a keyframe */ | |
2563 use_this_block = 0; | |
2564 } else if (block_bref != 0) | |
2565 use_this_block = 0; | |
2566 } else if (mkv_d->v_skip_to_keyframe) | |
2567 use_this_block = 0; | |
2568 | |
2569 if (track->fix_i_bps && use_this_block) { | |
2570 sh_audio_t *sh = (sh_audio_t *) ds->sh; | |
2571 | |
2572 if (block_duration != 0) { | |
2573 sh->i_bps = length * 1000 / block_duration; | |
2574 track->fix_i_bps = 0; | |
2575 } else if (track->qt_last_a_pts == 0.0) | |
2576 track->qt_last_a_pts = current_pts; | |
2577 else if (track->qt_last_a_pts != current_pts) { | |
2578 sh->i_bps = length / (current_pts - track->qt_last_a_pts); | |
2579 track->fix_i_bps = 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2580 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2581 } |
31177 | 2582 } else if (tc < mkv_d->skip_to_timecode) |
2583 use_this_block = 0; | |
2584 else if (num == demuxer->video->id) { | |
2585 ds = demuxer->video; | |
2586 if (mkv_d->v_skip_to_keyframe) { | |
2587 if (simpleblock) { | |
2588 if (!(flags & 0x80)) /*current frame isn't a keyframe */ | |
2589 use_this_block = 0; | |
2590 } else if (block_bref != 0 || block_fref != 0) | |
19977 | 2591 use_this_block = 0; |
31177 | 2592 } |
2593 } else if (num == demuxer->sub->id) { | |
2594 ds = demuxer->sub; | |
2595 if (track->subtitle_type != MATROSKA_SUBTYPE_VOBSUB) { | |
2596 if (!mkv_d->v_skip_to_keyframe) | |
2597 handle_subtitles(demuxer, track, block, length, block_duration, | |
2598 tc); | |
19977 | 2599 use_this_block = 0; |
2600 } | |
31177 | 2601 } else |
2602 use_this_block = 0; | |
2603 | |
2604 if (use_this_block) { | |
2605 mkv_d->last_pts = current_pts; | |
2606 mkv_d->last_filepos = demuxer->filepos; | |
2607 | |
2608 for (i = 0; i < laces; i++) { | |
2609 if (ds == demuxer->video && track->realmedia) | |
2610 handle_realvideo(demuxer, track, block, lace_size[i], | |
2611 block_bref); | |
2612 else if (ds == demuxer->audio && track->realmedia) | |
2613 handle_realaudio(demuxer, track, block, lace_size[i], | |
2614 block_bref); | |
2615 else if (ds == demuxer->video && track->reorder_timecodes) | |
2616 handle_video_bframes(demuxer, track, block, lace_size[i], | |
2617 block_bref, block_fref); | |
2618 else { | |
32220 | 2619 int modified; |
2620 size_t size = lace_size[i]; | |
31177 | 2621 demux_packet_t *dp; |
2622 uint8_t *buffer; | |
2623 modified = demux_mkv_decode(track, block, &buffer, &size, 1); | |
2624 if (buffer) { | |
2625 dp = new_demux_packet(size); | |
2626 memcpy(dp->buffer, buffer, size); | |
2627 if (modified) | |
2628 free(buffer); | |
2629 dp->flags = (block_bref == 0 | |
2630 && block_fref == 0) ? 0x10 : 0; | |
2631 /* If default_duration is 0, assume no pts value is known | |
2632 * for packets after the first one (rather than all pts | |
2633 * values being the same) */ | |
2634 if (i == 0 || track->default_duration) | |
2635 dp->pts = | |
2636 mkv_d->last_pts + i * track->default_duration; | |
2637 ds_add_packet(ds, dp); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2638 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2639 } |
31177 | 2640 block += lace_size[i]; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2641 } |
31177 | 2642 |
2643 if (ds == demuxer->video) { | |
2644 mkv_d->v_skip_to_keyframe = 0; | |
2645 mkv_d->skip_to_timecode = 0; | |
2646 } else if (ds == demuxer->audio) | |
2647 mkv_d->a_skip_to_keyframe = 0; | |
2648 | |
2649 free(lace_size); | |
2650 return 1; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2651 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2652 |
31177 | 2653 free(lace_size); |
2654 return 0; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2655 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2656 |
31177 | 2657 static int demux_mkv_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2658 { |
31177 | 2659 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
2660 stream_t *s = demuxer->stream; | |
2661 uint64_t l; | |
2662 int il, tmp; | |
2663 | |
2664 while (1) { | |
2665 while (mkv_d->cluster_size > 0) { | |
2666 uint64_t block_duration = 0, block_length = 0; | |
2667 int64_t block_bref = 0, block_fref = 0; | |
2668 uint8_t *block = NULL; | |
2669 | |
2670 while (mkv_d->blockgroup_size > 0) { | |
2671 switch (ebml_read_id(s, &il)) { | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2672 case MATROSKA_ID_BLOCKDURATION: |
31177 | 2673 block_duration = ebml_read_uint(s, &l); |
23704 | 2674 if (block_duration == EBML_UINT_INVALID) { |
31177 | 2675 free(block); |
2676 return 0; | |
23704 | 2677 } |
19810 | 2678 block_duration *= mkv_d->tc_scale / 1000000.0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2679 break; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2680 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2681 case MATROSKA_ID_BLOCK: |
31177 | 2682 block_length = ebml_read_length(s, &tmp); |
20155 | 2683 free(block); |
31177 | 2684 if (block_length > SIZE_MAX - AV_LZO_INPUT_PADDING) |
2685 return 0; | |
2686 block = malloc(block_length + AV_LZO_INPUT_PADDING); | |
2687 demuxer->filepos = stream_tell(s); | |
2688 if (stream_read(s, block, block_length) != | |
2689 (int) block_length) { | |
2690 free(block); | |
2691 return 0; | |
2692 } | |
2693 l = tmp + block_length; | |
2694 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2695 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2696 case MATROSKA_ID_REFERENCEBLOCK: |
31177 | 2697 { |
2698 int64_t num = ebml_read_int(s, &l); | |
23704 | 2699 if (num == EBML_INT_INVALID) { |
31177 | 2700 free(block); |
2701 return 0; | |
23704 | 2702 } |
14054 | 2703 if (num <= 0) |
31177 | 2704 block_bref = num; |
14054 | 2705 else |
31177 | 2706 block_fref = num; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2707 break; |
31177 | 2708 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2709 |
11934
bef061911390
Exit when an invalid EBML ID has been read (e.g. for files that have been cut off).
mosu
parents:
11901
diff
changeset
|
2710 case EBML_ID_INVALID: |
31177 | 2711 free(block); |
2712 return 0; | |
11934
bef061911390
Exit when an invalid EBML ID has been read (e.g. for files that have been cut off).
mosu
parents:
11901
diff
changeset
|
2713 |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2714 default: |
31177 | 2715 ebml_read_skip(s, &l); |
2716 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2717 } |
31177 | 2718 mkv_d->blockgroup_size -= l + il; |
2719 mkv_d->cluster_size -= l + il; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2720 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2721 |
31177 | 2722 if (block) { |
2723 int res = handle_block(demuxer, block, block_length, | |
2724 block_duration, block_bref, block_fref, | |
2725 0); | |
2726 free(block); | |
2727 if (res < 0) | |
2728 return 0; | |
2729 if (res) | |
2730 return 1; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2731 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2732 |
31177 | 2733 if (mkv_d->cluster_size > 0) { |
2734 switch (ebml_read_id(s, &il)) { | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2735 case MATROSKA_ID_CLUSTERTIMECODE: |
31177 | 2736 { |
2737 uint64_t num = ebml_read_uint(s, &l); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2738 if (num == EBML_UINT_INVALID) |
31177 | 2739 return 0; |
2740 if (!mkv_d->has_first_tc) { | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2741 mkv_d->first_tc = num * mkv_d->tc_scale / 1000000.0; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2742 mkv_d->has_first_tc = 1; |
31177 | 2743 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2744 mkv_d->cluster_tc = num * mkv_d->tc_scale; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2745 break; |
31177 | 2746 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2747 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2748 case MATROSKA_ID_BLOCKGROUP: |
31177 | 2749 mkv_d->blockgroup_size = ebml_read_length(s, &tmp); |
2750 l = tmp; | |
2751 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2752 |
19977 | 2753 case MATROSKA_ID_SIMPLEBLOCK: |
31177 | 2754 { |
19977 | 2755 int res; |
31177 | 2756 block_length = ebml_read_length(s, &tmp); |
32220 | 2757 if (block_length > SIZE_MAX) |
2758 return 0; | |
31177 | 2759 block = malloc(block_length); |
2760 demuxer->filepos = stream_tell(s); | |
2761 if (stream_read(s, block, block_length) != | |
2762 (int) block_length) { | |
2763 free(block); | |
2764 return 0; | |
20155 | 2765 } |
19977 | 2766 l = tmp + block_length; |
31177 | 2767 res = handle_block(demuxer, block, block_length, |
2768 block_duration, block_bref, | |
2769 block_fref, 1); | |
2770 free(block); | |
19977 | 2771 mkv_d->cluster_size -= l + il; |
2772 if (res < 0) | |
31177 | 2773 return 0; |
19977 | 2774 else if (res) |
31177 | 2775 return 1; |
2776 else | |
2777 mkv_d->cluster_size += l + il; | |
19977 | 2778 break; |
31177 | 2779 } |
11934
bef061911390
Exit when an invalid EBML ID has been read (e.g. for files that have been cut off).
mosu
parents:
11901
diff
changeset
|
2780 case EBML_ID_INVALID: |
31177 | 2781 return 0; |
11934
bef061911390
Exit when an invalid EBML ID has been read (e.g. for files that have been cut off).
mosu
parents:
11901
diff
changeset
|
2782 |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2783 default: |
31177 | 2784 ebml_read_skip(s, &l); |
2785 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2786 } |
31177 | 2787 mkv_d->cluster_size -= l + il; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2788 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2789 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2790 |
31177 | 2791 if (ebml_read_id(s, &il) != MATROSKA_ID_CLUSTER) |
2792 return 0; | |
2793 add_cluster_position(mkv_d, stream_tell(s) - il); | |
2794 mkv_d->cluster_size = ebml_read_length(s, NULL); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2795 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2796 |
31177 | 2797 return 0; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2798 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2799 |
31177 | 2800 static void demux_mkv_seek(demuxer_t *demuxer, float rel_seek_secs, |
2801 float audio_delay, int flags) | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2802 { |
31177 | 2803 free_cached_dps(demuxer); |
2804 if (!(flags & SEEK_FACTOR)) { /* time in secs */ | |
2805 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; | |
2806 stream_t *s = demuxer->stream; | |
2807 int64_t target_timecode = 0, diff, min_diff = 0xFFFFFFFFFFFFFFFLL; | |
2808 int i; | |
2809 | |
2810 if (!(flags & SEEK_ABSOLUTE)) /* relative seek */ | |
2811 target_timecode = (int64_t) (mkv_d->last_pts * 1000.0); | |
2812 target_timecode += (int64_t) (rel_seek_secs * 1000.0); | |
2813 if (target_timecode < 0) | |
2814 target_timecode = 0; | |
2815 | |
2816 if (mkv_d->indexes == NULL) { /* no index was found */ | |
2817 uint64_t target_filepos, cluster_pos, max_pos; | |
2818 | |
2819 target_filepos = | |
2820 (uint64_t) (target_timecode * mkv_d->last_filepos / | |
2821 (mkv_d->last_pts * 1000.0)); | |
2822 | |
2823 max_pos = mkv_d->num_cluster_pos ? | |
2824 mkv_d->cluster_positions[mkv_d->num_cluster_pos - 1] : 0; | |
2825 if (target_filepos > max_pos) { | |
2826 if ((off_t) max_pos > stream_tell(s)) | |
2827 stream_seek(s, max_pos); | |
2828 else | |
2829 stream_seek(s, stream_tell(s) + mkv_d->cluster_size); | |
2830 /* parse all the clusters upto target_filepos */ | |
2831 while (!s->eof && stream_tell(s) < (off_t) target_filepos) { | |
2832 switch (ebml_read_id(s, &i)) { | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2833 case MATROSKA_ID_CLUSTER: |
31177 | 2834 add_cluster_position(mkv_d, |
2835 (uint64_t) stream_tell(s) - i); | |
2836 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2837 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2838 case MATROSKA_ID_CUES: |
31177 | 2839 demux_mkv_read_cues(demuxer); |
2840 break; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2841 } |
31177 | 2842 ebml_read_skip(s, NULL); |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2843 } |
31177 | 2844 if (s->eof) |
2845 stream_reset(s); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2846 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2847 |
31177 | 2848 if (mkv_d->indexes == NULL) { |
2849 cluster_pos = mkv_d->cluster_positions[0]; | |
2850 /* Let's find the nearest cluster */ | |
2851 for (i = 0; i < mkv_d->num_cluster_pos; i++) { | |
2852 diff = mkv_d->cluster_positions[i] - target_filepos; | |
2853 if (rel_seek_secs < 0 && diff < 0 && -diff < min_diff) { | |
2854 cluster_pos = mkv_d->cluster_positions[i]; | |
2855 min_diff = -diff; | |
2856 } else if (rel_seek_secs > 0 | |
2857 && (diff < 0 ? -1 * diff : diff) < min_diff) { | |
2858 cluster_pos = mkv_d->cluster_positions[i]; | |
2859 min_diff = diff < 0 ? -1 * diff : diff; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2860 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2861 } |
31177 | 2862 mkv_d->cluster_size = mkv_d->blockgroup_size = 0; |
2863 stream_seek(s, cluster_pos); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2864 } |
31177 | 2865 } else { |
2866 mkv_index_t *index = NULL; | |
2867 int seek_id = (demuxer->video->id < 0) ? | |
2868 demuxer->audio->id : demuxer->video->id; | |
2869 | |
2870 /* let's find the entry in the indexes with the smallest */ | |
2871 /* difference to the wanted timecode. */ | |
2872 for (i = 0; i < mkv_d->num_indexes; i++) | |
2873 if (mkv_d->indexes[i].tnum == seek_id) { | |
2874 diff = | |
2875 target_timecode + mkv_d->first_tc - | |
2876 (int64_t) mkv_d->indexes[i].timecode * | |
2877 mkv_d->tc_scale / 1000000.0; | |
2878 | |
2879 if ((flags & SEEK_ABSOLUTE | |
2880 || target_timecode <= mkv_d->last_pts * 1000)) { | |
2881 // Absolute seek or seek backward: find the last index | |
2882 // position before target time | |
2883 if (diff < 0 || diff >= min_diff) | |
2884 continue; | |
2885 } else { | |
2886 // Relative seek forward: find the first index position | |
2887 // after target time. If no such index exists, find last | |
2888 // position between current position and target time. | |
2889 if (diff <= 0) { | |
2890 if (min_diff <= 0 && diff <= min_diff) | |
2891 continue; | |
2892 } else if (diff >= | |
2893 FFMIN(target_timecode - mkv_d->last_pts, | |
2894 min_diff)) | |
22616 | 2895 continue; |
2896 } | |
31177 | 2897 min_diff = diff; |
2898 index = mkv_d->indexes + i; | |
22616 | 2899 } |
31177 | 2900 |
2901 if (index) { /* We've found an entry. */ | |
2902 mkv_d->cluster_size = mkv_d->blockgroup_size = 0; | |
2903 stream_seek(s, index->filepos); | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2904 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2905 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2906 |
31177 | 2907 if (demuxer->video->id >= 0) |
2908 mkv_d->v_skip_to_keyframe = 1; | |
2909 if (rel_seek_secs > 0.0) | |
2910 mkv_d->skip_to_timecode = target_timecode; | |
2911 mkv_d->a_skip_to_keyframe = 1; | |
2912 | |
2913 demux_mkv_fill_buffer(demuxer, NULL); | |
2914 } else if ((demuxer->movi_end <= 0) || !(flags & SEEK_ABSOLUTE)) | |
2915 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] seek unsupported flags\n"); | |
2916 else { | |
2917 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; | |
2918 stream_t *s = demuxer->stream; | |
2919 uint64_t target_filepos; | |
2920 mkv_index_t *index = NULL; | |
2921 int i; | |
2922 | |
2923 if (mkv_d->indexes == NULL) { /* no index was found *//* I'm lazy... */ | |
2924 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] seek unsupported flags\n"); | |
2925 return; | |
12073 | 2926 } |
2927 | |
31177 | 2928 target_filepos = (uint64_t) (demuxer->movi_end * rel_seek_secs); |
2929 for (i = 0; i < mkv_d->num_indexes; i++) | |
2930 if (mkv_d->indexes[i].tnum == demuxer->video->id) | |
2931 if ((index == NULL) | |
2932 || ((mkv_d->indexes[i].filepos >= target_filepos) | |
2933 && ((index->filepos < target_filepos) | |
2934 || (mkv_d->indexes[i].filepos < index->filepos)))) | |
2935 index = &mkv_d->indexes[i]; | |
2936 | |
2937 if (!index) | |
2938 return; | |
2939 | |
2940 mkv_d->cluster_size = mkv_d->blockgroup_size = 0; | |
2941 stream_seek(s, index->filepos); | |
2942 | |
2943 if (demuxer->video->id >= 0) | |
2944 mkv_d->v_skip_to_keyframe = 1; | |
2945 mkv_d->skip_to_timecode = index->timecode; | |
2946 mkv_d->a_skip_to_keyframe = 1; | |
2947 | |
2948 demux_mkv_fill_buffer(demuxer, NULL); | |
12073 | 2949 } |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2950 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2951 |
31177 | 2952 static int demux_mkv_control(demuxer_t *demuxer, int cmd, void *arg) |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2953 { |
31177 | 2954 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; |
2955 | |
2956 switch (cmd) { | |
25919
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25883
diff
changeset
|
2957 case DEMUXER_CTRL_CORRECT_PTS: |
31177 | 2958 return DEMUXER_CTRL_OK; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2959 case DEMUXER_CTRL_GET_TIME_LENGTH: |
31177 | 2960 if (mkv_d->duration == 0) |
2961 return DEMUXER_CTRL_DONTKNOW; | |
2962 | |
2963 *((double *) arg) = (double) mkv_d->duration; | |
2964 return DEMUXER_CTRL_OK; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2965 |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2966 case DEMUXER_CTRL_GET_PERCENT_POS: |
31177 | 2967 if (mkv_d->duration == 0) { |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2968 return DEMUXER_CTRL_DONTKNOW; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2969 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2970 |
31177 | 2971 *((int *) arg) = (int) (100 * mkv_d->last_pts / mkv_d->duration); |
2972 return DEMUXER_CTRL_OK; | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2973 |
15154
898f68adad2b
Online audio switching now supports Matroska too. Patch by Michael Behrisch
gpoirier
parents:
14843
diff
changeset
|
2974 case DEMUXER_CTRL_SWITCH_AUDIO: |
31177 | 2975 if (demuxer->audio && demuxer->audio->sh) { |
2976 sh_audio_t *sh = demuxer->a_streams[demuxer->audio->id]; | |
2977 int aid = *(int *) arg; | |
2978 if (aid < 0) | |
2979 aid = (sh->aid + 1) % mkv_d->last_aid; | |
2980 if (aid != sh->aid) { | |
2981 mkv_track_t *track = | |
2982 demux_mkv_find_track_by_num(mkv_d, aid, | |
2983 MATROSKA_TRACK_AUDIO); | |
2984 if (track) { | |
2985 demuxer->audio->id = track->tnum; | |
2986 sh = demuxer->a_streams[demuxer->audio->id]; | |
2987 ds_free_packs(demuxer->audio); | |
2988 } | |
2989 } | |
2990 *(int *) arg = sh->aid; | |
2991 } else | |
2992 *(int *) arg = -2; | |
2993 return DEMUXER_CTRL_OK; | |
15154
898f68adad2b
Online audio switching now supports Matroska too. Patch by Michael Behrisch
gpoirier
parents:
14843
diff
changeset
|
2994 |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2995 default: |
31177 | 2996 return DEMUXER_CTRL_NOTIMPL; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2997 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2998 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
diff
changeset
|
2999 |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25658
diff
changeset
|
3000 const demuxer_desc_t demuxer_desc_matroska = { |
31177 | 3001 "Matroska demuxer", |
3002 "mkv", | |
3003 "Matroska", | |
3004 "Aurelien Jacobs", | |
3005 "", | |
3006 DEMUXER_TYPE_MATROSKA, | |
3007 1, // safe autodetect | |
3008 demux_mkv_open, | |
3009 demux_mkv_fill_buffer, | |
3010 NULL, | |
3011 demux_close_mkv, | |
3012 demux_mkv_seek, | |
3013 demux_mkv_control | |
16175 | 3014 }; |