mkv.cpp 31.3 KB
Newer Older
Steve Lhomme's avatar
Steve Lhomme committed
1 2 3
/*****************************************************************************
 * mkv.cpp : matroska demuxer
 *****************************************************************************
4
 * Copyright (C) 2003-2004 the VideoLAN team
Steve Lhomme's avatar
Steve Lhomme committed
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
 * $Id$
 *
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
 *          Steve Lhomme <steve.lhomme@free.fr>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
dionoea's avatar
dionoea committed
22
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
Steve Lhomme's avatar
Steve Lhomme committed
23 24
 *****************************************************************************/

25 26
#include "mkv.hpp"
#include "util.hpp"
Steve Lhomme's avatar
Steve Lhomme committed
27

28 29
#include "matroska_segment.hpp"
#include "demux.hpp"
Steve Lhomme's avatar
Steve Lhomme committed
30

31 32
#include "chapters.hpp"
#include "Ebml_parser.hpp"
Steve Lhomme's avatar
Steve Lhomme committed
33

34
#include "stream_io_callback.hpp"
Steve Lhomme's avatar
Steve Lhomme committed
35

Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
36 37
#include <vlc_fs.h>

38 39 40 41 42 43
/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
static int  Open ( vlc_object_t * );
static void Close( vlc_object_t * );

44 45 46
vlc_module_begin ()
    set_shortname( "Matroska" )
    set_description( N_("Matroska stream demuxer" ) )
47
    set_capability( "demux", 50 )
48 49 50
    set_callbacks( Open, Close )
    set_category( CAT_INPUT )
    set_subcategory( SUBCAT_INPUT_DEMUX )
51

ivoire's avatar
ivoire committed
52
    add_bool( "mkv-use-ordered-chapters", true, NULL,
53 54 55
            N_("Ordered chapters"),
            N_("Play ordered chapters as specified in the segment."), true );

ivoire's avatar
ivoire committed
56
    add_bool( "mkv-use-chapter-codec", true, NULL,
57 58 59
            N_("Chapter codecs"),
            N_("Use chapter codecs found in the segment."), true );

ivoire's avatar
ivoire committed
60
    add_bool( "mkv-preload-local-dir", false, NULL,
61 62 63
            N_("Preload Directory"),
            N_("Preload matroska files from the same family in the same directory (not good for broken files)."), true );

ivoire's avatar
ivoire committed
64
    add_bool( "mkv-seek-percent", false, NULL,
65 66 67
            N_("Seek based on percent not time"),
            N_("Seek based on percent not time."), true );

ivoire's avatar
ivoire committed
68
    add_bool( "mkv-use-dummy", false, NULL,
69 70 71
            N_("Dummy Elements"),
            N_("Read and discard unknown EBML elements (not good for broken files)."), true );

72 73 74
    add_shortcut( "mka" )
    add_shortcut( "mkv" )
vlc_module_end ()
75

76
class demux_sys_t;
77

78 79 80
static int  Demux  ( demux_t * );
static int  Control( demux_t *, int, va_list );
static void Seek   ( demux_t *, mtime_t i_date, double f_percent, chapter_item_c *psz_chapter );
81

82 83 84 85 86 87 88 89 90 91 92 93 94
/*****************************************************************************
 * Open: initializes matroska demux structures
 *****************************************************************************/
static int Open( vlc_object_t * p_this )
{
    demux_t            *p_demux = (demux_t*)p_this;
    demux_sys_t        *p_sys;
    matroska_stream_c  *p_stream;
    matroska_segment_c *p_segment;
    const uint8_t      *p_peek;
    std::string         s_path, s_filename;
    vlc_stream_io_callback *p_io_callback;
    EbmlStream         *p_io_stream;
95

96 97
    /* peek the begining */
    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
98

99 100 101
    /* is a valid file */
    if( p_peek[0] != 0x1a || p_peek[1] != 0x45 ||
        p_peek[2] != 0xdf || p_peek[3] != 0xa3 ) return VLC_EGENERIC;
Steve Lhomme's avatar
Steve Lhomme committed
102

103 104 105 106
    /* Set the demux function */
    p_demux->pf_demux   = Demux;
    p_demux->pf_control = Control;
    p_demux->p_sys      = p_sys = new demux_sys_t( *p_demux );
Steve Lhomme's avatar
Steve Lhomme committed
107

108 109
    p_io_callback = new vlc_stream_io_callback( p_demux->s, false );
    p_io_stream = new EbmlStream( *p_io_callback );
Steve Lhomme's avatar
Steve Lhomme committed
110

111
    if( p_io_stream == NULL )
Steve Lhomme's avatar
Steve Lhomme committed
112
    {
113 114 115 116
        msg_Err( p_demux, "failed to create EbmlStream" );
        delete p_io_callback;
        delete p_sys;
        return VLC_EGENERIC;
Steve Lhomme's avatar
Steve Lhomme committed
117 118
    }

119 120
    p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_io_stream, true );
    if( p_stream == NULL )
