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