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