Steve Lhomme's avatar
Steve Lhomme committed
121
    {
122 123
        msg_Err( p_demux, "cannot find KaxSegment" );
        goto error;
Steve Lhomme's avatar
Steve Lhomme committed
124
    }
125
    p_sys->streams.push_back( p_stream );
Steve Lhomme's avatar
Steve Lhomme committed
126

127 128
    p_stream->p_in = p_io_callback;
    p_stream->p_es = p_io_stream;
Steve Lhomme's avatar
Steve Lhomme committed
129

130 131 132 133
    for (size_t i=0; i<p_stream->segments.size(); i++)
    {
        p_stream->segments[i]->Preload();
    }
Steve Lhomme's avatar
Steve Lhomme committed
134

135 136
    p_segment = p_stream->segments[0];
    if( p_segment->cluster == NULL )
Steve Lhomme's avatar
Steve Lhomme committed
137
    {
138 139
        msg_Err( p_demux, "cannot find any cluster, damaged file ?" );
        goto error;
Steve Lhomme's avatar
Steve Lhomme committed
140
    }
141

142
    if (var_InheritInteger( p_demux, "mkv-preload-local-dir" ))
143 144 145 146 147 148 149
    {
        /* get the files from the same dir from the same family (based on p_demux->psz_path) */
        if (p_demux->psz_path[0] != '\0' && !strcmp(p_demux->psz_access, ""))
        {
            // assume it's a regular file
            // get the directory path
            s_path = p_demux->psz_path;
150
            if (s_path.at(s_path.length() - 1) == DIR_SEP_CHAR)
151 152 153 154 155
            {
                s_path = s_path.substr(0,s_path.length()-1);
            }
            else
            {
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
                }
            }
Steve Lhomme's avatar
Steve Lhomme committed
161

162
            DIR *p_src_dir = vlc_opendir(s_path.c_str());
163

164 165 166
            if (p_src_dir != NULL)
            {
                char *psz_file;
167
                while ((psz_file = vlc_readdir(p_src_dir)) != NULL)
168 169 170
                {
                    if (strlen(psz_file) > 4)
                    {
171
                        s_filename = s_path + DIR_SEP_CHAR + psz_file;
Steve Lhomme's avatar
Steve Lhomme committed
172

173 174 175 176 177 178 179 180 181
#ifdef WIN32
                        if (!strcasecmp(s_filename.c_str(), p_demux->psz_path))
#else
                        if (!s_filename.compare(p_demux->psz_path))
#endif
                        {
                            free (psz_file);
                            continue; // don't reuse the original opened file
                        }
Steve Lhomme's avatar
Steve Lhomme committed
182

183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
#if defined(__GNUC__) && (__GNUC__ < 3)
                        if (!s_filename.compare("mkv", s_filename.length() - 3, 3) ||
                            !s_filename.compare("mka", s_filename.length() - 3, 3))
#else
                        if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
                            !s_filename.compare(s_filename.length() - 3, 3, "mka"))
#endif
                        {
                            // test wether this file belongs to our family
                            const uint8_t *p_peek;
                            bool          file_ok = false;
                            stream_t      *p_file_stream = stream_UrlNew(
                                                            p_demux,
                                                            s_filename.c_str());
                            /* peek the begining */
                            if( p_file_stream &&
                                stream_Peek( p_file_stream, &p_peek, 4 ) >= 4
                                && p_peek[0] == 0x1a && p_peek[1] == 0x45 &&
                                p_peek[2] == 0xdf && p_peek[3] == 0xa3 ) file_ok = true;

                            if ( file_ok )
                            {
                                vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, true );
                                EbmlStream *p_estream = new EbmlStream(*p_file_io);
Steve Lhomme's avatar
Steve Lhomme committed
207

208
                                p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_estream );
Steve Lhomme's avatar
Steve Lhomme committed
209

210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236
                                if ( p_stream == NULL )
                                {
                                    msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() );
                                    delete p_estream;
                                    delete p_file_io;
                                }
                                else
                                {
                                    p_stream->p_in = p_file_io;
                                    p_stream->p_es = p_estream;
                                    p_sys->streams.push_back( p_stream );
                                }
                            }
                            else
                            {
                                if( p_file_stream ) {
                                    stream_Delete( p_file_stream );
                                }
                                msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() );
                            }
                        }
                    }
                    free (psz_file);
                }
                closedir( p_src_dir );
            }
        }
