]> git.sesse.net Git - vlc/blob - modules/demux/mkv/mkv.cpp
mkv: check for overflow and fix type limit warning
[vlc] / modules / demux / mkv / mkv.cpp
1 /*****************************************************************************
2  * mkv.cpp : matroska demuxer
3  *****************************************************************************
4  * Copyright (C) 2003-2005, 2008, 2010 VLC authors and VideoLAN
5  * $Id$
6  *
7  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8  *          Steve Lhomme <steve.lhomme@free.fr>
9  *
10  * This program is free software; you can redistribute it and/or modify it
11  * under the terms of the GNU Lesser General Public License as published by
12  * the Free Software Foundation; either version 2.1 of the License, or
13  * (at your option) any later version.
14  *
15  * This program is distributed in the hope that it will be useful,
16  * but WITHOUT ANY WARRANTY; without even the implied warranty of
17  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18  * GNU Lesser General Public License for more details.
19  *
20  * You should have received a copy of the GNU Lesser General Public License
21  * along with this program; if not, write to the Free Software Foundation,
22  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
23  *****************************************************************************/
24
25 #include "mkv.hpp"
26 #include "util.hpp"
27
28 #include "matroska_segment.hpp"
29 #include "demux.hpp"
30
31 #include "chapters.hpp"
32 #include "Ebml_parser.hpp"
33
34 #include "stream_io_callback.hpp"
35
36 #include <vlc_fs.h>
37 #include <vlc_url.h>
38
39 /*****************************************************************************
40  * Module descriptor
41  *****************************************************************************/
42 static int  Open ( vlc_object_t * );
43 static void Close( vlc_object_t * );
44
45 vlc_module_begin ()
46     set_shortname( "Matroska" )
47     set_description( N_("Matroska stream demuxer" ) )
48     set_capability( "demux", 50 )
49     set_callbacks( Open, Close )
50     set_category( CAT_INPUT )
51     set_subcategory( SUBCAT_INPUT_DEMUX )
52
53     add_bool( "mkv-use-ordered-chapters", true,
54             N_("Respect ordered chapters"),
55             N_("Play chapters in the order specified in the segment."), false );
56
57     add_bool( "mkv-use-chapter-codec", true,
58             N_("Chapter codecs"),
59             N_("Use chapter codecs found in the segment."), true );
60
61     add_bool( "mkv-preload-local-dir", true,
62             N_("Preload MKV files in the same directory"),
63             N_("Preload matroska files in the same directory to find linked segments (not good for broken files)."), false );
64
65     add_bool( "mkv-seek-percent", false,
66             N_("Seek based on percent not time"),
67             N_("Seek based on percent not time."), true );
68
69     add_bool( "mkv-use-dummy", false,
70             N_("Dummy Elements"),
71             N_("Read and discard unknown EBML elements (not good for broken files)."), true );
72
73     add_shortcut( "mka", "mkv" )
74 vlc_module_end ()
75
76 class demux_sys_t;
77
78 static int  Demux  ( demux_t * );
79 static int  Control( demux_t *, int, va_list );
80 static void Seek   ( demux_t *, mtime_t i_date, double f_percent, virtual_chapter_c *p_chapter );
81
82 /*****************************************************************************
83  * Open: initializes matroska demux structures
84  *****************************************************************************/
85 static int Open( vlc_object_t * p_this )
86 {
87     demux_t            *p_demux = (demux_t*)p_this;
88     demux_sys_t        *p_sys;
89     matroska_stream_c  *p_stream;
90     matroska_segment_c *p_segment;
91     const uint8_t      *p_peek;
92     std::string         s_path, s_filename;
93     vlc_stream_io_callback *p_io_callback;
94     EbmlStream         *p_io_stream;
95     bool                b_need_preload = false;
96
97     /* peek the begining */
98     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
99
100     /* is a valid file */
101     if( p_peek[0] != 0x1a || p_peek[1] != 0x45 ||
102         p_peek[2] != 0xdf || p_peek[3] != 0xa3 ) return VLC_EGENERIC;
103
104     /* Set the demux function */
105     p_demux->pf_demux   = Demux;
106     p_demux->pf_control = Control;
107     p_demux->p_sys      = p_sys = new demux_sys_t( *p_demux );
108
109     p_io_callback = new vlc_stream_io_callback( p_demux->s, false );
110     p_io_stream = new EbmlStream( *p_io_callback );
111
112     if( p_io_stream == NULL )
113     {
114         msg_Err( p_demux, "failed to create EbmlStream" );
115         delete p_io_callback;
116         delete p_sys;
117         return VLC_EGENERIC;
118     }
119
120     p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_io_stream, true );
121     if( p_stream == NULL )
122     {
123         msg_Err( p_demux, "cannot find KaxSegment or missing mandatory KaxInfo" );
124         goto error;
125     }
126     p_sys->streams.push_back( p_stream );
127
128     p_stream->p_io_callback = p_io_callback;
129     p_stream->p_estream = p_io_stream;
130
131     for (size_t i=0; i<p_stream->segments.size(); i++)
132     {
133         p_stream->segments[i]->Preload();
134         b_need_preload |= p_stream->segments[i]->b_ref_external_segments;
135     }
136
137     p_segment = p_stream->segments[0];
138     if( p_segment->cluster == NULL )
139     {
140         msg_Err( p_demux, "cannot find any cluster, damaged file ?" );
141         goto error;
142     }
143
144     if (b_need_preload && var_InheritBool( p_demux, "mkv-preload-local-dir" ))
145     {
146         msg_Dbg( p_demux, "Preloading local dir" );
147         /* get the files from the same dir from the same family (based on p_demux->psz_path) */
148         if ( p_demux->psz_file && !strcmp( p_demux->psz_access, "file" ) )
149         {
150             // assume it's a regular file
151             // get the directory path
152             s_path = p_demux->psz_file;
153             if (s_path.at(s_path.length() - 1) == DIR_SEP_CHAR)
154             {
155                 s_path = s_path.substr(0,s_path.length()-1);
156             }
157             else
158             {
159                 if (s_path.find_last_of(DIR_SEP_CHAR) > 0)
160                 {
161                     s_path = s_path.substr(0,s_path.find_last_of(DIR_SEP_CHAR));
162                 }
163             }
164
165             DIR *p_src_dir = vlc_opendir(s_path.c_str());
166
167             if (p_src_dir != NULL)
168             {
169                 const char *psz_file;
170                 while ((psz_file = vlc_readdir(p_src_dir)) != NULL)
171                 {
172                     if (strlen(psz_file) > 4)
173                     {
174                         s_filename = s_path + DIR_SEP_CHAR + psz_file;
175
176 #if defined(_WIN32) || defined(__OS2__)
177                         if (!strcasecmp(s_filename.c_str(), p_demux->psz_file))
178 #else
179                         if (!s_filename.compare(p_demux->psz_file))
180 #endif
181                         {
182                             continue; // don't reuse the original opened file
183                         }
184
185                         if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
186                             !s_filename.compare(s_filename.length() - 3, 3, "mka"))
187                         {
188                             // test whether this file belongs to our family
189                             const uint8_t *p_peek;
190                             bool          file_ok = false;
191 #warning Memory leak!
192                             std::string   s_url = vlc_path2uri( s_filename.c_str(), "file" );
193                             stream_t      *p_file_stream = stream_UrlNew(
194                                                             p_demux,
195                                                             s_url.c_str() );
196                             /* peek the begining */
197                             if( p_file_stream &&
198                                 stream_Peek( p_file_stream, &p_peek, 4 ) >= 4
199                                 && p_peek[0] == 0x1a && p_peek[1] == 0x45 &&
200                                 p_peek[2] == 0xdf && p_peek[3] == 0xa3 ) file_ok = true;
201
202                             if ( file_ok )
203                             {
204                                 vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, true );
205                                 EbmlStream *p_estream = new EbmlStream(*p_file_io);
206
207                                 p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_estream );
208
209                                 if ( p_stream == NULL )
210                                 {
211                                     msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() );
212                                     delete p_estream;
213                                     delete p_file_io;
214                                 }
215                                 else
216                                 {
217                                     p_stream->p_io_callback = p_file_io;
218                                     p_stream->p_estream = p_estream;
219                                     p_sys->streams.push_back( p_stream );
220                                 }
221                             }
222                             else
223                             {
224                                 if( p_file_stream ) {
225                                     stream_Delete( p_file_stream );
226                                 }
227                                 msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() );
228                             }
229                         }
230                     }
231                 }
232                 closedir( p_src_dir );
233             }
234         }
235
236         p_sys->PreloadFamily( *p_segment );
237     }
238     else if (b_need_preload)
239         msg_Warn( p_demux, "This file references other files, you may want to enable the preload of local directory");
240
241     if ( !p_sys->PreloadLinked() ||
242          !p_sys->PreparePlayback( NULL ) )
243     {
244         msg_Err( p_demux, "cannot use the segment" );
245         goto error;
246     }
247
248     p_sys->FreeUnused();
249
250     p_sys->InitUi();
251
252     return VLC_SUCCESS;
253
254 error:
255     delete p_sys;
256     return VLC_EGENERIC;
257 }
258
259 /*****************************************************************************
260  * Close: frees unused data
261  *****************************************************************************/
262 static void Close( vlc_object_t *p_this )
263 {
264     demux_t     *p_demux = (demux_t*)p_this;
265     demux_sys_t *p_sys   = p_demux->p_sys;
266     virtual_segment_c *p_vsegment = p_sys->p_current_segment;
267     if( p_vsegment )
268     {
269         matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
270         if( p_segment )
271             p_segment->UnSelect();
272     }
273
274     delete p_sys;
275 }
276
277 /*****************************************************************************
278  * Control:
279  *****************************************************************************/
280 static int Control( demux_t *p_demux, int i_query, va_list args )
281 {
282     demux_sys_t        *p_sys = p_demux->p_sys;
283     int64_t     *pi64, i64;
284     double      *pf, f;
285     int         i_skp;
286     size_t      i_idx;
287
288     vlc_meta_t *p_meta;
289     input_attachment_t ***ppp_attach;
290     int *pi_int;
291
292     switch( i_query )
293     {
294         case DEMUX_GET_ATTACHMENTS:
295             ppp_attach = (input_attachment_t***)va_arg( args, input_attachment_t*** );
296             pi_int = (int*)va_arg( args, int * );
297
298             if( p_sys->stored_attachments.size() <= 0 )
299                 return VLC_EGENERIC;
300
301             *pi_int = p_sys->stored_attachments.size();
302             *ppp_attach = (input_attachment_t**)malloc( sizeof(input_attachment_t*) *
303                                                         p_sys->stored_attachments.size() );
304             if( !(*ppp_attach) )
305                 return VLC_ENOMEM;
306             for( size_t i = 0; i < p_sys->stored_attachments.size(); i++ )
307             {
308                 attachment_c *a = p_sys->stored_attachments[i];
309                 (*ppp_attach)[i] = vlc_input_attachment_New( a->fileName(), a->mimeType(), NULL,
310                                                              a->p_data, a->size() );
311             }
312             return VLC_SUCCESS;
313
314         case DEMUX_GET_META:
315             p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
316             vlc_meta_Merge( p_meta, p_sys->meta );
317             return VLC_SUCCESS;
318
319         case DEMUX_GET_LENGTH:
320             pi64 = (int64_t*)va_arg( args, int64_t * );
321             if( p_sys->f_duration > 0.0 )
322             {
323                 *pi64 = (int64_t)(p_sys->f_duration * 1000);
324                 return VLC_SUCCESS;
325             }
326             return VLC_EGENERIC;
327
328         case DEMUX_GET_POSITION:
329             pf = (double*)va_arg( args, double * );
330             if ( p_sys->f_duration > 0.0 )
331                 *pf = (double)(p_sys->i_pts >= p_sys->i_start_pts ? p_sys->i_pts : p_sys->i_start_pts ) / (1000.0 * p_sys->f_duration);
332             return VLC_SUCCESS;
333
334         case DEMUX_SET_POSITION:
335             if( p_sys->f_duration > 0.0 )
336             {
337                 f = (double)va_arg( args, double );
338                 Seek( p_demux, -1, f, NULL );
339                 return VLC_SUCCESS;
340             }
341             return VLC_EGENERIC;
342
343         case DEMUX_GET_TIME:
344             pi64 = (int64_t*)va_arg( args, int64_t * );
345             *pi64 = p_sys->i_pts;
346             return VLC_SUCCESS;
347
348         case DEMUX_GET_TITLE_INFO:
349             if( p_sys->titles.size() > 1 || ( p_sys->titles.size() == 1 && p_sys->titles[0]->i_seekpoint > 0 ) )
350             {
351                 input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
352                 int *pi_int    = (int*)va_arg( args, int* );
353
354                 *pi_int = p_sys->titles.size();
355                 *ppp_title = (input_title_t**)malloc( sizeof( input_title_t* ) * p_sys->titles.size() );
356
357                 for( size_t i = 0; i < p_sys->titles.size(); i++ )
358                     (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] );
359                 return VLC_SUCCESS;
360             }
361             return VLC_EGENERIC;
362
363         case DEMUX_SET_TITLE:
364             /* handle editions as titles */
365             i_idx = (int)va_arg( args, int );
366             if(i_idx <  p_sys->titles.size() && p_sys->titles[i_idx]->i_seekpoint)
367             {
368                 p_sys->p_current_segment->i_current_edition = i_idx;
369                 p_sys->i_current_title = i_idx;
370                 p_sys->p_current_segment->p_current_chapter = p_sys->p_current_segment->editions[p_sys->p_current_segment->i_current_edition]->getChapterbyTimecode(0);
371
372                 Seek( p_demux, (int64_t)p_sys->titles[i_idx]->seekpoint[0]->i_time_offset, -1, NULL);
373                 p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT|INPUT_UPDATE_TITLE;
374                 p_demux->info.i_seekpoint = 0;
375                 p_demux->info.i_title = i_idx;
376                 p_sys->f_duration = (float) p_sys->titles[i_idx]->i_length / 1000.f;
377                 return VLC_SUCCESS;
378             }
379             return VLC_EGENERIC;
380
381         case DEMUX_SET_SEEKPOINT:
382             i_skp = (int)va_arg( args, int );
383
384             // TODO change the way it works with the << & >> buttons on the UI (+1/-1 instead of a number)
385             if( p_sys->titles.size() && i_skp < p_sys->titles[p_sys->i_current_title]->i_seekpoint)
386             {
387                 Seek( p_demux, (int64_t)p_sys->titles[p_sys->i_current_title]->seekpoint[i_skp]->i_time_offset, -1, NULL);
388                 p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
389                 p_demux->info.i_seekpoint = i_skp;
390                 return VLC_SUCCESS;
391             }
392             return VLC_EGENERIC;
393
394         case DEMUX_GET_FPS:
395             pf = (double *)va_arg( args, double * );
396             *pf = 0.0;
397             if( p_sys->p_current_segment && p_sys->p_current_segment->CurrentSegment() )
398             {
399                 const matroska_segment_c *p_segment = p_sys->p_current_segment->CurrentSegment();
400                 for( size_t i = 0; i < p_segment->tracks.size(); i++ )
401                 {
402                     mkv_track_t *tk = p_segment->tracks[i];
403                     if( tk->fmt.i_cat == VIDEO_ES && tk->fmt.video.i_frame_rate_base > 0 )
404                     {
405                         *pf = (double)tk->fmt.video.i_frame_rate / tk->fmt.video.i_frame_rate_base;
406                         break;
407                     }
408                 }
409             }
410             return VLC_SUCCESS;
411
412         case DEMUX_SET_TIME:
413             i64 = (int64_t) va_arg( args, int64_t );
414             msg_Dbg(p_demux,"SET_TIME to %"PRId64, i64 );
415             Seek( p_demux, i64, -1, NULL );
416             return VLC_SUCCESS;
417         default:
418             return VLC_EGENERIC;
419     }
420 }
421
422 /* Seek */
423 static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, virtual_chapter_c *p_chapter )
424 {
425     demux_sys_t        *p_sys = p_demux->p_sys;
426     virtual_segment_c  *p_vsegment = p_sys->p_current_segment;
427     matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
428     mtime_t            i_time_offset = 0;
429     int64_t            i_global_position = -1;
430
431     int         i_index;
432
433     msg_Dbg( p_demux, "seek request to %"PRId64" (%f%%)", i_date, f_percent );
434     if( i_date < 0 && f_percent < 0 )
435     {
436         msg_Warn( p_demux, "cannot seek nowhere!" );
437         return;
438     }
439     if( f_percent > 1.0 )
440     {
441         msg_Warn( p_demux, "cannot seek so far!" );
442         return;
443     }
444     if( p_sys->f_duration < 0 )
445     {
446         msg_Warn( p_demux, "cannot seek without duration!");
447         return;
448     }
449     if( !p_segment )
450     {
451         msg_Warn( p_demux, "cannot seek without valid segment position");
452         return;
453     }
454
455     /* seek without index or without date */
456     if( f_percent >= 0 && (var_InheritBool( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 ))
457     {
458         i_date = int64_t( f_percent * p_sys->f_duration * 1000.0 );
459         if( !p_segment->b_cues )
460         {
461             int64_t i_pos = int64_t( f_percent * stream_Size( p_demux->s ) );
462
463             msg_Dbg( p_demux, "lengthy way of seeking for pos:%"PRId64, i_pos );
464             for( i_index = 0; i_index < p_segment->i_index; i_index++ )
465             {
466                 if( p_segment->p_indexes[i_index].i_position >= i_pos &&
467                     p_segment->p_indexes[i_index].i_time > 0 )
468                     break;
469             }
470             if( i_index == p_segment->i_index )
471                 i_index--;
472
473             if( p_segment->p_indexes[i_index].i_position < i_pos )
474             {
475                 msg_Dbg( p_demux, "no cues, seek request to global pos: %"PRId64, i_pos );
476                 i_global_position = i_pos;
477             }
478         }
479     }
480     p_vsegment->Seek( *p_demux, i_date, i_time_offset, p_chapter, i_global_position );
481 }
482
483 /* Needed by matroska_segment::Seek() and Seek */
484 void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock,
485                          mtime_t i_pts, mtime_t i_duration, bool f_mandatory )
486 {
487     demux_sys_t        *p_sys = p_demux->p_sys;
488     matroska_segment_c *p_segment = p_sys->p_current_segment->CurrentSegment();
489
490     if( !p_segment ) return;
491
492     size_t          i_track;
493     if( p_segment->BlockFindTrackIndex( &i_track, block, simpleblock ) )
494     {
495         msg_Err( p_demux, "invalid track number" );
496         return;
497     }
498
499     mkv_track_t *tk = p_segment->tracks[i_track];
500
501     if( tk->fmt.i_cat != NAV_ES && tk->p_es == NULL )
502     {
503         msg_Err( p_demux, "unknown track number" );
504         return;
505     }
506
507     i_pts -= tk->i_codec_delay;
508
509     if ( tk->fmt.i_cat != NAV_ES )
510     {
511         bool b;
512         es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
513
514         if( !b )
515         {
516             tk->b_inited = false;
517             if( tk->fmt.i_cat == VIDEO_ES || tk->fmt.i_cat == AUDIO_ES )
518                 tk->i_last_dts = i_pts;
519             return;
520         }
521     }
522
523
524     /* First send init data */
525     if( !tk->b_inited && tk->i_data_init > 0 )
526     {
527         block_t *p_init;
528
529         msg_Dbg( p_demux, "sending header (%d bytes)", tk->i_data_init );
530         p_init = MemToBlock( tk->p_data_init, tk->i_data_init, 0 );
531         if( p_init ) es_out_Send( p_demux->out, tk->p_es, p_init );
532     }
533     tk->b_inited = true;
534
535
536     size_t frame_size = 0;
537     size_t block_size = 0;
538
539     if( simpleblock != NULL )
540         block_size = simpleblock->GetSize();
541     else
542         block_size = block->GetSize();
543  
544     for( unsigned int i = 0;
545          ( block != NULL && i < block->NumberFrames()) || ( simpleblock != NULL && i < simpleblock->NumberFrames() );
546          i++ )
547     {
548         block_t *p_block;
549         DataBuffer *data;
550         if( simpleblock != NULL )
551         {
552             data = &simpleblock->GetBuffer(i);
553             // condition when the DTS is correct (keyframe or B frame == NOT P frame)
554             f_mandatory = simpleblock->IsDiscardable() || simpleblock->IsKeyframe();
555         }
556         else
557         {
558             data = &block->GetBuffer(i);
559             // condition when the DTS is correct (keyframe or B frame == NOT P frame)
560         }
561         frame_size += data->Size();
562         if( !data->Buffer() || data->Size() > frame_size || frame_size > block_size  )
563         {
564             msg_Warn( p_demux, "Cannot read frame (too long or no frame)" );
565             break;
566         }
567
568         if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER &&
569             tk->p_compression_data != NULL &&
570             tk->i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES )
571             p_block = MemToBlock( data->Buffer(), data->Size(), tk->p_compression_data->GetSize() );
572         else if( unlikely( tk->fmt.i_codec == VLC_CODEC_WAVPACK ) )
573             p_block = packetize_wavpack(tk, data->Buffer(), data->Size());
574         else
575             p_block = MemToBlock( data->Buffer(), data->Size(), 0 );
576
577         if( p_block == NULL )
578         {
579             break;
580         }
581
582 #if defined(HAVE_ZLIB_H)
583         if( tk->i_compression_type == MATROSKA_COMPRESSION_ZLIB &&
584             tk->i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES )
585         {
586             p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block );
587             if( p_block == NULL )
588                 break;
589         }
590         else
591 #endif
592         if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER &&
593             tk->i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES )
594         {
595             memcpy( p_block->p_buffer, tk->p_compression_data->GetBuffer(), tk->p_compression_data->GetSize() );
596         }
597         switch( tk->fmt.i_codec )
598         {
599         case VLC_CODEC_COOK:
600         case VLC_CODEC_ATRAC3:
601         {
602             handle_real_audio(p_demux, tk, p_block, i_pts);
603             block_Release(p_block);
604             i_pts = ( tk->i_default_duration )?
605                 i_pts + ( mtime_t )( tk->i_default_duration / 1000 ):
606                 VLC_TS_INVALID;
607             continue;
608          }
609          case VLC_CODEC_OPUS:
610             mtime_t i_length = i_duration * tk-> f_timecodescale *
611                     (double) p_segment->i_timescale / 1000.0;
612             if ( i_length < 0 ) i_length = 0;
613             p_block->i_nb_samples = i_length * tk->fmt.audio.i_rate
614                     / CLOCK_FREQ;
615             break;
616         }
617
618         
619         if( tk->fmt.i_cat != VIDEO_ES )
620         {
621             if ( tk->fmt.i_cat == NAV_ES )
622             {
623                 // TODO handle the start/stop times of this packet
624                 p_sys->p_ev->SetPci( (const pci_t *)&p_block->p_buffer[1]);
625                 block_Release( p_block );
626                 return;
627             }
628             else if( tk->fmt.i_cat == AUDIO_ES )
629             {
630                 if( tk->i_chans_to_reorder )
631                     aout_ChannelReorder( p_block->p_buffer, p_block->i_buffer,
632                                          tk->fmt.audio.i_channels,
633                                          tk->pi_chan_table, tk->fmt.i_codec );
634
635             }
636             p_block->i_dts = p_block->i_pts = i_pts;
637         }
638         else
639         {
640             // correct timestamping when B frames are used
641             if( tk->b_dts_only )
642             {
643                 p_block->i_pts = VLC_TS_INVALID;
644                 p_block->i_dts = i_pts;
645             }
646             else if( tk->b_pts_only )
647             {
648                 p_block->i_pts = i_pts;
649                 p_block->i_dts = i_pts;
650             }
651             else
652             {
653                 p_block->i_pts = i_pts;
654                 if ( f_mandatory )
655                     p_block->i_dts = p_block->i_pts;
656                 else
657                     p_block->i_dts = min( i_pts, tk->i_last_dts + ( mtime_t )( tk->i_default_duration / 1000 ) );
658             }
659         }
660         if( p_block->i_dts > VLC_TS_INVALID &&
661             ( tk->fmt.i_cat == VIDEO_ES || tk->fmt.i_cat == AUDIO_ES ) )
662         {
663             tk->i_last_dts = p_block->i_dts;
664         }
665
666 #if 0
667 msg_Dbg( p_demux, "block i_dts: %"PRId64" / i_pts: %"PRId64, p_block->i_dts, p_block->i_pts);
668 #endif
669         if( !tk->b_no_duration )
670         {
671             p_block->i_length = i_duration * tk-> f_timecodescale *
672                 (double) p_segment->i_timescale / 1000.0;
673         }
674
675         /* FIXME remove when VLC_TS_INVALID work is done */
676         if( i == 0 || p_block->i_dts > VLC_TS_INVALID )
677             p_block->i_dts += VLC_TS_0;
678         if( !tk->b_dts_only && ( i == 0 || p_block->i_pts > VLC_TS_INVALID ) )
679             p_block->i_pts += VLC_TS_0;
680
681         es_out_Send( p_demux->out, tk->p_es, p_block );
682
683         /* use time stamp only for first block */
684         i_pts = ( tk->i_default_duration )?
685                  i_pts + ( mtime_t )( tk->i_default_duration / 1000 ):
686                  VLC_TS_INVALID;
687     }
688 }
689
690 /*****************************************************************************
691  * Demux: reads and demuxes data packets
692  *****************************************************************************
693  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
694  *****************************************************************************/
695 static int Demux( demux_t *p_demux)
696 {
697     demux_sys_t        *p_sys = p_demux->p_sys;
698
699     vlc_mutex_lock( &p_sys->lock_demuxer );
700
701     virtual_segment_c  *p_vsegment = p_sys->p_current_segment;
702     matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
703     if ( p_segment == NULL )
704     {
705         vlc_mutex_unlock( &p_sys->lock_demuxer );
706         return 0;
707     }
708     int i_return = 0;
709
710     for( ;; )
711     {
712         if( p_sys->i_pts >= p_sys->i_start_pts  )
713             if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
714             {
715                 i_return = 1;
716                 break;
717             }
718
719         if ( p_vsegment->CurrentEdition() &&
720              p_vsegment->CurrentEdition()->b_ordered &&
721              p_vsegment->CurrentChapter() == NULL )
722             /* nothing left to read in this ordered edition */
723             break;
724
725         KaxBlock *block;
726         KaxSimpleBlock *simpleblock;
727         int64_t i_block_duration = 0;
728         bool b_key_picture;
729         bool b_discardable_picture;
730         if( p_segment->BlockGet( block, simpleblock, &b_key_picture, &b_discardable_picture, &i_block_duration ) )
731         {
732             if ( p_vsegment->CurrentEdition() && p_vsegment->CurrentEdition()->b_ordered )
733             {
734                 const virtual_chapter_c *p_chap = p_vsegment->CurrentChapter();
735                 // check if there are more chapters to read
736                 if ( p_chap != NULL )
737                 {
738                     /* TODO handle successive chapters with the same user_start_time/user_end_time
739                     */
740                     p_sys->i_pts = p_chap->i_virtual_stop_time;
741                     p_sys->i_pts++; // trick to avoid staying on segments with no duration and no content
742
743                     i_return = 1;
744                 }
745
746                 break;
747             }
748             else
749             {
750                 msg_Warn( p_demux, "cannot get block EOF?" );
751                 break;
752             }
753         }
754
755         if( simpleblock != NULL )
756             p_sys->i_pts = p_sys->i_chapter_time + ( (mtime_t)simpleblock->GlobalTimecode() / INT64_C(1000) );
757         else
758             p_sys->i_pts = p_sys->i_chapter_time + ( (mtime_t)block->GlobalTimecode() / INT64_C(1000) );
759
760         mtime_t i_pcr = VLC_TS_INVALID;
761         for( size_t i = 0; i < p_segment->tracks.size(); i++)
762             if( p_segment->tracks[i]->i_last_dts > VLC_TS_INVALID &&
763                 ( p_segment->tracks[i]->i_last_dts < i_pcr || i_pcr == VLC_TS_INVALID ))
764                 i_pcr = p_segment->tracks[i]->i_last_dts;
765
766         if( i_pcr > p_sys->i_pcr + 300000 )
767         {
768             es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
769             p_sys->i_pcr = i_pcr;
770         }
771
772         if( p_sys->i_pts >= p_sys->i_start_pts  )
773         {
774             if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
775             {
776                 i_return = 1;
777                 delete block;
778                 break;
779             }
780         }
781
782         if ( p_vsegment->CurrentEdition() &&
783              p_vsegment->CurrentEdition()->b_ordered &&
784              p_vsegment->CurrentChapter() == NULL )
785         {
786             /* nothing left to read in this ordered edition */
787             delete block;
788             break;
789         }
790
791         BlockDecode( p_demux, block, simpleblock, p_sys->i_pts, i_block_duration, b_key_picture || b_discardable_picture );
792
793         delete block;
794
795         vlc_mutex_unlock( &p_sys->lock_demuxer );
796         return 1;
797     }
798
799     vlc_mutex_unlock( &p_sys->lock_demuxer );
800
801     return i_return;
802 }
803