]> git.sesse.net Git - vlc/blob - modules/demux/mkv/mkv.cpp
Fix MKV PCR "free-run" when a track is disabled.
[vlc] / modules / demux / mkv / mkv.cpp
1 /*****************************************************************************
2  * mkv.cpp : matroska demuxer
3  *****************************************************************************
4  * Copyright (C) 2003-2005, 2008, 2010 the VideoLAN team
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
11  * it under the terms of the GNU General Public License as published by
12  * the Free Software Foundation; either version 2 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 General Public License for more details.
19  *
20  * You should have received a copy of the GNU General Public License
21  * along with this program; if not, write to the Free Software
22  * Foundation, 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                 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                             free (psz_file);
183                             continue; // don't reuse the original opened file
184                         }
185
186                         if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
187                             !s_filename.compare(s_filename.length() - 3, 3, "mka"))
188                         {
189                             // test whether this file belongs to our family
190                             const uint8_t *p_peek;
191                             bool          file_ok = false;
192 #warning Memory leak!
193                             std::string   s_url = vlc_path2uri( s_filename.c_str(), "file" );
194                             stream_t      *p_file_stream = stream_UrlNew(
195                                                             p_demux,
196                                                             s_url.c_str() );
197                             /* peek the begining */
198                             if( p_file_stream &&
199                                 stream_Peek( p_file_stream, &p_peek, 4 ) >= 4
200                                 && p_peek[0] == 0x1a && p_peek[1] == 0x45 &&
201                                 p_peek[2] == 0xdf && p_peek[3] == 0xa3 ) file_ok = true;
202
203                             if ( file_ok )
204                             {
205                                 vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, true );
206                                 EbmlStream *p_estream = new EbmlStream(*p_file_io);
207
208                                 p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_estream );
209
210                                 if ( p_stream == NULL )
211                                 {
212                                     msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() );
213                                     delete p_estream;
214                                     delete p_file_io;
215                                 }
216                                 else
217                                 {
218                                     p_stream->p_io_callback = p_file_io;
219                                     p_stream->p_estream = p_estream;
220                                     p_sys->streams.push_back( p_stream );
221                                 }
222                             }
223                             else
224                             {
225                                 if( p_file_stream ) {
226                                     stream_Delete( p_file_stream );
227                                 }
228                                 msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() );
229                             }
230                         }
231                     }
232                     free (psz_file);
233                 }
234                 closedir( p_src_dir );
235             }
236         }
237
238         p_sys->PreloadFamily( *p_segment );
239     }
240     else if (b_need_preload)
241         msg_Warn( p_demux, "This file references other files, you may want to enable the preload of local directory");
242
243     if ( !p_sys->PreloadLinked() ||
244          !p_sys->PreparePlayback( NULL ) )
245     {
246         msg_Err( p_demux, "cannot use the segment" );
247         goto error;
248     }
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                 {
359                     (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] );
360                 }
361                 return VLC_SUCCESS;
362             }
363             return VLC_EGENERIC;
364
365         case DEMUX_SET_TITLE:
366             /* TODO handle editions as titles */
367             i_idx = (int)va_arg( args, int );
368             if( i_idx < p_sys->used_segments.size() )
369             {
370                 p_sys->JumpTo( *p_sys->used_segments[i_idx], NULL );
371                 return VLC_SUCCESS;
372             }
373             return VLC_EGENERIC;
374
375         case DEMUX_SET_SEEKPOINT:
376             i_skp = (int)va_arg( args, int );
377
378             // TODO change the way it works with the << & >> buttons on the UI (+1/-1 instead of a number)
379             if( p_sys->titles.size() && i_skp < p_sys->titles[p_sys->i_current_title]->i_seekpoint)
380             {
381                 Seek( p_demux, (int64_t)p_sys->titles[p_sys->i_current_title]->seekpoint[i_skp]->i_time_offset, -1, NULL);
382                 p_demux->info.i_seekpoint |= INPUT_UPDATE_SEEKPOINT;
383                 p_demux->info.i_seekpoint = i_skp;
384                 return VLC_SUCCESS;
385             }
386             return VLC_EGENERIC;
387
388         case DEMUX_GET_FPS:
389             pf = (double *)va_arg( args, double * );
390             *pf = 0.0;
391             if( p_sys->p_current_segment && p_sys->p_current_segment->CurrentSegment() )
392             {
393                 const matroska_segment_c *p_segment = p_sys->p_current_segment->CurrentSegment();
394                 for( size_t i = 0; i < p_segment->tracks.size(); i++ )
395                 {
396                     mkv_track_t *tk = p_segment->tracks[i];
397                     if( tk->fmt.i_cat == VIDEO_ES && tk->fmt.video.i_frame_rate_base > 0 )
398                     {
399                         *pf = (double)tk->fmt.video.i_frame_rate / tk->fmt.video.i_frame_rate_base;
400                         break;
401                     }
402                 }
403             }
404             return VLC_SUCCESS;
405
406         case DEMUX_SET_TIME:
407             i64 = (int64_t) va_arg( args, int64_t );
408             msg_Dbg(p_demux,"SET_TIME to %"PRId64, i64 );
409             Seek( p_demux, i64, -1, NULL );
410             return VLC_SUCCESS;
411         default:
412             return VLC_EGENERIC;
413     }
414 }
415
416 /* Seek */
417 static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, virtual_chapter_c *p_chapter )
418 {
419     demux_sys_t        *p_sys = p_demux->p_sys;
420     virtual_segment_c  *p_vsegment = p_sys->p_current_segment;
421     matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
422     mtime_t            i_time_offset = 0;
423     int64_t            i_global_position = -1;
424
425     int         i_index;
426
427     msg_Dbg( p_demux, "seek request to %"PRId64" (%f%%)", i_date, f_percent );
428     if( i_date < 0 && f_percent < 0 )
429     {
430         msg_Warn( p_demux, "cannot seek nowhere!" );
431         return;
432     }
433     if( f_percent > 1.0 )
434     {
435         msg_Warn( p_demux, "cannot seek so far!" );
436         return;
437     }
438     if( p_sys->f_duration < 0 )
439     {
440         msg_Warn( p_demux, "cannot seek without duration!");
441         return;
442     }
443
444     /* seek without index or without date */
445     if( f_percent >= 0 && (var_InheritBool( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 ))
446     {
447         i_date = int64_t( f_percent * p_sys->f_duration * 1000.0 );
448         if( !p_segment->b_cues )
449         {
450             int64_t i_pos = int64_t( f_percent * stream_Size( p_demux->s ) );
451
452             msg_Dbg( p_demux, "lengthy way of seeking for pos:%"PRId64, i_pos );
453             for( i_index = 0; i_index < p_segment->i_index; i_index++ )
454             {
455                 if( p_segment->p_indexes[i_index].i_position >= i_pos &&
456                     p_segment->p_indexes[i_index].i_time > 0 )
457                     break;
458             }
459             if( i_index == p_segment->i_index )
460                 i_index--;
461
462             if( p_segment->p_indexes[i_index].i_position < i_pos )
463             {
464                 msg_Dbg( p_demux, "no cues, seek request to global pos: %"PRId64, i_pos );
465                 i_global_position = i_pos;
466             }
467         }
468     }
469     p_vsegment->Seek( *p_demux, i_date, i_time_offset, p_chapter, i_global_position );
470 }
471
472 /* Needed by matroska_segment::Seek() and Seek */
473 void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock,
474                          mtime_t i_pts, mtime_t i_duration, bool f_mandatory )
475 {
476     demux_sys_t        *p_sys = p_demux->p_sys;
477     matroska_segment_c *p_segment = p_sys->p_current_segment->CurrentSegment();
478
479     if( !p_segment ) return;
480
481     size_t          i_track;
482     if( p_segment->BlockFindTrackIndex( &i_track, block, simpleblock ) )
483     {
484         msg_Err( p_demux, "invalid track number" );
485         return;
486     }
487
488     mkv_track_t *tk = p_segment->tracks[i_track];
489
490     if( tk->fmt.i_cat != NAV_ES && tk->p_es == NULL )
491     {
492         msg_Err( p_demux, "unknown track number" );
493         return;
494     }
495     if( i_pts + i_duration < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES )
496     {
497         return; /* discard audio packets that shouldn't be rendered */
498     }
499
500     if ( tk->fmt.i_cat != NAV_ES )
501     {
502         bool b;
503         es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
504
505         if( !b )
506         {
507             tk->b_inited = false;
508             if( tk->fmt.i_cat == VIDEO_ES || tk->fmt.i_cat == AUDIO_ES )
509                 tk->i_last_dts = i_pts;
510             return;
511         }
512     }
513
514
515     /* First send init data */
516     if( !tk->b_inited && tk->i_data_init > 0 )
517     {
518         block_t *p_init;
519
520         msg_Dbg( p_demux, "sending header (%d bytes)", tk->i_data_init );
521         p_init = MemToBlock( tk->p_data_init, tk->i_data_init, 0 );
522         if( p_init ) es_out_Send( p_demux->out, tk->p_es, p_init );
523     }
524     tk->b_inited = true;
525
526
527     size_t frame_size = 0;
528     size_t block_size = 0;
529
530     if( simpleblock != NULL )
531         block_size = simpleblock->GetSize();
532     else
533         block_size = block->GetSize();
534  
535     for( unsigned int i = 0;
536          ( block != NULL && i < block->NumberFrames()) || ( simpleblock != NULL && i < simpleblock->NumberFrames() );
537          i++ )
538     {
539         block_t *p_block;
540         DataBuffer *data;
541         if( simpleblock != NULL )
542         {
543             data = &simpleblock->GetBuffer(i);
544             // condition when the DTS is correct (keyframe or B frame == NOT P frame)
545             f_mandatory = simpleblock->IsDiscardable() || simpleblock->IsKeyframe();
546         }
547         else
548         {
549             data = &block->GetBuffer(i);
550             // condition when the DTS is correct (keyframe or B frame == NOT P frame)
551         }
552         frame_size += data->Size();
553         if( !data->Buffer() || data->Size() > SIZE_MAX || frame_size > block_size  )
554         {
555             msg_Warn( p_demux, "Cannot read frame (too long or no frame)" );
556             break;
557         }
558
559         if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER && tk->p_compression_data != NULL )
560             p_block = MemToBlock( data->Buffer(), data->Size(), tk->p_compression_data->GetSize() );
561         else
562             p_block = MemToBlock( data->Buffer(), data->Size(), 0 );
563
564         if( p_block == NULL )
565         {
566             break;
567         }
568
569 #if defined(HAVE_ZLIB_H)
570         if( tk->i_compression_type == MATROSKA_COMPRESSION_ZLIB )
571         {
572             p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block );
573             if( p_block == NULL )
574                 break;
575         }
576         else
577 #endif
578         if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER )
579         {
580             memcpy( p_block->p_buffer, tk->p_compression_data->GetBuffer(), tk->p_compression_data->GetSize() );
581         }
582
583         if( tk->fmt.i_codec == VLC_CODEC_COOK ||
584             tk->fmt.i_codec == VLC_CODEC_ATRAC3 )
585         {
586             handle_real_audio(p_demux, tk, p_block, i_pts);
587             block_Release(p_block);
588             i_pts = ( tk->i_default_duration )?
589                 i_pts + ( mtime_t )( tk->i_default_duration / 1000 ):
590                 VLC_TS_INVALID;
591             continue;
592         }
593
594         if ( tk->fmt.i_cat == NAV_ES )
595         {
596             // TODO handle the start/stop times of this packet
597             p_sys->p_ev->SetPci( (const pci_t *)&p_block->p_buffer[1]);
598             block_Release( p_block );
599             return;
600         }
601         // correct timestamping when B frames are used
602         if( tk->fmt.i_cat != VIDEO_ES )
603         {
604             p_block->i_dts = p_block->i_pts = i_pts;
605         }
606         else
607         {
608             if( tk->b_dts_only )
609             {
610                 p_block->i_pts = VLC_TS_INVALID;
611                 p_block->i_dts = i_pts;
612             }
613             else if( tk->b_pts_only )
614             {
615                 p_block->i_pts = i_pts;
616                 p_block->i_dts = i_pts;
617             }
618             else
619             {
620                 p_block->i_pts = i_pts;
621                 if ( f_mandatory )
622                     p_block->i_dts = p_block->i_pts;
623                 else
624                     p_block->i_dts = min( i_pts, tk->i_last_dts + ( mtime_t )( tk->i_default_duration / 1000 ) );
625             }
626         }
627         if( tk->fmt.i_cat == VIDEO_ES || tk->fmt.i_cat == AUDIO_ES )
628             tk->i_last_dts = p_block->i_dts;
629
630 #if 0
631 msg_Dbg( p_demux, "block i_dts: %"PRId64" / i_pts: %"PRId64, p_block->i_dts, p_block->i_pts);
632 #endif
633         if( strcmp( tk->psz_codec, "S_VOBSUB" ) )
634         {
635             p_block->i_length = i_duration * 1000;
636         }
637
638         /* FIXME remove when VLC_TS_INVALID work is done */
639         if( i == 0 || p_block->i_dts > VLC_TS_INVALID )
640             p_block->i_dts += VLC_TS_0;
641         if( !tk->b_dts_only && ( i == 0 || p_block->i_pts > VLC_TS_INVALID ) )
642             p_block->i_pts += VLC_TS_0;
643
644         es_out_Send( p_demux->out, tk->p_es, p_block );
645
646         /* use time stamp only for first block */
647         i_pts = ( tk->i_default_duration )?
648                  i_pts + ( mtime_t )( tk->i_default_duration / 1000 ):
649                  VLC_TS_INVALID;
650     }
651 }
652
653 /*****************************************************************************
654  * Demux: reads and demuxes data packets
655  *****************************************************************************
656  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
657  *****************************************************************************/
658 static int Demux( demux_t *p_demux)
659 {
660     demux_sys_t        *p_sys = p_demux->p_sys;
661
662     vlc_mutex_lock( &p_sys->lock_demuxer );
663
664     virtual_segment_c  *p_vsegment = p_sys->p_current_segment;
665     matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
666     if ( p_segment == NULL ) return 0;
667     int                i_block_count = 0;
668     int                i_return = 0;
669
670     for( ;; )
671     {
672         if ( p_sys->demuxer.b_die )
673             break;
674
675         if( p_sys->i_pts >= p_sys->i_start_pts  )
676             if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
677             {
678                 i_return = 1;
679                 break;
680             }
681
682         if ( p_vsegment->CurrentEdition() &&
683              p_vsegment->CurrentEdition()->b_ordered &&
684              p_vsegment->CurrentChapter() == NULL )
685             /* nothing left to read in this ordered edition */
686             break;
687
688         KaxBlock *block;
689         KaxSimpleBlock *simpleblock;
690         int64_t i_block_duration = 0;
691         bool b_key_picture;
692         bool b_discardable_picture;
693         if( p_segment->BlockGet( block, simpleblock, &b_key_picture, &b_discardable_picture, &i_block_duration ) )
694         {
695             if ( p_vsegment->CurrentEdition() && p_vsegment->CurrentEdition()->b_ordered )
696             {
697                 const virtual_chapter_c *p_chap = p_vsegment->CurrentChapter();
698                 // check if there are more chapters to read
699                 if ( p_chap != NULL )
700                 {
701                     /* TODO handle successive chapters with the same user_start_time/user_end_time
702                     */
703                     p_sys->i_pts = p_chap->i_virtual_stop_time;
704                     p_sys->i_pts++; // trick to avoid staying on segments with no duration and no content
705
706                     i_return = 1;
707                 }
708
709                 break;
710             }
711             else
712             {
713                 msg_Warn( p_demux, "cannot get block EOF?" );
714                 break;
715             }
716         }
717
718         if( simpleblock != NULL )
719             p_sys->i_pts = p_sys->i_chapter_time + ( simpleblock->GlobalTimecode() / (mtime_t) 1000 );
720         else
721             p_sys->i_pts = p_sys->i_chapter_time + ( block->GlobalTimecode() / (mtime_t) 1000 );
722
723         mtime_t i_pcr = VLC_TS_INVALID;
724         for( size_t i = 0; i < p_segment->tracks.size(); i++)
725             if( p_segment->tracks[i]->i_last_dts > VLC_TS_INVALID &&
726                 ( p_segment->tracks[i]->i_last_dts < i_pcr || i_pcr == VLC_TS_INVALID ))
727                 i_pcr = p_segment->tracks[i]->i_last_dts;
728
729         if( i_pcr > p_sys->i_pcr + 300000 )
730         {
731             es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
732             p_sys->i_pcr = i_pcr;
733         }
734
735         if( p_sys->i_pts >= p_sys->i_start_pts  )
736         {
737             if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
738             {
739                 i_return = 1;
740                 delete block;
741                 break;
742             }
743         }
744
745         if ( p_vsegment->CurrentEdition() &&
746              p_vsegment->CurrentEdition()->b_ordered &&
747              p_vsegment->CurrentChapter() == NULL )
748         {
749             /* nothing left to read in this ordered edition */
750             delete block;
751             break;
752         }
753
754         BlockDecode( p_demux, block, simpleblock, p_sys->i_pts, i_block_duration, b_key_picture || b_discardable_picture );
755
756         delete block;
757         i_block_count++;
758
759         // TODO optimize when there is need to leave or when seeking has been called
760         if( i_block_count > 5 )
761         {
762             i_return = 1;
763             break;
764         }
765     }
766
767     vlc_mutex_unlock( &p_sys->lock_demuxer );
768
769     return i_return;
770 }
771