237

238 239
        p_sys->PreloadFamily( *p_segment );
    }
Steve Lhomme's avatar
Steve Lhomme committed
240

241
    p_sys->PreloadLinked( p_segment );
Steve Lhomme's avatar
Steve Lhomme committed
242

243 244 245 246 247
    if ( !p_sys->PreparePlayback( NULL ) )
    {
        msg_Err( p_demux, "cannot use the segment" );
        goto error;
    }
Steve Lhomme's avatar
Steve Lhomme committed
248

249 250 251
    p_sys->StartUiThread();
 
    return VLC_SUCCESS;
Steve Lhomme's avatar
Steve Lhomme committed
252

253 254 255 256
error:
    delete p_sys;
    return VLC_EGENERIC;
}
Steve Lhomme's avatar
Steve Lhomme committed
257 258

/*****************************************************************************
259
 * Close: frees unused data
Steve Lhomme's avatar
Steve Lhomme committed
260
 *****************************************************************************/
261
static void Close( vlc_object_t *p_this )
Steve Lhomme's avatar
Steve Lhomme committed
262
{
263 264 265 266
    demux_t     *p_demux = (demux_t*)p_this;
    demux_sys_t *p_sys   = p_demux->p_sys;

    delete p_sys;
Steve Lhomme's avatar
Steve Lhomme committed
267 268 269
}

/*****************************************************************************
270
 * Control:
Steve Lhomme's avatar
Steve Lhomme committed
271
 *****************************************************************************/
