git.sesse.net Git - vlc/blob - 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
  38 /*****************************************************************************
  39  * Module descriptor
  40  *****************************************************************************/
  41 static int  Open ( vlc_object_t * );
  42 static void Close( vlc_object_t * );
  43
  44 vlc_module_begin ()
  45     set_shortname( "Matroska" )
  46     set_description( N_("Matroska stream demuxer" ) )
  47     set_capability( "demux", 50 )
  48     set_callbacks( Open, Close )
  49     set_category( CAT_INPUT )
  50     set_subcategory( SUBCAT_INPUT_DEMUX )
  51
  52     add_bool( "mkv-use-ordered-chapters", true,
  53             N_("Ordered chapters"),
  54             N_("Play ordered chapters as specified in the segment."), true );
  55
  56     add_bool( "mkv-use-chapter-codec", true,
  57             N_("Chapter codecs"),
  58             N_("Use chapter codecs found in the segment."), true );
  59
  60     add_bool( "mkv-preload-local-dir", false,
  61             N_("Preload Directory"),
  62             N_("Preload matroska files from the same family in the same directory (not good for broken files)."), true );
  63
  64     add_bool( "mkv-seek-percent", false,
  65             N_("Seek based on percent not time"),
  66             N_("Seek based on percent not time."), true );
  67
  68     add_bool( "mkv-use-dummy", false,
  69             N_("Dummy Elements"),
  70             N_("Read and discard unknown EBML elements (not good for broken files)."), true );
  71
  72     add_shortcut( "mka", "mkv" )
  73 vlc_module_end ()
  74
  75 class demux_sys_t;
  76
  77 static int  Demux  ( demux_t * );
  78 static int  Control( demux_t *, int, va_list );
  79 static void Seek   ( demux_t *, mtime_t i_date, double f_percent, chapter_item_c *p_chapter );
  80
  81 /*****************************************************************************
  82  * Open: initializes matroska demux structures
  83  *****************************************************************************/
  84 static int Open( vlc_object_t * p_this )
  85 {
  86     demux_t            *p_demux = (demux_t*)p_this;
  87     demux_sys_t        *p_sys;
  88     matroska_stream_c  *p_stream;
  89     matroska_segment_c *p_segment;
  90     const uint8_t      *p_peek;
  91     std::string         s_path, s_filename;
  92     vlc_stream_io_callback *p_io_callback;
  93     EbmlStream         *p_io_stream;
  94
  95     /* peek the begining */
  96     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
  97
  98     /* is a valid file */
  99     if( p_peek[0] != 0x1a || p_peek[1] != 0x45 ||
 100         p_peek[2] != 0xdf || p_peek[3] != 0xa3 ) return VLC_EGENERIC;
 101
 102     /* Set the demux function */
 103     p_demux->pf_demux   = Demux;
 104     p_demux->pf_control = Control;
 105     p_demux->p_sys      = p_sys = new demux_sys_t( *p_demux );
 106
 107     p_io_callback = new vlc_stream_io_callback( p_demux->s, false );
 108     p_io_stream = new EbmlStream( *p_io_callback );
 109
 110     if( p_io_stream == NULL )
 111     {
 112         msg_Err( p_demux, "failed to create EbmlStream" );
 113         delete p_io_callback;
 114         delete p_sys;
 115         return VLC_EGENERIC;
 116     }
 117
 118     p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_io_stream, true );
 119     if( p_stream == NULL )
 120     {
 121         msg_Err( p_demux, "cannot find KaxSegment" );
 122         goto error;
 123     }
 124     p_sys->streams.push_back( p_stream );
 125
 126     p_stream->p_io_callback = p_io_callback;
 127     p_stream->p_estream = p_io_stream;
 128
 129     for (size_t i=0; i<p_stream->segments.size(); i++)
 130     {
 131         p_stream->segments[i]->Preload();
 132     }
 133
 134     p_segment = p_stream->segments[0];
 135     if( p_segment->cluster == NULL )
 136     {
 137         msg_Err( p_demux, "cannot find any cluster, damaged file ?" );
 138         goto error;
 139     }
 140
 141     if (var_InheritBool( p_demux, "mkv-preload-local-dir" ))
 142     {
 143         /* get the files from the same dir from the same family (based on p_demux->psz_path) */
 144         if (p_demux->psz_file && !strcmp(p_demux->psz_access, ""))
 145         {
 146             // assume it's a regular file
 147             // get the directory path
 148             s_path = p_demux->psz_file;
 149             if (s_path.at(s_path.length() - 1) == DIR_SEP_CHAR)
 150             {
 151                 s_path = s_path.substr(0,s_path.length()-1);
 152             }
 153             else
 154             {
 155                 if (s_path.find_last_of(DIR_SEP_CHAR) > 0)
 156                 {
 157                     s_path = s_path.substr(0,s_path.find_last_of(DIR_SEP_CHAR));
 158                 }
 159             }
 160
 161             DIR *p_src_dir = vlc_opendir(s_path.c_str());
 162
 163             if (p_src_dir != NULL)
 164             {
 165                 char *psz_file;
 166                 while ((psz_file = vlc_readdir(p_src_dir)) != NULL)
 167                 {
 168                     if (strlen(psz_file) > 4)
 169                     {
 170                         s_filename = s_path + DIR_SEP_CHAR + psz_file;
 171
 172 #ifdef WIN32
 173                         if (!strcasecmp(s_filename.c_str(), p_demux->psz_file))
 174 #else
 175                         if (!s_filename.compare(p_demux->psz_file))
 176 #endif
 177                         {
 178                             free (psz_file);
 179                             continue; // don't reuse the original opened file
 180                         }
 181
 182 #if defined(__GNUC__) && (__GNUC__ < 3)
 183                         if (!s_filename.compare("mkv", s_filename.length() - 3, 3) ||
 184                             !s_filename.compare("mka", s_filename.length() - 3, 3))
 185 #else
 186                         if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
 187                             !s_filename.compare(s_filename.length() - 3, 3, "mka"))
 188 #endif
 189                         {
 190                             // test wether this file belongs to our family
 191                             const uint8_t *p_peek;
 192                             bool          file_ok = false;
 193                             stream_t      *p_file_stream = stream_UrlNew(
 194                                                             p_demux,
 195                                                             s_filename.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                     free (psz_file);
 232                 }
 233                 closedir( p_src_dir );
 234             }
 235         }
 236
 237         p_sys->PreloadFamily( *p_segment );
 238     }
 239
 240     p_sys->PreloadLinked( p_segment );
 241
 242     if ( !p_sys->PreparePlayback( NULL ) )
 243     {
 244         msg_Err( p_demux, "cannot use the segment" );
 245         goto error;
 246     }
 247
 248     p_sys->InitUi();
 249
 250     return VLC_SUCCESS;
 251
 252 error:
 253     delete p_sys;
 254     return VLC_EGENERIC;
 255 }
 256
 257 /*****************************************************************************
 258  * Close: frees unused data
 259  *****************************************************************************/
 260 static void Close( vlc_object_t *p_this )
 261 {
 262     demux_t     *p_demux = (demux_t*)p_this;
 263     demux_sys_t *p_sys   = p_demux->p_sys;
 264
 265     delete p_sys;
 266 }
 267
 268 /*****************************************************************************
 269  * Control:
 270  *****************************************************************************/
 271 static int Control( demux_t *p_demux, int i_query, va_list args )
 272 {
 273     demux_sys_t        *p_sys = p_demux->p_sys;
 274     int64_t     *pi64;
 275     double      *pf, f;
 276     int         i_skp;
 277     size_t      i_idx;
 278
 279     vlc_meta_t *p_meta;
 280     input_attachment_t ***ppp_attach;
 281     int *pi_int;
 282
 283     switch( i_query )
 284     {
 285         case DEMUX_GET_ATTACHMENTS:
 286             ppp_attach = (input_attachment_t***)va_arg( args, input_attachment_t*** );
 287             pi_int = (int*)va_arg( args, int * );
 288
 289             if( p_sys->stored_attachments.size() <= 0 )
 290                 return VLC_EGENERIC;
 291
 292             *pi_int = p_sys->stored_attachments.size();
 293             *ppp_attach = (input_attachment_t**)malloc( sizeof(input_attachment_t**) *
 294                                                         p_sys->stored_attachments.size() );
 295             if( !(*ppp_attach) )
 296                 return VLC_ENOMEM;
 297             for( size_t i = 0; i < p_sys->stored_attachments.size(); i++ )
 298             {
 299                 attachment_c *a = p_sys->stored_attachments[i];
 300                 (*ppp_attach)[i] = vlc_input_attachment_New( a->fileName(), a->mimeType(), NULL,
 301                                                              a->p_data, a->size() );
 302             }
 303             return VLC_SUCCESS;
 304
 305         case DEMUX_GET_META:
 306             p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
 307             vlc_meta_Merge( p_meta, p_sys->meta );
 308             return VLC_SUCCESS;
 309
 310         case DEMUX_GET_LENGTH:
 311             pi64 = (int64_t*)va_arg( args, int64_t * );
 312             if( p_sys->f_duration > 0.0 )
 313             {
 314                 *pi64 = (int64_t)(p_sys->f_duration * 1000);
 315                 return VLC_SUCCESS;
 316             }
 317             return VLC_EGENERIC;
 318
 319         case DEMUX_GET_POSITION:
 320             pf = (double*)va_arg( args, double * );
 321             if ( p_sys->f_duration > 0.0 )
 322                 *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);
 323             return VLC_SUCCESS;
 324
 325         case DEMUX_SET_POSITION:
 326             f = (double)va_arg( args, double );
 327             Seek( p_demux, -1, f, NULL );
 328             return VLC_SUCCESS;
 329
 330         case DEMUX_GET_TIME:
 331             pi64 = (int64_t*)va_arg( args, int64_t * );
 332             *pi64 = p_sys->i_pts;
 333             return VLC_SUCCESS;
 334
 335         case DEMUX_GET_TITLE_INFO:
 336             if( p_sys->titles.size() > 1 || ( p_sys->titles.size() == 1 && p_sys->titles[0]->i_seekpoint > 0 ) )
 337             {
 338                 input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
 339                 int *pi_int    = (int*)va_arg( args, int* );
 340
 341                 *pi_int = p_sys->titles.size();
 342                 *ppp_title = (input_title_t**)malloc( sizeof( input_title_t**) * p_sys->titles.size() );
 343
 344                 for( size_t i = 0; i < p_sys->titles.size(); i++ )
 345                 {
 346                     (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] );
 347                 }
 348                 return VLC_SUCCESS;
 349             }
 350             return VLC_EGENERIC;
 351
 352         case DEMUX_SET_TITLE:
 353             /* TODO handle editions as titles */
 354             i_idx = (int)va_arg( args, int );
 355             if( i_idx < p_sys->used_segments.size() )
 356             {
 357                 p_sys->JumpTo( *p_sys->used_segments[i_idx], NULL );
 358                 return VLC_SUCCESS;
 359             }
 360             return VLC_EGENERIC;
 361
 362         case DEMUX_SET_SEEKPOINT:
 363             i_skp = (int)va_arg( args, int );
 364
 365             // TODO change the way it works with the << & >> buttons on the UI (+1/-1 instead of a number)
 366             if( p_sys->titles.size() && i_skp < p_sys->titles[p_sys->i_current_title]->i_seekpoint)
 367             {
 368                 Seek( p_demux, (int64_t)p_sys->titles[p_sys->i_current_title]->seekpoint[i_skp]->i_time_offset, -1, NULL);
 369                 p_demux->info.i_seekpoint |= INPUT_UPDATE_SEEKPOINT;
 370                 p_demux->info.i_seekpoint = i_skp;
 371                 return VLC_SUCCESS;
 372             }
 373             return VLC_EGENERIC;
 374
 375         case DEMUX_GET_FPS:
 376             pf = (double *)va_arg( args, double * );
 377             *pf = 0.0;
 378             if( p_sys->p_current_segment && p_sys->p_current_segment->CurrentSegment() )
 379             {
 380                 const matroska_segment_c *p_segment = p_sys->p_current_segment->CurrentSegment();
 381                 for( size_t i = 0; i < p_segment->tracks.size(); i++ )
 382                 {
 383                     mkv_track_t *tk = p_segment->tracks[i];
 384                     if( tk->fmt.i_cat == VIDEO_ES && tk->fmt.video.i_frame_rate_base > 0 )
 385                     {
 386                         *pf = (double)tk->fmt.video.i_frame_rate / tk->fmt.video.i_frame_rate_base;
 387                         break;
 388                     }
 389                 }
 390             }
 391             return VLC_SUCCESS;
 392
 393         case DEMUX_SET_TIME:
 394         default:
 395             return VLC_EGENERIC;
 396     }
 397 }
 398
 399 /* Seek */
 400 static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_item_c *p_chapter )
 401 {
 402     demux_sys_t        *p_sys = p_demux->p_sys;
 403     virtual_segment_c  *p_vsegment = p_sys->p_current_segment;
 404     matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
 405     mtime_t            i_time_offset = 0;
 406     int64_t            i_global_position = -1;
 407
 408     int         i_index;
 409
 410     msg_Dbg( p_demux, "seek request to %"PRId64" (%f%%)", i_date, f_percent );
 411     if( i_date < 0 && f_percent < 0 )
 412     {
 413         msg_Warn( p_demux, "cannot seek nowhere !" );
 414         return;
 415     }
 416     if( f_percent > 1.0 )
 417     {
 418         msg_Warn( p_demux, "cannot seek so far !" );
 419         return;
 420     }
 421
 422     /* seek without index or without date */
 423     if( f_percent >= 0 && (var_InheritBool( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 ))
 424     {
 425         if( p_sys->f_duration >= 0 && p_segment->b_cues )
 426         {
 427             i_date = int64_t( f_percent * p_sys->f_duration * 1000.0 );
 428         }
 429         else
 430         {
 431             int64_t i_pos = int64_t( f_percent * stream_Size( p_demux->s ) );
 432
 433             msg_Dbg( p_demux, "inaccurate way of seeking for pos:%"PRId64, i_pos );
 434             for( i_index = 0; i_index < p_segment->i_index; i_index++ )
 435             {
 436                 if( p_segment->b_cues && p_segment->p_indexes[i_index].i_position < i_pos )
 437                     break;
 438                 if( !p_segment->b_cues && p_segment->p_indexes[i_index].i_position >= i_pos && p_segment->p_indexes[i_index].i_time > 0 )
 439                     break;
 440             }
 441             if( i_index == p_segment->i_index )
 442             {
 443                 i_index--;
 444             }
 445
 446             i_date = p_segment->p_indexes[i_index].i_time;
 447
 448             if( !p_segment->b_cues && ( p_segment->p_indexes[i_index].i_position < i_pos || p_segment->p_indexes[i_index].i_position - i_pos > 2000000 ))
 449             {
 450                 msg_Dbg( p_demux, "no cues, seek request to global pos: %"PRId64, i_pos );
 451                 i_global_position = i_pos;
 452             }
 453         }
 454     }
 455
 456     p_vsegment->Seek( *p_demux, i_date, i_time_offset, p_chapter, i_global_position );
 457 }
 458
 459 /* Utility function for BlockDecode */
 460 static block_t *MemToBlock( uint8_t *p_mem, size_t i_mem, size_t offset)
 461 {
 462     block_t *p_block = block_New( p_demux, i_mem + offset );
 463     if( likely(p_block != NULL) )
 464     {
 465         memcpy( p_block->p_buffer + offset, p_mem, i_mem );
 466         //p_block->i_rate = p_input->stream.control.i_rate;
 467     }
 468     return p_block;
 469 }
 470
 471 /* Needed by matroska_segment::Seek() and Seek */
 472 void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock,
 473                          mtime_t i_pts, mtime_t i_duration, bool f_mandatory )
 474 {
 475     demux_sys_t        *p_sys = p_demux->p_sys;
 476     matroska_segment_c *p_segment = p_sys->p_current_segment->CurrentSegment();
 477
 478     if( !p_segment ) return;
 479
 480     size_t          i_track;
 481     if( p_segment->BlockFindTrackIndex( &i_track, block, simpleblock ) )
 482     {
 483         msg_Err( p_demux, "invalid track number" );
 484         return;
 485     }
 486
 487     mkv_track_t *tk = p_segment->tracks[i_track];
 488
 489     if( tk->fmt.i_cat != NAV_ES && tk->p_es == NULL )
 490     {
 491         msg_Err( p_demux, "unknown track number" );
 492         return;
 493     }
 494     if( i_pts + i_duration < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES )
 495     {
 496         return; /* discard audio packets that shouldn't be rendered */
 497     }
 498
 499     if ( tk->fmt.i_cat != NAV_ES )
 500     {
 501         bool b;
 502         es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
 503
 504         if( !b )
 505         {
 506             tk->b_inited = false;
 507             return;
 508         }
 509     }
 510
 511
 512     /* First send init data */
 513     if( !tk->b_inited && tk->i_data_init > 0 )
 514     {
 515         block_t *p_init;
 516
 517         msg_Dbg( p_demux, "sending header (%d bytes)", tk->i_data_init );
 518         p_init = MemToBlock( tk->p_data_init, tk->i_data_init, 0 );
 519         if( p_init ) es_out_Send( p_demux->out, tk->p_es, p_init );
 520     }
 521     tk->b_inited = true;
 522
 523
 524     for( unsigned int i = 0;
 525          (block != NULL && i < block->NumberFrames()) || (simpleblock != NULL && i < simpleblock->NumberFrames());
 526          i++ )
 527     {
 528         block_t *p_block;
 529         DataBuffer *data;
 530         if( simpleblock != NULL )
 531         {
 532             data = &simpleblock->GetBuffer(i);
 533             // condition when the DTS is correct (keyframe or B frame == NOT P frame)
 534             f_mandatory = simpleblock->IsDiscardable() || simpleblock->IsKeyframe();
 535         }
 536         else
 537         {
 538             data = &block->GetBuffer(i);
 539         }
 540         if( !data->Buffer() || data->Size() > SIZE_MAX )
 541             break;
 542
 543         if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER && tk->p_compression_data != NULL )
 544             p_block = MemToBlock( data->Buffer(), data->Size(), tk->p_compression_data->GetSize() );
 545         else
 546             p_block = MemToBlock( data->Buffer(), data->Size(), 0 );
 547
 548         if( p_block == NULL )
 549         {
 550             break;
 551         }
 552
 553 #if defined(HAVE_ZLIB_H)
 554         if( tk->i_compression_type == MATROSKA_COMPRESSION_ZLIB )
 555         {
 556             p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block );
 557             if( p_block == NULL )
 558                 break;
 559         }
 560         else
 561 #endif
 562         if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER )
 563         {
 564             memcpy( p_block->p_buffer, tk->p_compression_data->GetBuffer(), tk->p_compression_data->GetSize() );
 565         }
 566
 567         if ( tk->fmt.i_cat == NAV_ES )
 568         {
 569             // TODO handle the start/stop times of this packet
 570             p_sys->p_ev->SetPci( (const pci_t *)&p_block->p_buffer[1]);
 571             block_Release( p_block );
 572             return;
 573         }
 574         // correct timestamping when B frames are used
 575         if( tk->fmt.i_cat != VIDEO_ES )
 576         {
 577             p_block->i_dts = p_block->i_pts = i_pts;
 578         }
 579         else
 580         {
 581             if( tk->b_dts_only )
 582             {
 583                 p_block->i_pts = VLC_TS_INVALID;
 584                 p_block->i_dts = i_pts;
 585             }
 586             else if( tk->b_pts_only )
 587             {
 588                 p_block->i_pts = i_pts;
 589                 p_block->i_dts = i_pts;
 590             }
 591             else
 592             {
 593                 p_block->i_pts = i_pts;
 594                 if ( f_mandatory )
 595                     p_block->i_dts = p_block->i_pts;
 596                 else
 597                     p_block->i_dts = min( i_pts, tk->i_last_dts + (mtime_t)(tk->i_default_duration >> 10));
 598             }
 599         }
 600         tk->i_last_dts = p_block->i_dts;
 601
 602 #if 0
 603 msg_Dbg( p_demux, "block i_dts: %"PRId64" / i_pts: %"PRId64, p_block->i_dts, p_block->i_pts);
 604 #endif
 605         if( strcmp( tk->psz_codec, "S_VOBSUB" ) )
 606         {
 607             p_block->i_length = i_duration * 1000;
 608         }
 609
 610         /* FIXME remove when VLC_TS_INVALID work is done */
 611         if( i == 0 || p_block->i_dts > VLC_TS_INVALID )
 612             p_block->i_dts += VLC_TS_0;
 613         if( !tk->b_dts_only && ( i == 0 || p_block->i_pts > VLC_TS_INVALID ) )
 614             p_block->i_pts += VLC_TS_0;
 615
 616         es_out_Send( p_demux->out, tk->p_es, p_block );
 617
 618         /* use time stamp only for first block */
 619         i_pts = VLC_TS_INVALID;
 620     }
 621 }
 622
 623 /*****************************************************************************
 624  * Demux: reads and demuxes data packets
 625  *****************************************************************************
 626  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
 627  *****************************************************************************/
 628 static int Demux( demux_t *p_demux)
 629 {
 630     demux_sys_t        *p_sys = p_demux->p_sys;
 631
 632     vlc_mutex_lock( &p_sys->lock_demuxer );
 633
 634     virtual_segment_c  *p_vsegment = p_sys->p_current_segment;
 635     matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
 636     if ( p_segment == NULL ) return 0;
 637     int                i_block_count = 0;
 638     int                i_return = 0;
 639
 640     for( ;; )
 641     {
 642         if ( p_sys->demuxer.b_die )
 643             break;
 644
 645         if( p_sys->i_pts >= p_sys->i_start_pts  )
 646             if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
 647             {
 648                 i_return = 1;
 649                 break;
 650             }
 651
 652         if ( p_vsegment->CurrentEdition() && p_vsegment->CurrentEdition()->b_ordered && p_vsegment->CurrentChapter() == NULL )
 653         {
 654             /* nothing left to read in this ordered edition */
 655             if ( !p_vsegment->SelectNext() )
 656                 break;
 657             p_segment->UnSelect( );
 658
 659             es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 660
 661             /* switch to the next segment */
 662             p_segment = p_vsegment->CurrentSegment();
 663             if ( !p_segment->Select( 0 ) )
 664             {
 665                 msg_Err( p_demux, "Failed to select new segment" );
 666                 break;
 667             }
 668             continue;
 669         }
 670
 671         KaxBlock *block;
 672         KaxSimpleBlock *simpleblock;
 673         int64_t i_block_duration = 0;
 674         bool b_key_picture;
 675         bool b_discardable_picture;
 676         if( p_segment->BlockGet( block, simpleblock, &b_key_picture, &b_discardable_picture, &i_block_duration ) )
 677         {
 678             if ( p_vsegment->CurrentEdition() && p_vsegment->CurrentEdition()->b_ordered )
 679             {
 680                 const chapter_item_c *p_chap = p_vsegment->CurrentChapter();
 681                 // check if there are more chapters to read
 682                 if ( p_chap != NULL )
 683                 {
 684                     /* TODO handle successive chapters with the same user_start_time/user_end_time
 685                     if ( p_chap->i_user_start_time == p_chap->i_user_start_time )
 686                         p_vsegment->SelectNext();
 687                     */
 688                     p_sys->i_pts = p_chap->i_user_end_time;
 689                     p_sys->i_pts++; // trick to avoid staying on segments with no duration and no content
 690
 691                     i_return = 1;
 692                 }
 693
 694                 break;
 695             }
 696             else
 697             {
 698                 msg_Warn( p_demux, "cannot get block EOF?" );
 699                 p_segment->UnSelect( );
 700
 701                 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 702
 703                 /* switch to the next segment */
 704                 if ( !p_vsegment->SelectNext() )
 705                     // no more segments in this stream
 706                     break;
 707                 p_segment = p_vsegment->CurrentSegment();
 708                 if ( !p_segment->Select( 0 ) )
 709                 {
 710                     msg_Err( p_demux, "Failed to select new segment" );
 711                     break;
 712                 }
 713
 714                 continue;
 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         /* */
 724         es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pts );
 725
 726         if( p_sys->i_pts >= p_sys->i_start_pts  )
 727         {
 728             if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
 729             {
 730                 i_return = 1;
 731                 delete block;
 732                 break;
 733             }
 734         }
 735
 736         if ( p_vsegment->CurrentEdition() && p_vsegment->CurrentEdition()->b_ordered && p_vsegment->CurrentChapter() == NULL )
 737         {
 738             /* nothing left to read in this ordered edition */
 739             if ( !p_vsegment->SelectNext() )
 740             {
 741                 delete block;
 742                 break;
 743             }
 744             p_segment->UnSelect( );
 745
 746             es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 747
 748             /* switch to the next segment */
 749             p_segment = p_vsegment->CurrentSegment();
 750             if ( !p_segment->Select( 0 ) )
 751             {
 752                 msg_Err( p_demux, "Failed to select new segment" );
 753                 delete block;
 754                 break;
 755             }
 756             delete block;
 757             continue;
 758         }
 759
 760         BlockDecode( p_demux, block, simpleblock, p_sys->i_pts, i_block_duration, b_key_picture || b_discardable_picture );
 761
 762         delete block;
 763         i_block_count++;
 764
 765         // TODO optimize when there is need to leave or when seeking has been called
 766         if( i_block_count > 5 )
 767         {
 768             i_return = 1;
 769             break;
 770         }
 771     }
 772
 773     vlc_mutex_unlock( &p_sys->lock_demuxer );
 774
 775     return i_return;
 776 }
 777