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