272
static int Control( demux_t *p_demux, int i_query, va_list args )
Steve Lhomme's avatar
Steve Lhomme committed
273
{
274 275 276 277 278
    demux_sys_t        *p_sys = p_demux->p_sys;
    int64_t     *pi64;
    double      *pf, f;
    int         i_skp;
    size_t      i_idx;
Steve Lhomme's avatar
Steve Lhomme committed
279

280 281 282
    vlc_meta_t *p_meta;
    input_attachment_t ***ppp_attach;
    int *pi_int;
Steve Lhomme's avatar
Steve Lhomme committed
283

284 285 286 287 288
    switch( i_query )
    {
        case DEMUX_GET_ATTACHMENTS:
            ppp_attach = (input_attachment_t***)va_arg( args, input_attachment_t*** );
            pi_int = (int*)va_arg( args, int * );
Steve Lhomme's avatar
Steve Lhomme committed
289

290 291
            if( p_sys->stored_attachments.size() <= 0 )
                return VLC_EGENERIC;
292

293 294 295 296 297
            *pi_int = p_sys->stored_attachments.size();
            *ppp_attach = (input_attachment_t**)malloc( sizeof(input_attachment_t**) *
                                                        p_sys->stored_attachments.size() );
            if( !(*ppp_attach) )
                return VLC_ENOMEM;
Jean-Baptiste Kempf's avatar
Jean-Baptiste Kempf committed
298
            for( size_t i = 0; i < p_sys->stored_attachments.size(); i++ )
299 300 301 302 303 304
            {
                attachment_c *a = p_sys->stored_attachments[i];
                (*ppp_attach)[i] = vlc_input_attachment_New( a->psz_file_name.c_str(), a->psz_mime_type.c_str(), NULL,
                                                             a->p_data, a->i_size );
            }
            return VLC_SUCCESS;
Steve Lhomme's avatar
Steve Lhomme committed
305

306 307 308 309
        case DEMUX_GET_META:
            p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
            vlc_meta_Merge( p_meta, p_sys->meta );
            return VLC_SUCCESS;
Steve Lhomme's avatar
Steve Lhomme committed
310

311 312 313 314 315 316 317 318
        case DEMUX_GET_LENGTH:
            pi64 = (int64_t*)va_arg( args, int64_t * );
            if( p_sys->f_duration > 0.0 )
            {
                *pi64 = (int64_t)(p_sys->f_duration * 1000);
                return VLC_SUCCESS;
            }
            return VLC_EGENERIC;
Steve Lhomme's avatar
Steve Lhomme committed
319

320 321 322 323 324
        case DEMUX_GET_POSITION:
            pf = (double*)va_arg( args, double * );
            if ( p_sys->f_duration > 0.0 )
                *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);
            return VLC_SUCCESS;
Steve Lhomme's avatar
Steve Lhomme committed
325

326 327 328 329
        case DEMUX_SET_POSITION:
            f = (double)va_arg( args, double );
            Seek( p_demux, -1, f, NULL );
            return VLC_SUCCESS;
Steve Lhomme's avatar
Steve Lhomme committed
330

331 332 333 334
        case DEMUX_GET_TIME:
            pi64 = (int64_t*)va_arg( args, int64_t * );
            *pi64 = p_sys->i_pts;
            return VLC_SUCCESS;
335

336 337 338 339 340
        case DEMUX_GET_TITLE_INFO:
            if( p_sys->titles.size() > 1 || ( p_sys->titles.size() == 1 && p_sys->titles[0]->i_seekpoint > 0 ) )
            {
                input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
                int *pi_int    = (int*)va_arg( args, int* );
341

342 343
                *pi_int = p_sys->titles.size();
                *ppp_title = (input_title_t**)malloc( sizeof( input_title_t**) * p_sys->titles.size() );
Steve Lhomme's avatar
Steve Lhomme committed
344

345 346 347 348 349 350 351
                for( size_t i = 0; i < p_sys->titles.size(); i++ )
                {
                    (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] );
                }
                return VLC_SUCCESS;
            }
            return VLC_EGENERIC;
352

353 354 355 356 357 358 359 360 361
        case DEMUX_SET_TITLE:
            /* TODO handle editions as titles */
            i_idx = (int)va_arg( args, int );
            if( i_idx < p_sys->used_segments.size() )
            {
                p_sys->JumpTo( *p_sys->used_segments[i_idx], NULL );
                return VLC_SUCCESS;
            }
            return VLC_EGENERIC;
362

363 364
        case DEMUX_SET_SEEKPOINT:
            i_skp = (int)va_arg( args, int );
365

366 367 368 369 370 371 372 373 374
            // TODO change the way it works with the << & >> buttons on the UI (+1/-1 instead of a number)
            if( p_sys->titles.size() && i_skp < p_sys->titles[p_sys->i_current_title]->i_seekpoint)
            {
                Seek( p_demux, (int64_t)p_sys->titles[p_sys->i_current_title]->seekpoint[i_skp]->i_time_offset, -1, NULL);
                p_demux->info.i_seekpoint |= INPUT_UPDATE_SEEKPOINT;
                p_demux->info.i_seekpoint = i_skp;
                return VLC_SUCCESS;
            }
            return VLC_EGENERIC;
375

376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392
        case DEMUX_GET_FPS:
            pf = (double *)va_arg( args, double * );
            *pf = 0.0;
            if( p_sys->p_current_segment && p_sys->p_current_segment->Segment() )
            {
                const matroska_segment_c *p_segment = p_sys->p_current_segment->Segment();
                for( size_t i = 0; i < p_segment->tracks.size(); i++ )
                {
                    mkv_track_t *tk = p_segment->tracks[i];
                    if( tk->fmt.i_cat == VIDEO_ES && tk->fmt.video.i_frame_rate_base > 0 )
                    {
                        *pf = (double)tk->fmt.video.i_frame_rate / tk->fmt.video.i_frame_rate_base;
                        break;
                    }
                }
            }
            return VLC_SUCCESS;
393

394 395 396
        case DEMUX_SET_TIME:
        default:
            return VLC_EGENERIC;
397
    }
398
}
399

