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