]> git.sesse.net Git - vlc/blob - modules/demux/mkv/mkv.cpp
Regression fix for non-SPU tracks in MKV containers.
[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                 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->FreeUnused();
251
252     p_sys->InitUi();
253
254     return VLC_SUCCESS;
255
256 error:
257     delete p_sys;
258     return VLC_EGENERIC;
259 }
260
261 /*****************************************************************************
262  * Close: frees unused data
263  *****************************************************************************/
264 static void Close( vlc_object_t *p_this )
265 {
266     demux_t     *p_demux = (demux_t*)p_this;
267     demux_sys_t *p_sys   = p_demux->p_sys;
268     virtual_segment_c *p_vsegment = p_sys->p_current_segment;
269     if( p_vsegment )
270     {
271         matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
272         if( p_segment )
273             p_segment->UnSelect();
274     }
275
276     delete p_sys;
277 }
278
279 /*****************************************************************************
280  * Control:
281  *****************************************************************************/
282 static int Control( demux_t *p_demux, int i_query, va_list args )
283 {
284     demux_sys_t        *p_sys = p_demux->p_sys;
285     int64_t     *pi64, i64;
286     double      *pf, f;
287     int         i_skp;
288     size_t      i_idx;
289
290     vlc_meta_t *p_meta;
291     input_attachment_t ***ppp_attach;
292     int *pi_int;
293
294     switch( i_query )
295     {
296         case DEMUX_GET_ATTACHMENTS:
297             ppp_attach = (input_attachment_t***)va_arg( args, input_attachment_t*** );
298             pi_int = (int*)va_arg( args, int * );
299
300             if( p_sys->stored_attachments.size() <= 0 )
301                 return VLC_EGENERIC;
302
303             *pi_int = p_sys->stored_attachments.size();
304             *ppp_attach = (input_attachment_t**)malloc( sizeof(input_attachment_t*) *
305                                                         p_sys->stored_attachments.size() );
306             if( !(*ppp_attach) )
307                 return VLC_ENOMEM;
308             for( size_t i = 0; i < p_sys->stored_attachments.size(); i++ )
309             {
310                 attachment_c *a = p_sys->stored_attachments[i];
311                 (*ppp_attach)[i] = vlc_input_attachment_New( a->fileName(), a->mimeType(), NULL,
312                                                              a->p_data, a->size() );
313             }
314             return VLC_SUCCESS;
315
316         case DEMUX_GET_META:
317             p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
318             vlc_meta_Merge( p_meta, p_sys->meta );
319             return VLC_SUCCESS;
320
321         case DEMUX_GET_LENGTH:
322             pi64 = (int64_t*)va_arg( args, int64_t * );
323             if( p_sys->f_duration > 0.0 )
324             {
325                 *pi64 = (int64_t)(p_sys->f_duration * 1000);
326                 return VLC_SUCCESS;
327             }
328             return VLC_EGENERIC;
329
330         case DEMUX_GET_POSITION:
331             pf = (double*)va_arg( args, double * );
332             if ( p_sys->f_duration > 0.0 )
333                 *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);
334             return VLC_SUCCESS;
335
336         case DEMUX_SET_POSITION:
337             if( p_sys->f_duration > 0.0 )
338             {
339                 f = (double)va_arg( args, double );
340                 Seek( p_demux, -1, f, NULL );
341                 return VLC_SUCCESS;
342             }
343             return VLC_EGENERIC;
344
345         case DEMUX_GET_TIME:
346             pi64 = (int64_t*)va_arg( args, int64_t * );
347             *pi64 = p_sys->i_pts;
348             return VLC_SUCCESS;
349
350         case DEMUX_GET_TITLE_INFO:
351             if( p_sys->titles.size() > 1 || ( p_sys->titles.size() == 1 && p_sys->titles[0]->i_seekpoint > 0 ) )
352             {
353                 input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
354                 int *pi_int    = (int*)va_arg( args, int* );
355
356                 *pi_int = p_sys->titles.size();
357                 *ppp_title = (input_title_t**)malloc( sizeof( input_title_t* ) * p_sys->titles.size() );
358
359                 for( size_t i = 0; i < p_sys->titles.size(); i++ )
360                     (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] );
361                 return VLC_SUCCESS;
362             }
363             return VLC_EGENERIC;
364
365         case DEMUX_SET_TITLE:
366             /* handle editions as titles */
367             i_idx = (int)va_arg( args, int );
368             if(i_idx <  p_sys->titles.size() && p_sys->titles[i_idx]->i_seekpoint)
369             {
370                 p_sys->p_current_segment->i_current_edition = i_idx;
371                 p_sys->i_current_title = i_idx;
372                 p_sys->p_current_segment->p_current_chapter = p_sys->p_current_segment->editions[p_sys->p_current_segment->i_current_edition]->getChapterbyTimecode(0);
373
374                 Seek( p_demux, (int64_t)p_sys->titles[i_idx]->seekpoint[0]->i_time_offset, -1, NULL);
375                 p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
376                 p_demux->info.i_seekpoint = 0;
377                 p_sys->f_duration = (float) p_sys->titles[i_idx]->i_length / 1000.f;
378                 return VLC_SUCCESS;
379             }
380             return VLC_EGENERIC;
381
382         case DEMUX_SET_SEEKPOINT:
383             i_skp = (int)va_arg( args, int );
384
385             // TODO change the way it works with the << & >> buttons on the UI (+1/-1 instead of a number)
386             if( p_sys->titles.size() && i_skp < p_sys->titles[p_sys->i_current_title]->i_seekpoint)
387             {
388                 Seek( p_demux, (int64_t)p_sys->titles[p_sys->i_current_title]->seekpoint[i_skp]->i_time_offset, -1, NULL);
389                 p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
390                 p_demux->info.i_seekpoint = i_skp;
391                 return VLC_SUCCESS;
392             }
393             return VLC_EGENERIC;
394
395         case DEMUX_GET_FPS:
396             pf = (double *)va_arg( args, double * );
397             *pf = 0.0;
398             if( p_sys->p_current_segment && p_sys->p_current_segment->CurrentSegment() )
399             {
400                 const matroska_segment_c *p_segment = p_sys->p_current_segment->CurrentSegment();
401                 for( size_t i = 0; i < p_segment->tracks.size(); i++ )
402                 {
403                     mkv_track_t *tk = p_segment->tracks[i];
404                     if( tk->fmt.i_cat == VIDEO_ES && tk->fmt.video.i_frame_rate_base > 0 )
405                     {
406                         *pf = (double)tk->fmt.video.i_frame_rate / tk->fmt.video.i_frame_rate_base;
407                         break;
408                     }
409                 }
410             }
411             return VLC_SUCCESS;
412
413         case DEMUX_SET_TIME:
414             i64 = (int64_t) va_arg( args, int64_t );
415             msg_Dbg(p_demux,"SET_TIME to %"PRId64, i64 );
416             Seek( p_demux, i64, -1, NULL );
417             return VLC_SUCCESS;
418         default:
419             return VLC_EGENERIC;
420     }
421 }
422
423 /* Seek */
424 static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, virtual_chapter_c *p_chapter )
425 {
426     demux_sys_t        *p_sys = p_demux->p_sys;
427     virtual_segment_c  *p_vsegment = p_sys->p_current_segment;
428     matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
429     mtime_t            i_time_offset = 0;
430     int64_t            i_global_position = -1;
431
432     int         i_index;
433
434     msg_Dbg( p_demux, "seek request to %"PRId64" (%f%%)", i_date, f_percent );
435     if( i_date < 0 && f_percent < 0 )
436     {
437         msg_Warn( p_demux, "cannot seek nowhere!" );
438         return;
439     }
440     if( f_percent > 1.0 )
441     {
442         msg_Warn( p_demux, "cannot seek so far!" );
443         return;
444     }
445     if( p_sys->f_duration < 0 )
446     {
447         msg_Warn( p_demux, "cannot seek without duration!");
448         return;
449     }
450
451     /* seek without index or without date */
452     if( f_percent >= 0 && (var_InheritBool( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 ))
453     {
454         i_date = int64_t( f_percent * p_sys->f_duration * 1000.0 );
455         if( !p_segment->b_cues )
456         {
457             int64_t i_pos = int64_t( f_percent * stream_Size( p_demux->s ) );
458
459             msg_Dbg( p_demux, "lengthy way of seeking for pos:%"PRId64, i_pos );
460             for( i_index = 0; i_index < p_segment->i_index; i_index++ )
461             {
462                 if( p_segment->p_indexes[i_index].i_position >= i_pos &&
463                     p_segment->p_indexes[i_index].i_time > 0 )
464                     break;
465             }
466             if( i_index == p_segment->i_index )
467                 i_index--;
468
469             if( p_segment->p_indexes[i_index].i_position < i_pos )
470             {
471                 msg_Dbg( p_demux, "no cues, seek request to global pos: %"PRId64, i_pos );
472                 i_global_position = i_pos;
473             }
474         }
475     }
476     p_vsegment->Seek( *p_demux, i_date, i_time_offset, p_chapter, i_global_position );
477 }
478
479 /* Needed by matroska_segment::Seek() and Seek */
480 void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock,
481                          mtime_t i_pts, mtime_t i_duration, bool f_mandatory )
482 {
483     demux_sys_t        *p_sys = p_demux->p_sys;
484     matroska_segment_c *p_segment = p_sys->p_current_segment->CurrentSegment();
485
486     if( !p_segment ) return;
487
488     size_t          i_track;
489     if( p_segment->BlockFindTrackIndex( &i_track, block, simpleblock ) )
490     {
491         msg_Err( p_demux, "invalid track number" );
492         return;
493     }
494
495     mkv_track_t *tk = p_segment->tracks[i_track];
496
497     if( tk->fmt.i_cat != NAV_ES && tk->p_es == NULL )
498     {
499         msg_Err( p_demux, "unknown track number" );
500         return;
501     }
502
503     i_pts -= tk->i_codec_delay;
504
505     if ( tk->fmt.i_cat != NAV_ES )
506     {
507         bool b;
508         es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
509
510         if( !b )
511         {
512             tk->b_inited = false;
513             if( tk->fmt.i_cat == VIDEO_ES || tk->fmt.i_cat == AUDIO_ES )
514                 tk->i_last_dts = i_pts;
515             return;
516         }
517     }
518
519
520     /* First send init data */
521     if( !tk->b_inited && tk->i_data_init > 0 )
522     {
523         block_t *p_init;
524
525         msg_Dbg( p_demux, "sending header (%d bytes)", tk->i_data_init );
526         p_init = MemToBlock( tk->p_data_init, tk->i_data_init, 0 );
527         if( p_init ) es_out_Send( p_demux->out, tk->p_es, p_init );
528     }
529     tk->b_inited = true;
530
531
532     size_t frame_size = 0;
533     size_t block_size = 0;
534
535     if( simpleblock != NULL )
536         block_size = simpleblock->GetSize();
537     else
538         block_size = block->GetSize();
539  
540     for( unsigned int i = 0;
541          ( block != NULL && i < block->NumberFrames()) || ( simpleblock != NULL && i < simpleblock->NumberFrames() );
542          i++ )
543     {
544         block_t *p_block;
545         DataBuffer *data;
546         if( simpleblock != NULL )
547         {
548             data = &simpleblock->GetBuffer(i);
549             // condition when the DTS is correct (keyframe or B frame == NOT P frame)
550             f_mandatory = simpleblock->IsDiscardable() || simpleblock->IsKeyframe();
551         }
552         else
553         {
554             data = &block->GetBuffer(i);
555             // condition when the DTS is correct (keyframe or B frame == NOT P frame)
556         }
557         frame_size += data->Size();
558         if( !data->Buffer() || data->Size() > SIZE_MAX || frame_size > block_size  )
559         {
560             msg_Warn( p_demux, "Cannot read frame (too long or no frame)" );
561             break;
562         }
563
564         if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER &&
565             tk->p_compression_data != NULL &&
566             tk->i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES )
567             p_block = MemToBlock( data->Buffer(), data->Size(), tk->p_compression_data->GetSize() );
568         else if( unlikely( tk->fmt.i_codec == VLC_CODEC_WAVPACK ) )
569             p_block = packetize_wavpack(tk, data->Buffer(), data->Size());
570         else
571             p_block = MemToBlock( data->Buffer(), data->Size(), 0 );
572
573         if( p_block == NULL )
574         {
575             break;
576         }
577
578 #if defined(HAVE_ZLIB_H)
579         if( tk->i_compression_type == MATROSKA_COMPRESSION_ZLIB &&
580             tk->i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES )
581         {
582             p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block );
583             if( p_block == NULL )
584                 break;
585         }
586         else
587 #endif
588         if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER &&
589             tk->i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES )
590         {
591             memcpy( p_block->p_buffer, tk->p_compression_data->GetBuffer(), tk->p_compression_data->GetSize() );
592         }
593         switch( tk->fmt.i_codec )
594         {
595         case VLC_CODEC_COOK:
596         case VLC_CODEC_ATRAC3:
597         {
598             handle_real_audio(p_demux, tk, p_block, i_pts);
599             block_Release(p_block);
600             i_pts = ( tk->i_default_duration )?
601                 i_pts + ( mtime_t )( tk->i_default_duration / 1000 ):
602                 VLC_TS_INVALID;
603             continue;
604          }
605          case VLC_CODEC_OPUS:
606             if( i_duration > 0 )
607             {
608                 mtime_t i_length = i_duration * tk-> f_timecodescale *
609                     (double) p_segment->i_timescale / 1000.0;
610                 p_block->i_nb_samples = i_length * tk->fmt.audio.i_rate
611                      / CLOCK_FREQ;
612                 break;
613             }
614             else if( i_duration < 0 )
615             {
616                 /* Opus uses p_block->i_length to handle discard padding */
617                 p_block->i_length = -1 * i_duration * tk->fmt.audio.i_rate
618                     / CLOCK_FREQ;
619             }
620             break;
621         }
622
623         
624         if( tk->fmt.i_cat != VIDEO_ES )
625         {
626             if ( tk->fmt.i_cat == NAV_ES )
627             {
628                 // TODO handle the start/stop times of this packet
629                 p_sys->p_ev->SetPci( (const pci_t *)&p_block->p_buffer[1]);
630                 block_Release( p_block );
631                 return;
632             }
633             else if( tk->fmt.i_cat == AUDIO_ES )
634             {
635                 if( tk->i_chans_to_reorder )
636                     aout_ChannelReorder( p_block->p_buffer, p_block->i_buffer,
637                                          tk->fmt.audio.i_channels,
638                                          tk->pi_chan_table, tk->fmt.i_codec );
639
640             }
641             p_block->i_dts = p_block->i_pts = i_pts;
642         }
643         else
644         {
645             // correct timestamping when B frames are used
646             if( tk->b_dts_only )
647             {
648                 p_block->i_pts = VLC_TS_INVALID;
649                 p_block->i_dts = i_pts;
650             }
651             else if( tk->b_pts_only )
652             {
653                 p_block->i_pts = i_pts;
654                 p_block->i_dts = i_pts;
655             }
656             else
657             {
658                 p_block->i_pts = i_pts;
659                 if ( f_mandatory )
660                     p_block->i_dts = p_block->i_pts;
661                 else
662                     p_block->i_dts = min( i_pts, tk->i_last_dts + ( mtime_t )( tk->i_default_duration / 1000 ) );
663             }
664         }
665         if( tk->fmt.i_cat == VIDEO_ES || tk->fmt.i_cat == AUDIO_ES )
666             tk->i_last_dts = p_block->i_dts;
667
668 #if 0
669 msg_Dbg( p_demux, "block i_dts: %"PRId64" / i_pts: %"PRId64, p_block->i_dts, p_block->i_pts);
670 #endif
671         if( !tk->b_no_duration )
672         {
673             p_block->i_length = i_duration * tk-> f_timecodescale *
674                 (double) p_segment->i_timescale / 1000.0;
675         }
676
677         /* FIXME remove when VLC_TS_INVALID work is done */
678         if( i == 0 || p_block->i_dts > VLC_TS_INVALID )
679             p_block->i_dts += VLC_TS_0;
680         if( !tk->b_dts_only && ( i == 0 || p_block->i_pts > VLC_TS_INVALID ) )
681             p_block->i_pts += VLC_TS_0;
682
683         es_out_Send( p_demux->out, tk->p_es, p_block );
684
685         /* use time stamp only for first block */
686         i_pts = ( tk->i_default_duration )?
687                  i_pts + ( mtime_t )( tk->i_default_duration / 1000 ):
688                  VLC_TS_INVALID;
689     }
690 }
691
692 /*****************************************************************************
693  * Demux: reads and demuxes data packets
694  *****************************************************************************
695  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
696  *****************************************************************************/
697 static int Demux( demux_t *p_demux)
698 {
699     demux_sys_t        *p_sys = p_demux->p_sys;
700
701     vlc_mutex_lock( &p_sys->lock_demuxer );
702
703     virtual_segment_c  *p_vsegment = p_sys->p_current_segment;
704     matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
705     if ( p_segment == NULL )
706     {
707         vlc_mutex_unlock( &p_sys->lock_demuxer );
708         return 0;
709     }
710     int                i_block_count = 0;
711     int                i_return = 0;
712
713     for( ;; )
714     {
715         if( p_sys->i_pts >= p_sys->i_start_pts  )
716             if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
717             {
718                 i_return = 1;
719                 break;
720             }
721
722         if ( p_vsegment->CurrentEdition() &&
723              p_vsegment->CurrentEdition()->b_ordered &&
724              p_vsegment->CurrentChapter() == NULL )
725             /* nothing left to read in this ordered edition */
726             break;
727
728         KaxBlock *block;
729         KaxSimpleBlock *simpleblock;
730         int64_t i_block_duration = 0;
731         bool b_key_picture;
732         bool b_discardable_picture;
733         if( p_segment->BlockGet( block, simpleblock, &b_key_picture, &b_discardable_picture, &i_block_duration ) )
734         {
735             if ( p_vsegment->CurrentEdition() && p_vsegment->CurrentEdition()->b_ordered )
736             {
737                 const virtual_chapter_c *p_chap = p_vsegment->CurrentChapter();
738                 // check if there are more chapters to read
739                 if ( p_chap != NULL )
740                 {
741                     /* TODO handle successive chapters with the same user_start_time/user_end_time
742                     */
743                     p_sys->i_pts = p_chap->i_virtual_stop_time;
744                     p_sys->i_pts++; // trick to avoid staying on segments with no duration and no content
745
746                     i_return = 1;
747                 }
748
749                 break;
750             }
751             else
752             {
753                 msg_Warn( p_demux, "cannot get block EOF?" );
754                 break;
755             }
756         }
757
758         if( simpleblock != NULL )
759             p_sys->i_pts = p_sys->i_chapter_time + ( (mtime_t)simpleblock->GlobalTimecode() / INT64_C(1000) );
760         else
761             p_sys->i_pts = p_sys->i_chapter_time + ( (mtime_t)block->GlobalTimecode() / INT64_C(1000) );
762
763         mtime_t i_pcr = VLC_TS_INVALID;
764         for( size_t i = 0; i < p_segment->tracks.size(); i++)
765             if( p_segment->tracks[i]->i_last_dts > VLC_TS_INVALID &&
766                 ( p_segment->tracks[i]->i_last_dts < i_pcr || i_pcr == VLC_TS_INVALID ))
767                 i_pcr = p_segment->tracks[i]->i_last_dts;
768
769         if( i_pcr > p_sys->i_pcr + 300000 )
770         {
771             es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
772             p_sys->i_pcr = i_pcr;
773         }
774
775         if( p_sys->i_pts >= p_sys->i_start_pts  )
776         {
777             if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
778             {
779                 i_return = 1;
780                 delete block;
781                 break;
782             }
783         }
784
785         if ( p_vsegment->CurrentEdition() &&
786              p_vsegment->CurrentEdition()->b_ordered &&
787              p_vsegment->CurrentChapter() == NULL )
788         {
789             /* nothing left to read in this ordered edition */
790             delete block;
791             break;
792         }
793
794         BlockDecode( p_demux, block, simpleblock, p_sys->i_pts, i_block_duration, b_key_picture || b_discardable_picture );
795
796         delete block;
797         i_block_count++;
798
799         // TODO optimize when there is need to leave or when seeking has been called
800         if( i_block_count > 5 )
801         {
802             i_return = 1;
803             break;
804         }
805     }
806
807     vlc_mutex_unlock( &p_sys->lock_demuxer );
808
809     return i_return;
810 }
811