400 401 402 403 404 405 406 407
/* Seek */
static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_item_c *psz_chapter )
{
    demux_sys_t        *p_sys = p_demux->p_sys;
    virtual_segment_c  *p_vsegment = p_sys->p_current_segment;
    matroska_segment_c *p_segment = p_vsegment->Segment();
    mtime_t            i_time_offset = 0;
    int64_t            i_global_position = -1;
408

409
    int         i_index;
410

411 412
    msg_Dbg( p_demux, "seek request to %"PRId64" (%f%%)", i_date, f_percent );
    if( i_date < 0 && f_percent < 0 )
Steve Lhomme's avatar
Steve Lhomme committed
413
    {
414 415
        msg_Warn( p_demux, "cannot seek nowhere !" );
        return;
Steve Lhomme's avatar
Steve Lhomme committed
416
    }
417
    if( f_percent > 1.0 )
Steve Lhomme's avatar
Steve Lhomme committed
418
    {
419 420
        msg_Warn( p_demux, "cannot seek so far !" );
        return;
Steve Lhomme's avatar
Steve Lhomme committed
421
    }
422

423
    /* seek without index or without date */
424
    if( f_percent >= 0 && (var_InheritInteger( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 ))
425
    {
426
        if( p_sys->f_duration >= 0 && p_segment->b_cues )
427
        {
428
            i_date = int64_t( f_percent * p_sys->f_duration * 1000.0 );
429 430 431
        }
        else
        {
432
            int64_t i_pos = int64_t( f_percent * stream_Size( p_demux->s ) );
433

434 435 436 437 438 439 440 441 442 443 444 445
            msg_Dbg( p_demux, "inaccurate way of seeking for pos:%"PRId64, i_pos );
            for( i_index = 0; i_index < p_segment->i_index; i_index++ )
            {
                if( p_segment->b_cues && p_segment->p_indexes[i_index].i_position < i_pos )
                    break;
                if( !p_segment->b_cues && p_segment->p_indexes[i_index].i_position >= i_pos && p_segment->p_indexes[i_index].i_time > 0 )
                    break;
            }
            if( i_index == p_segment->i_index )
            {
                i_index--;
            }
446

447
            i_date = p_segment->p_indexes[i_index].i_time;
448

449 450 451 452 453 454 455
            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 ))
            {
                msg_Dbg( p_demux, "no cues, seek request to global pos: %"PRId64, i_pos );
                i_global_position = i_pos;
            }
        }
    }
456

457 458
    p_vsegment->Seek( *p_demux, i_date, i_time_offset, psz_chapter, i_global_position );
}
459

460
/* Utility function for BlockDecode */
461
static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, size_t i_mem, size_t offset)
462
{
463 464 465 466 467 468
    block_t *p_block;
    if( !(p_block = block_New( p_demux, i_mem + offset ) ) ) return NULL;
    memcpy( p_block->p_buffer + offset, p_mem, i_mem );
    //p_block->i_rate = p_input->stream.control.i_rate;
    return p_block;
}
469

470 471 472
/* Needed by matroska_segment::Seek() */
static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock,
                         mtime_t i_pts, mtime_t i_duration, bool f_mandatory )
473
{
474 475
    demux_sys_t        *p_sys = p_demux->p_sys;
    matroska_segment_c *p_segment = p_sys->p_current_segment->Segment();
Steve Lhomme's avatar
Steve Lhomme committed
476

477 478 479
    size_t          i_track;
    unsigned int    i;
    bool            b;
480

481
    if( p_segment->BlockFindTrackIndex( &i_track, block, simpleblock ) )
482
    {
483 484
        msg_Err( p_demux, "invalid track number" );
        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 492
        msg_Err( p_demux, "unknown track number" );
        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
    }
Steve Lhomme's avatar
Steve Lhomme committed
498

499
    if ( tk->fmt.i_cat != NAV_ES )
500
    {
501
        es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
502

503
        if( !b )
504
        {
505 506
            tk->b_inited = false;
            return;
507
        }
508 509
    }

510

511 512
    /* First send init data */
    if( !tk->b_inited && tk->i_data_init > 0 )
513
    {
514
        block_t *p_init;
515

516 517 518
        msg_Dbg( p_demux, "sending header (%d bytes)", tk->i_data_init );
        p_init = MemToBlock( p_demux, tk->p_data_init, tk->i_data_init, 0 );
        if( p_init ) es_out_Send( p_demux->out, tk->p_es, p_init );
519
    }
520
    tk->b_inited = true;
521

522

523 524 525
    for( i = 0;
         (block != NULL && i < block->NumberFrames()) || (simpleblock != NULL && i < simpleblock->NumberFrames());
         i++ )
526
    {
527 528 529
        block_t *p_block;
        DataBuffer *data;
        if( simpleblock != NULL )
530
        {
531 532 533
            data = &simpleblock->GetBuffer(i);
            // condition when the DTS is correct (keyframe or B frame == NOT P frame)
            f_mandatory = simpleblock->IsDiscardable() || simpleblock->IsKeyframe();
534
        }
535
        else
536
        {
537
            data = &block->GetBuffer(i);
538
        }
539 540
        if( !data->Buffer() || data->Size() > SIZE_MAX )
            break;
541

542 543 544 545
        if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER && tk->p_compression_data != NULL )
            p_block = MemToBlock( p_demux, data->Buffer(), data->Size(), tk->p_compression_data->GetSize() );
        else
            p_block = MemToBlock( p_demux, data->Buffer(), data->Size(), 0 );
546

547
        if( p_block == NULL )
548
        {
549
            break;
550 551
        }

552 553
#if defined(HAVE_ZLIB_H)
        if( tk->i_compression_type == MATROSKA_COMPRESSION_ZLIB )
554
        {
555
            p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block );
556 557
            if( p_block == NULL )
                break;
558 559 560 561
        }
        else
#endif
        if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER )
562
        {
563
            memcpy( p_block->p_buffer, tk->p_compression_data->GetBuffer(), tk->p_compression_data->GetSize() );
564
        }
565

566
        if ( tk->fmt.i_cat == NAV_ES )
567
        {
568 569
            // TODO handle the start/stop times of this packet
            if ( p_sys->b_ui_hooked )
570
            {
571 572 573 574 575 576
                vlc_mutex_lock( &p_sys->p_ev->lock );
                memcpy( &p_sys->pci_packet, &p_block->p_buffer[1], sizeof(pci_t) );
                p_sys->SwapButtons();
                p_sys->b_pci_packet_set = true;
                vlc_mutex_unlock( &p_sys->p_ev->lock );
                block_Release( p_block );
577
            }
578
            return;
579
        }
580 581
        // correct timestamping when B frames are used
        if( tk->fmt.i_cat != VIDEO_ES )
582
        {
583
            p_block->i_dts = p_block->i_pts = i_pts;
584
        }
585 586
        else
        {
587
            if( tk->b_dts_only )
588
            {
589
                p_block->i_pts = VLC_TS_INVALID;
590
                p_block->i_dts = i_pts;
591
            }
592
            else
593
            {
594 595 596 597 598 599
                p_block->i_pts = i_pts;
                if ( f_mandatory )
                    p_block->i_dts = p_block->i_pts;
                else
                    p_block->i_dts = min( i_pts, tk->i_last_dts + (mtime_t)(tk->i_default_duration >> 10));
                p_sys->i_pts = p_block->i_dts;
600 601
            }
        }
602
        tk->i_last_dts = p_block->i_dts;
603

604 605 606 607
#if 0
msg_Dbg( p_demux, "block i_dts: %"PRId64" / i_pts: %"PRId64, p_block->i_dts, p_block->i_pts);
#endif
        if( strcmp( tk->psz_codec, "S_VOBSUB" ) )
608
        {
609
            p_block->i_length = i_duration * 1000;
610
        }
611

612
        /* FIXME remove when VLC_TS_INVALID work is done */
613 614 615 616
        if( i == 0 || p_block->i_dts > VLC_TS_INVALID )
            p_block->i_dts += VLC_TS_0;
        if( !tk->b_dts_only && ( i == 0 || p_block->i_pts > VLC_TS_INVALID ) )
            p_block->i_pts += VLC_TS_0;
617

618
        es_out_Send( p_demux->out, tk->p_es, p_block );
619

620
        /* use time stamp only for first block */
621
        i_pts = VLC_TS_INVALID;
622 623
    }
}
624 625


626 627 628 629 630 631 632 633 634 635 636
void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_global_position )
{
    KaxBlock    *block;
    KaxSimpleBlock *simpleblock;
    int         i_track_skipping;
    int64_t     i_block_duration;
    int64_t     i_block_ref1;
    int64_t     i_block_ref2;
    size_t      i_track;
    int64_t     i_seek_position = i_start_pos;
    int64_t     i_seek_time = i_start_time;
637

638 639 640 641 642 643 644 645
    if( i_global_position >= 0 )
    {
        /* Special case for seeking in files with no cues */
        EbmlElement *el = NULL;
        es.I_O().setFilePointer( i_start_pos, seek_beginning );
        delete ep;
        ep = new EbmlParser( &es, segment, &sys.demuxer );
        cluster = NULL;
646

647 648 649
        while( ( el = ep->Get() ) != NULL )
        {
            if( MKV_IS_ID( el, KaxCluster ) )
650
            {
651 652 653 654
                cluster = (KaxCluster *)el;
                i_cluster_pos = cluster->GetElementPosition();
                if( i_index == 0 ||
                        ( i_index > 0 && p_indexes[i_index - 1].i_position < (int64_t)cluster->GetElementPosition() ) )
655
                {
656 657 658 659 660 661 662
                    IndexAppendCluster( cluster );
                }
                if( es.I_O().getFilePointer() >= i_global_position )
                {
                    ParseCluster();
                    msg_Dbg( &sys.demuxer, "we found a cluster that is in the neighbourhood" );
                    return;
663
                }
664
            }
665
        }
666 667
        msg_Err( &sys.demuxer, "This file has no cues, and we were unable to seek to the requested position by parsing." );
        return;
668 669
    }

670 671 672
    if ( i_index > 0 )
    {
        int i_idx = 0;
673

674 675 676 677 678 679 680
        for( ; i_idx < i_index; i_idx++ )
        {
            if( p_indexes[i_idx].i_time + i_time_offset > i_date )
            {
                break;
            }
        }
681

682 683 684 685
        if( i_idx > 0 )
        {
            i_idx--;
        }
686

687 688 689
        i_seek_position = p_indexes[i_idx].i_position;
        i_seek_time = p_indexes[i_idx].i_time;
    }
690

691 692
    msg_Dbg( &sys.demuxer, "seek got %"PRId64" (%d%%)",
                i_seek_time, (int)( 100 * i_seek_position / stream_Size( sys.demuxer.s ) ) );
693

694
    es.I_O().setFilePointer( i_seek_position, seek_beginning );
695

696 697 698
    delete ep;
    ep = new EbmlParser( &es, segment, &sys.demuxer );
    cluster = NULL;
699

700
    sys.i_start_pts = i_date;
701

702 703 704 705 706 707 708 709 710 711
    /* now parse until key frame */
    i_track_skipping = 0;
    for( i_track = 0; i_track < tracks.size(); i_track++ )
    {
        if( tracks[i_track]->fmt.i_cat == VIDEO_ES )
        {
            tracks[i_track]->b_search_keyframe = true;
            i_track_skipping++;
        }
    }
712
    es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, i_date );
713

714 715 716 717 718
    while( i_track_skipping > 0 )
    {
        if( BlockGet( block, simpleblock, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
        {
            msg_Warn( &sys.demuxer, "cannot get block EOF?" );
719

720 721
            return;
        }
722

723 724 725 726 727 728 729 730
        for( i_track = 0; i_track < tracks.size(); i_track++ )
        {
            if( (simpleblock && tracks[i_track]->i_number == simpleblock->TrackNum()) ||
                (block && tracks[i_track]->i_number == block->TrackNum()) )
            {
                break;
            }
        }
731

732 733 734 735
        if( simpleblock )
            sys.i_pts = (sys.i_chapter_time + simpleblock->GlobalTimecode()) / (mtime_t) 1000;
        else
            sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
736

737 738
        if( i_track < tracks.size() )
        {
739
            if( sys.i_pts > sys.i_start_pts )
740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756
            {
                cluster = static_cast<KaxCluster*>(ep->UnGet( i_block_pos, i_cluster_pos ));
                i_track_skipping = 0;
            }
            else if( tracks[i_track]->fmt.i_cat == VIDEO_ES )
            {
                if( i_block_ref1 == 0 && tracks[i_track]->b_search_keyframe )
                {
                    tracks[i_track]->b_search_keyframe = false;
                    i_track_skipping--;
                }
                if( !tracks[i_track]->b_search_keyframe )
                {
                    BlockDecode( &sys.demuxer, block, simpleblock, sys.i_pts, 0, i_block_ref1 >= 0 || i_block_ref2 > 0 );
                }
            }
        }
757

758 759
        delete block;
    }
760

761 762 763 764 765
    /* FIXME current ES_OUT_SET_NEXT_DISPLAY_TIME does not work that well if
     * the delay is too high. */
    if( sys.i_pts + 500*1000 < sys.i_start_pts )
    {
        sys.i_start_pts = sys.i_pts;
766

767
        es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, sys.i_start_pts );
768
    }
769 770
}

771

772 773 774 775 776 777
/*****************************************************************************
 * Demux: reads and demuxes data packets
 *****************************************************************************
 * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
 *****************************************************************************/
static int Demux( demux_t *p_demux)
778
{
779
    demux_sys_t        *p_sys = p_demux->p_sys;
780

781
    vlc_mutex_lock( &p_sys->lock_demuxer );
782

783 784 785 786 787
    virtual_segment_c  *p_vsegment = p_sys->p_current_segment;
    matroska_segment_c *p_segment = p_vsegment->Segment();
    if ( p_segment == NULL ) return 0;
    int                i_block_count = 0;
    int                i_return = 0;
788

789
    for( ;; )
790
    {
791 792 793 794 795 796 797 798 799 800 801
        if ( p_sys->demuxer.b_die )
            break;

        if( p_sys->i_pts >= p_sys->i_start_pts  )
            if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
            {
                i_return = 1;
                break;
            }
 
        if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL )
802
        {
803 804 805 806 807 808 809 810 811 812 813 814 815 816 817
            /* nothing left to read in this ordered edition */
            if ( !p_vsegment->SelectNext() )
                break;
            p_segment->UnSelect( );
 
            es_out_Control( p_demux->out, ES_OUT_RESET_PCR );

            /* switch to the next segment */
            p_segment = p_vsegment->Segment();
            if ( !p_segment->Select( 0 ) )
            {
                msg_Err( p_demux, "Failed to select new segment" );
                break;
            }
            continue;
818 819
        }

820 821 822 823 824 825 826
        KaxBlock *block;
        KaxSimpleBlock *simpleblock;
        int64_t i_block_duration = 0;
        int64_t i_block_ref1;
        int64_t i_block_ref2;

        if( p_segment->BlockGet( block, simpleblock, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
827
        {
828 829 830 831 832 833 834 835 836 837 838 839
            if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered )
            {
                const chapter_item_c *p_chap = p_vsegment->CurrentChapter();
                // check if there are more chapters to read
                if ( p_chap != NULL )
                {
                    /* TODO handle successive chapters with the same user_start_time/user_end_time
                    if ( p_chap->i_user_start_time == p_chap->i_user_start_time )
                        p_vsegment->SelectNext();
                    */
                    p_sys->i_pts = p_chap->i_user_end_time;
                    p_sys->i_pts++; // trick to avoid staying on segments with no duration and no content
840

841 842
                    i_return = 1;
                }
843

844 845 846 847 848 849 850 851
                break;
            }
            else
            {
                msg_Warn( p_demux, "cannot get block EOF?" );
                p_segment->UnSelect( );
 
                es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
852

853 854 855 856 857 858 859 860 861 862
                /* switch to the next segment */
                if ( !p_vsegment->SelectNext() )
                    // no more segments in this stream
                    break;
                p_segment = p_vsegment->Segment();
                if ( !p_segment->Select( 0 ) )
                {
                    msg_Err( p_demux, "Failed to select new segment" );
                    break;
                }
863

864 865 866
                continue;
            }
        }
867

868 869 870 871
        if( simpleblock != NULL )
            p_sys->i_pts = (p_sys->i_chapter_time + simpleblock->GlobalTimecode()) / (mtime_t) 1000;
        else
            p_sys->i_pts = (p_sys->i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
872

873 874
        /* */
        es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pts );
875

876
        if( p_sys->i_pts >= p_sys->i_start_pts  )
877
        {
878
            if ( p_vsegment->UpdateCurrentToC