X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmkv.cpp;h=6513c8e3b33c8392be898a7566fa86fc2630a7b9;hb=1f08a9d3bc441a1d496f51615b3617b8c4b5c094;hp=eea79cb4d06b410dbfbf49ed47e3b3c6c74ca012;hpb=101886447a921fcde8f2f2f03469c504217b2b60;p=vlc diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index eea79cb4d0..6513c8e3b3 100644 --- a/modules/demux/mkv.cpp +++ b/modules/demux/mkv.cpp @@ -5,6 +5,7 @@ * $Id$ * * Authors: Laurent Aimar + * Steve Lhomme * * 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 @@ -41,16 +42,23 @@ #include #include #include +#include +#include +#include + +#ifdef HAVE_DIRENT_H +# include +#endif /* libebml and matroska */ #include "ebml/EbmlHead.h" #include "ebml/EbmlSubHead.h" #include "ebml/EbmlStream.h" #include "ebml/EbmlContexts.h" -#include "ebml/EbmlVersion.h" #include "ebml/EbmlVoid.h" +#include "ebml/EbmlVersion.h" +#include "ebml/StdIOCallback.h" -#include "matroska/FileKax.h" #include "matroska/KaxAttachments.h" #include "matroska/KaxBlock.h" #include "matroska/KaxBlockData.h" @@ -71,9 +79,31 @@ #include "matroska/KaxTrackAudio.h" #include "matroska/KaxTrackVideo.h" #include "matroska/KaxTrackEntryData.h" +#include "matroska/KaxContentEncoding.h" #include "ebml/StdIOCallback.h" +extern "C" { + #include "mp4/libmp4.h" +} +#ifdef HAVE_ZLIB_H +# include +#endif + +#define MATROSKA_COMPRESSION_NONE 0 +#define MATROSKA_COMPRESSION_ZLIB 1 + +#define MKVD_TIMECODESCALE 1000000 + +/** + * What's between a directory and a filename? + */ +#if defined( WIN32 ) + #define DIRECTORY_SEPARATOR '\\' +#else + #define DIRECTORY_SEPARATOR '/' +#endif + using namespace LIBMATROSKA_NAMESPACE; using namespace std; @@ -84,11 +114,22 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); + set_shortname( _("Matroska") ); set_description( _("Matroska stream demuxer" ) ); set_capability( "demux2", 50 ); set_callbacks( Open, Close ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + + add_bool( "mkv-use-ordered-chapters", 1, NULL, + N_("Ordered chapters"), + N_("Play chapters in the specified order as specified in the file"), VLC_TRUE ); - add_bool( "mkv-seek-percent", 1, NULL, + add_bool( "mkv-use-chapter-codec", 1, NULL, + N_("Chapter codecs"), + N_("Use chapter codecs found in the file"), VLC_TRUE ); + + add_bool( "mkv-seek-percent", 0, NULL, N_("Seek based on percent not time"), N_("Seek based on percent not time"), VLC_TRUE ); @@ -99,11 +140,79 @@ vlc_module_end(); /***************************************************************************** * Local prototypes *****************************************************************************/ -static int Demux ( demux_t * ); -static int Control( demux_t *, int, va_list ); -static void Seek ( demux_t *, mtime_t i_date, int i_percent ); +#ifdef HAVE_ZLIB_H +block_t *block_zlib_decompress( vlc_object_t *p_this, block_t *p_in_block ) { + int result, dstsize, n; + unsigned char *dst; + block_t *p_block; + z_stream d_stream; + + d_stream.zalloc = (alloc_func)0; + d_stream.zfree = (free_func)0; + d_stream.opaque = (voidpf)0; + result = inflateInit(&d_stream); + if( result != Z_OK ) + { + msg_Dbg( p_this, "inflateInit() failed. Result: %d", result ); + return NULL; + } + + d_stream.next_in = (Bytef *)p_in_block->p_buffer; + d_stream.avail_in = p_in_block->i_buffer; + n = 0; + p_block = block_New( p_this, 0 ); + dst = NULL; + do + { + n++; + p_block = block_Realloc( p_block, 0, n * 1000 ); + dst = (unsigned char *)p_block->p_buffer; + d_stream.next_out = (Bytef *)&dst[(n - 1) * 1000]; + d_stream.avail_out = 1000; + result = inflate(&d_stream, Z_NO_FLUSH); + if( ( result != Z_OK ) && ( result != Z_STREAM_END ) ) + { + msg_Dbg( p_this, "Zlib decompression failed. Result: %d", result ); + return NULL; + } + } + while( ( d_stream.avail_out == 0 ) && ( d_stream.avail_in != 0 ) && + ( result != Z_STREAM_END ) ); + + dstsize = d_stream.total_out; + inflateEnd( &d_stream ); + p_block = block_Realloc( p_block, 0, dstsize ); + p_block->i_buffer = dstsize; + block_Release( p_in_block ); + + return p_block; +} +#endif +/** + * Helper function to print the mkv parse tree + */ +static void MkvTree( demux_t & demuxer, int i_level, char *psz_format, ... ) +{ + va_list args; + if( i_level > 9 ) + { + msg_Err( &demuxer, "too deep tree" ); + return; + } + va_start( args, psz_format ); + static char *psz_foo = "| | | | | | | | | |"; + char *psz_foo2 = (char*)malloc( ( i_level * 4 + 3 + strlen( psz_format ) ) * sizeof(char) ); + strncpy( psz_foo2, psz_foo, 4 * i_level ); + psz_foo2[ 4 * i_level ] = '+'; + psz_foo2[ 4 * i_level + 1 ] = ' '; + strcpy( &psz_foo2[ 4 * i_level + 2 ], psz_format ); + __msg_GenericVa( VLC_OBJECT(&demuxer), VLC_MSG_DBG, "mkv", psz_foo2, args ); + free( psz_foo2 ); + va_end( args ); +} + /***************************************************************************** * Stream managment *****************************************************************************/ @@ -134,6 +243,7 @@ class EbmlParser void Up( void ); void Down( void ); + void Reset( void ); EbmlElement *Get( void ); void Keep( void ); @@ -165,12 +275,12 @@ static vlc_fourcc_t __GetFOURCC( uint8_t *p ) *****************************************************************************/ typedef struct { - vlc_bool_t b_default; - vlc_bool_t b_enabled; - int i_number; + vlc_bool_t b_default; + vlc_bool_t b_enabled; + unsigned int i_number; - int i_extra_data; - uint8_t *p_extra_data; + int i_extra_data; + uint8_t *p_extra_data; char *psz_codec; @@ -189,12 +299,16 @@ typedef struct /* hack : it's for seek */ vlc_bool_t b_search_keyframe; + vlc_bool_t b_silent; /* informative */ char *psz_codec_name; char *psz_codec_settings; char *psz_codec_info_url; char *psz_codec_download_url; + + /* encryption/compression */ + int i_compression_type; } mkv_track_t; @@ -209,11 +323,139 @@ typedef struct vlc_bool_t b_key; } mkv_index_t; -struct demux_sys_t +class chapter_item_t +{ +public: + chapter_item_t() + :i_start_time(0) + ,i_end_time(-1) + ,i_user_start_time(-1) + ,i_user_end_time(-1) + ,i_seekpoint_num(-1) + ,b_display_seekpoint(true) + ,psz_parent(NULL) + {} + + int64_t RefreshChapters( bool b_ordered, int64_t i_prev_user_time, input_title_t & title ); + const chapter_item_t * FindTimecode( mtime_t i_timecode ) const; + + int64_t i_start_time, i_end_time; + int64_t i_user_start_time, i_user_end_time; /* the time in the stream when an edition is ordered */ + std::vector sub_chapters; + int i_seekpoint_num; + int64_t i_uid; + bool b_display_seekpoint; + std::string psz_name; + chapter_item_t *psz_parent; + + bool operator<( const chapter_item_t & item ) const + { + return ( i_user_start_time < item.i_user_start_time || (i_user_start_time == item.i_user_start_time && i_user_end_time < item.i_user_end_time) ); + } + +protected: + bool Enter(); + bool Leave(); +}; + +class chapter_edition_t +{ +public: + chapter_edition_t() + :i_uid(-1) + ,b_ordered(false) + {} + + void RefreshChapters( input_title_t & title ); + double Duration() const; + const chapter_item_t * FindTimecode( mtime_t i_timecode ) const; + + std::vector chapters; + int64_t i_uid; + bool b_ordered; +}; + +class demux_sys_t; + +class matroska_segment_t { - vlc_stream_io_callback *in; - EbmlStream *es; - EbmlParser *ep; +public: + matroska_segment_t( demux_sys_t & demuxer, EbmlStream & estream ) + :segment(NULL) + ,es(estream) + ,i_timescale(MKVD_TIMECODESCALE) + ,f_duration(-1.0) + ,i_cues_position(-1) + ,i_chapters_position(-1) + ,i_tags_position(-1) + ,cluster(NULL) + ,i_start_pos(0) + ,b_cues(VLC_FALSE) + ,i_index(0) + ,i_index_max(1024) + ,psz_muxing_application(NULL) + ,psz_writing_application(NULL) + ,psz_segment_filename(NULL) + ,psz_title(NULL) + ,psz_date_utc(NULL) + ,i_current_edition(-1) + ,psz_current_chapter(NULL) + ,sys(demuxer) + ,ep(NULL) + ,b_preloaded(false) + { + index = (mkv_index_t*)malloc( sizeof( mkv_index_t ) * i_index_max ); + } + + ~matroska_segment_t() + { + for( size_t i_track = 0; i_track < tracks.size(); i_track++ ) + { +#define tk tracks[i_track] + if( tk->fmt.psz_description ) + { + free( tk->fmt.psz_description ); + } + if( tk->psz_codec ) + { + free( tk->psz_codec ); + } + if( tk->fmt.psz_language ) + { + free( tk->fmt.psz_language ); + } + delete tk; +#undef tk + } + + if( psz_writing_application ) + { + free( psz_writing_application ); + } + if( psz_muxing_application ) + { + free( psz_muxing_application ); + } + if( psz_segment_filename ) + { + free( psz_segment_filename ); + } + if( psz_title ) + { + free( psz_title ); + } + if( psz_date_utc ) + { + free( psz_date_utc ); + } + if ( index ) + free( index ); + + delete ep; + } + + KaxSegment *segment; + EbmlStream & es; /* time scale */ uint64_t i_timescale; @@ -222,19 +464,18 @@ struct demux_sys_t float f_duration; /* all tracks */ - int i_track; - mkv_track_t *track; + std::vector tracks; /* from seekhead */ int64_t i_cues_position; int64_t i_chapters_position; int64_t i_tags_position; - /* current data */ - KaxSegment *segment; KaxCluster *cluster; - - mtime_t i_pts; + int64_t i_start_pos; + KaxSegmentUID segment_uid; + KaxPrevUID prev_segment_uid; + KaxNextUID next_segment_uid; vlc_bool_t b_cues; int i_index; @@ -248,446 +489,319 @@ struct demux_sys_t char *psz_title; char *psz_date_utc; + std::vector editions; + int i_current_edition; + const chapter_item_t *psz_current_chapter; + + std::vector families; + + demux_sys_t & sys; + EbmlParser *ep; + bool b_preloaded; + + inline chapter_edition_t *Edition() + { + if ( i_current_edition >= 0 && size_t(i_current_edition) < editions.size() ) + return &editions[i_current_edition]; + return NULL; + } + + bool Preload( ); + bool PreloadFamily( const matroska_segment_t & segment ); + void ParseInfo( EbmlElement *info ); + void ParseChapters( EbmlElement *chapters ); + void ParseSeekHead( EbmlElement *seekhead ); + void ParseTracks( EbmlElement *tracks ); + void ParseChapterAtom( int i_level, EbmlMaster *ca, chapter_item_t & chapters ); + void ParseTrackEntry( EbmlMaster *m ); + void IndexAppendCluster( KaxCluster *cluster ); + void LoadCues( ); + void LoadTags( ); + void InformationCreate( ); + int BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ); + bool Select( mtime_t i_start_time ); + void UnSelect( ); + static bool CompareSegmentUIDs( const matroska_segment_t * item_a, const matroska_segment_t * item_b ); +}; + +// class holding hard-linked segment together in the playback order +class virtual_segment_t +{ +public: + virtual_segment_t( matroska_segment_t *p_segment ) + :i_current_segment(0) + { + linked_segments.push_back( p_segment ); + + AppendUID( p_segment->segment_uid ); + AppendUID( p_segment->prev_segment_uid ); + AppendUID( p_segment->next_segment_uid ); + } + + void Sort(); + size_t AddSegment( matroska_segment_t *p_segment ); + void PreloadLinked( ); + float Duration( ) const; + void LoadCues( ); + + matroska_segment_t * Segment() const + { + if ( linked_segments.size() == 0 || i_current_segment >= linked_segments.size() ) + return NULL; + return linked_segments[i_current_segment]; + } + + bool SelectNext() + { + if ( i_current_segment < linked_segments.size()-1 ) + { + i_current_segment++; + return true; + } + return false; + } + +protected: + std::vector linked_segments; + std::vector linked_uids; + size_t i_current_segment; + + void AppendUID( const EbmlBinary & UID ); +}; + +class matroska_stream_t +{ +public: + matroska_stream_t( demux_sys_t & demuxer ) + :p_in(NULL) + ,p_es(NULL) + ,sys(demuxer) + {} + + ~matroska_stream_t() + { + delete p_in; + delete p_es; + } + + IOCallback *p_in; + EbmlStream *p_es; + + std::vector segments; + + demux_sys_t & sys; + + void PreloadFamily( const matroska_segment_t & segment ); +}; + +class demux_sys_t +{ +public: + demux_sys_t( demux_t & demux ) + :demuxer(demux) + ,i_pts(0) + ,i_start_pts(0) + ,i_chapter_time(0) + ,meta(NULL) + ,title(NULL) + ,p_current_segment(NULL) + ,f_duration(-1.0) + {} + + ~demux_sys_t() + { + for (size_t i=0; i streams; + std::vector opened_segments; + virtual_segment_t *p_current_segment; + + /* duration of the stream */ + float f_duration; + + matroska_segment_t *FindSegment( const EbmlBinary & uid ) const; + void PreloadFamily( ); + void PreloadLinked( matroska_segment_t *p_segment ); + void PreparePlayback( ); + matroska_stream_t *AnalyseAllSegmentsFound( EbmlStream *p_estream ); }; -#define MKVD_TIMECODESCALE 1000000 +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, const chapter_item_t *psz_chapter ); #define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId ) -static void IndexAppendCluster ( demux_t *p_demux, KaxCluster *cluster ); static char *UTF8ToStr ( const UTFstring &u ); -static void LoadCues ( demux_t * ); -static void InformationCreate ( demux_t * ); - -static void ParseInfo( demux_t *, EbmlElement *info ); -static void ParseTracks( demux_t *, EbmlElement *tracks ); -static void ParseSeekHead( demux_t *, EbmlElement *seekhead ); -static void ParseChapters( demux_t *, EbmlElement *chapters ); /***************************************************************************** * 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; - uint8_t *p_peek; - - int i_track; - - EbmlElement *el = NULL, *el1 = NULL; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; + matroska_stream_t *p_stream; + matroska_segment_t *p_segment; + uint8_t *p_peek; + std::string s_path, s_filename; + vlc_stream_io_callback *p_io_callback; + EbmlStream *p_io_stream; /* peek the begining */ - if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) - { - msg_Warn( p_demux, "cannot peek" ); - return VLC_EGENERIC; - } + if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC; /* is a valid file */ if( p_peek[0] != 0x1a || p_peek[1] != 0x45 || - p_peek[2] != 0xdf || p_peek[3] != 0xa3 ) - { - msg_Warn( p_demux, "matroska module discarded " - "(invalid header 0x%.2x%.2x%.2x%.2x)", - p_peek[0], p_peek[1], p_peek[2], p_peek[3] ); - return VLC_EGENERIC; - } + p_peek[2] != 0xdf || p_peek[3] != 0xa3 ) return VLC_EGENERIC; /* Set the demux function */ p_demux->pf_demux = Demux; p_demux->pf_control = Control; - p_demux->p_sys = p_sys = (demux_sys_t*)malloc(sizeof( demux_sys_t )); - - memset( p_sys, 0, sizeof( demux_sys_t ) ); - p_sys->in = new vlc_stream_io_callback( p_demux->s ); - p_sys->es = new EbmlStream( *p_sys->in ); - p_sys->f_duration = -1; - p_sys->i_timescale = MKVD_TIMECODESCALE; - p_sys->i_track = 0; - p_sys->track = (mkv_track_t*)malloc( sizeof( mkv_track_t ) ); - p_sys->i_pts = 0; - p_sys->i_cues_position = -1; - p_sys->i_chapters_position = -1; - p_sys->i_tags_position = -1; - - p_sys->b_cues = VLC_FALSE; - p_sys->i_index = 0; - p_sys->i_index_max = 1024; - p_sys->index = (mkv_index_t*)malloc( sizeof( mkv_index_t ) * - p_sys->i_index_max ); - - p_sys->psz_muxing_application = NULL; - p_sys->psz_writing_application = NULL; - p_sys->psz_segment_filename = NULL; - p_sys->psz_title = NULL; - p_sys->psz_date_utc = NULL;; - p_sys->meta = NULL; - p_sys->title = NULL; - - if( p_sys->es == NULL ) + p_demux->p_sys = p_sys = new demux_sys_t( *p_demux ); + + p_io_callback = new vlc_stream_io_callback( p_demux->s ); + p_io_stream = new EbmlStream( *p_io_callback ); + + if( p_io_stream == NULL ) { msg_Err( p_demux, "failed to create EbmlStream" ); - delete p_sys->in; - free( p_sys ); + delete p_io_callback; + delete p_sys; return VLC_EGENERIC; } - /* Find the EbmlHead element */ - el = p_sys->es->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFL); - if( el == NULL ) - { - msg_Err( p_demux, "cannot find EbmlHead" ); - goto error; - } - msg_Dbg( p_demux, "EbmlHead" ); - /* skip it */ - el->SkipData( *p_sys->es, el->Generic().Context ); - delete el; - /* Find a segment */ - el = p_sys->es->FindNextID( KaxSegment::ClassInfos, 0xFFFFFFFFL); - if( el == NULL ) + p_stream = p_sys->AnalyseAllSegmentsFound( p_io_stream ); + if( p_stream == NULL ) { msg_Err( p_demux, "cannot find KaxSegment" ); goto error; } - msg_Dbg( p_demux, "+ Segment" ); - p_sys->segment = (KaxSegment*)el; - p_sys->cluster = NULL; + p_sys->streams.push_back( p_stream ); - p_sys->ep = new EbmlParser( p_sys->es, el ); + p_stream->p_in = p_io_callback; + p_stream->p_es = p_io_stream; - while( ( el1 = p_sys->ep->Get() ) != NULL ) + for (size_t i=0; isegments.size(); i++) { - if( MKV_IS_ID( el1, KaxInfo ) ) - { - ParseInfo( p_demux, el1 ); - } - else if( MKV_IS_ID( el1, KaxTracks ) ) - { - ParseTracks( p_demux, el1 ); - } - else if( MKV_IS_ID( el1, KaxSeekHead ) ) - { - ParseSeekHead( p_demux, el1 ); - } - else if( MKV_IS_ID( el1, KaxCues ) ) - { - msg_Dbg( p_demux, "| + Cues" ); - } - else if( MKV_IS_ID( el1, KaxCluster ) ) - { - msg_Dbg( p_demux, "| + Cluster" ); - - p_sys->cluster = (KaxCluster*)el1; - - p_sys->ep->Down(); - /* stop parsing the stream */ - break; - } - else if( MKV_IS_ID( el1, KaxAttachments ) ) - { - msg_Dbg( p_demux, "| + Attachments FIXME TODO (but probably never supported)" ); - } - else if( MKV_IS_ID( el1, KaxChapters ) ) - { - msg_Dbg( p_demux, "| + Chapters" ); - ParseChapters( p_demux, el1 ); - } - else if( MKV_IS_ID( el1, KaxTag ) ) - { - msg_Dbg( p_demux, "| + Tags FIXME TODO" ); - } - else - { - msg_Dbg( p_demux, "| + Unknown (%s)", typeid(*el1).name() ); - } + p_stream->segments[i]->Preload(); } - if( p_sys->cluster == NULL ) + p_segment = p_stream->segments[0]; + if( p_segment->cluster == NULL ) { msg_Err( p_demux, "cannot find any cluster, damaged file ?" ); goto error; } + // reset the stream reading to the first cluster of the segment used + p_stream->p_in->setFilePointer( p_segment->cluster->GetElementPosition() ); - /* *** Load the cue if found *** */ - if( p_sys->i_cues_position >= 0 ) - { - vlc_bool_t b_seekable; - - stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable ); - if( b_seekable ) - { - LoadCues( p_demux ); - } - } - - if( !p_sys->b_cues || p_sys->i_index <= 0 ) - { - msg_Warn( p_demux, "no cues/empty cues found->seek won't be precise" ); - - IndexAppendCluster( p_demux, p_sys->cluster ); - - p_sys->b_cues = VLC_FALSE; - } - - /* add all es */ - msg_Dbg( p_demux, "found %d es", p_sys->i_track ); - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) + /* get the files from the same dir from the same family (based on p_demux->psz_path) */ + /* TODO handle multi-segment files */ + if (p_demux->psz_path[0] != '\0' && !strcmp(p_demux->psz_access, "")) { -#define tk p_sys->track[i_track] - if( tk.fmt.i_cat == UNKNOWN_ES ) + // assume it's a regular file + // get the directory path + s_path = p_demux->psz_path; + if (s_path.at(s_path.length() - 1) == DIRECTORY_SEPARATOR) { - msg_Warn( p_demux, "invalid track[%d, n=%d]", i_track, tk.i_number ); - tk.p_es = NULL; - continue; + s_path = s_path.substr(0,s_path.length()-1); } - - if( !strcmp( tk.psz_codec, "V_MS/VFW/FOURCC" ) ) + else { - if( tk.i_extra_data < (int)sizeof( BITMAPINFOHEADER ) ) + if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0) { - msg_Err( p_demux, "missing/invalid BITMAPINFOHEADER" ); - tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + s_path = s_path.substr(0,s_path.find_last_of(DIRECTORY_SEPARATOR)); } - else - { - BITMAPINFOHEADER *p_bih = (BITMAPINFOHEADER*)tk.p_extra_data; + } - tk.fmt.video.i_width = GetDWLE( &p_bih->biWidth ); - tk.fmt.video.i_height= GetDWLE( &p_bih->biHeight ); - tk.fmt.i_codec = GetFOURCC( &p_bih->biCompression ); + struct dirent *p_file_item; + DIR *p_src_dir = opendir(s_path.c_str()); - tk.fmt.i_extra = GetDWLE( &p_bih->biSize ) - sizeof( BITMAPINFOHEADER ); - if( tk.fmt.i_extra > 0 ) - { - tk.fmt.p_extra = malloc( tk.fmt.i_extra ); - memcpy( tk.fmt.p_extra, &p_bih[1], tk.fmt.i_extra ); - } - } - } - else if( !strcmp( tk.psz_codec, "V_MPEG1" ) || - !strcmp( tk.psz_codec, "V_MPEG2" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' ); - } - else if( !strncmp( tk.psz_codec, "V_MPEG4", 7 ) ) - { - if( !strcmp( tk.psz_codec, "V_MPEG4/MS/V3" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' ); - } - else - { - tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); - } - } - else if( !strcmp( tk.psz_codec, "A_MS/ACM" ) ) + if (p_src_dir != NULL) { - if( tk.i_extra_data < (int)sizeof( WAVEFORMATEX ) ) + while ((p_file_item = (dirent *) readdir(p_src_dir))) { - msg_Err( p_demux, "missing/invalid WAVEFORMATEX" ); - tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); - } - else - { - WAVEFORMATEX *p_wf = (WAVEFORMATEX*)tk.p_extra_data; + if (strlen(p_file_item->d_name) > 4) + { + s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name; - wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &tk.fmt.i_codec, NULL ); + if (!s_filename.compare(p_demux->psz_path)) + continue; // don't reuse the original opened file - tk.fmt.audio.i_channels = GetWLE( &p_wf->nChannels ); - tk.fmt.audio.i_rate = GetDWLE( &p_wf->nSamplesPerSec ); - tk.fmt.i_bitrate = GetDWLE( &p_wf->nAvgBytesPerSec ) * 8; - tk.fmt.audio.i_blockalign = GetWLE( &p_wf->nBlockAlign );; - tk.fmt.audio.i_bitspersample = GetWLE( &p_wf->wBitsPerSample ); +#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 the our family + StdIOCallback *p_file_io = new StdIOCallback(s_filename.c_str(), MODE_READ); + EbmlStream *p_estream = new EbmlStream(*p_file_io); - tk.fmt.i_extra = GetWLE( &p_wf->cbSize ); - if( tk.fmt.i_extra > 0 ) - { - tk.fmt.p_extra = malloc( tk.fmt.i_extra ); - memcpy( tk.fmt.p_extra, &p_wf[1], tk.fmt.i_extra ); + p_stream = p_sys->AnalyseAllSegmentsFound( p_estream ); + 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 ); + } + } } } + closedir( p_src_dir ); } - else if( !strcmp( tk.psz_codec, "A_MPEG/L3" ) || - !strcmp( tk.psz_codec, "A_MPEG/L2" ) || - !strcmp( tk.psz_codec, "A_MPEG/L1" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' ); - } - else if( !strcmp( tk.psz_codec, "A_AC3" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); - } - else if( !strcmp( tk.psz_codec, "A_DTS" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' ); - } - else if( !strcmp( tk.psz_codec, "A_FLAC" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'f', 'l', 'a', 'c' ); - tk.fmt.i_extra = tk.i_extra_data; - tk.fmt.p_extra = malloc( tk.i_extra_data ); - memcpy( tk.fmt.p_extra,tk.p_extra_data, tk.i_extra_data ); - } - else if( !strcmp( tk.psz_codec, "A_VORBIS" ) ) - { - int i, i_offset = 1, i_size[3], i_extra; - uint8_t *p_extra; - - tk.fmt.i_codec = VLC_FOURCC( 'v', 'o', 'r', 'b' ); + } - /* Split the 3 headers */ - if( tk.p_extra_data[0] != 0x02 ) - msg_Err( p_demux, "invalid vorbis header" ); + p_sys->PreloadFamily( ); + p_sys->PreloadLinked( p_segment ); + p_sys->PreparePlayback( ); - for( i = 0; i < 2; i++ ) - { - i_size[i] = 0; - while( i_offset < tk.i_extra_data ) - { - i_size[i] += tk.p_extra_data[i_offset]; - if( tk.p_extra_data[i_offset++] != 0xff ) break; - } - } + if( !p_segment->b_cues || p_segment->i_index <= 0 ) + { + msg_Warn( p_demux, "no cues/empty cues found->seek won't be precise" ); - i_size[0] = __MIN(i_size[0], tk.i_extra_data - i_offset); - i_size[1] = __MIN(i_size[1], tk.i_extra_data -i_offset -i_size[0]); - i_size[2] = tk.i_extra_data - i_offset - i_size[0] - i_size[1]; + p_segment->IndexAppendCluster( p_segment->cluster ); - tk.fmt.i_extra = 3 * 2 + i_size[0] + i_size[1] + i_size[2]; - tk.fmt.p_extra = malloc( tk.fmt.i_extra ); - p_extra = (uint8_t *)tk.fmt.p_extra; i_extra = 0; - for( i = 0; i < 3; i++ ) - { - *(p_extra++) = i_size[i] >> 8; - *(p_extra++) = i_size[i] & 0xFF; - memcpy( p_extra, tk.p_extra_data + i_offset + i_extra, - i_size[i] ); - p_extra += i_size[i]; - i_extra += i_size[i]; - } - } - else if( !strncmp( tk.psz_codec, "A_AAC/MPEG2/", strlen( "A_AAC/MPEG2/" ) ) || - !strncmp( tk.psz_codec, "A_AAC/MPEG4/", strlen( "A_AAC/MPEG4/" ) ) ) - { - int i_profile, i_srate; - static unsigned int i_sample_rates[] = - { - 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, - 16000, 12000, 11025, 8000, 7350, 0, 0, 0 - }; + p_segment->b_cues = VLC_FALSE; + } - tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); - /* create data for faad (MP4DecSpecificDescrTag)*/ + /* add information */ + p_segment->InformationCreate( ); - if( !strcmp( &tk.psz_codec[12], "MAIN" ) ) - { - i_profile = 0; - } - else if( !strcmp( &tk.psz_codec[12], "LC" ) ) - { - i_profile = 1; - } - else if( !strcmp( &tk.psz_codec[12], "SSR" ) ) - { - i_profile = 2; - } - else - { - i_profile = 3; - } - - for( i_srate = 0; i_srate < 13; i_srate++ ) - { - if( i_sample_rates[i_srate] == tk.fmt.audio.i_rate ) - { - break; - } - } - msg_Dbg( p_demux, "profile=%d srate=%d", i_profile, i_srate ); - - tk.fmt.i_extra = 2; - tk.fmt.p_extra = malloc( tk.fmt.i_extra ); - ((uint8_t*)tk.fmt.p_extra)[0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1); - ((uint8_t*)tk.fmt.p_extra)[1] = ((i_srate & 0x1) << 7) | (tk.fmt.audio.i_channels << 3); - } - else if( !strcmp( tk.psz_codec, "A_PCM/INT/BIG" ) || - !strcmp( tk.psz_codec, "A_PCM/INT/LIT" ) || - !strcmp( tk.psz_codec, "A_PCM/FLOAT/IEEE" ) ) - { - if( !strcmp( tk.psz_codec, "A_PCM/INT/BIG" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' ); - } - else - { - tk.fmt.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' ); - } - tk.fmt.audio.i_blockalign = ( tk.fmt.audio.i_bitspersample + 7 ) / 8 * tk.fmt.audio.i_channels; - } - else if( !strcmp( tk.psz_codec, "S_TEXT/UTF8" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); - tk.fmt.subs.psz_encoding = strdup( "UTF-8" ); - } - else if( !strcmp( tk.psz_codec, "S_TEXT/SSA" ) || - !strcmp( tk.psz_codec, "S_TEXT/ASS" ) || - !strcmp( tk.psz_codec, "S_SSA" ) || - !strcmp( tk.psz_codec, "S_ASS" )) - { - tk.fmt.i_codec = VLC_FOURCC( 's', 's', 'a', ' ' ); - tk.fmt.subs.psz_encoding = strdup( "UTF-8" ); - } - else if( !strcmp( tk.psz_codec, "S_VOBSUB" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 's','p','u',' ' ); - if( tk.i_extra_data ) - { - char *p_start; - char *p_buf = (char *)malloc( tk.i_extra_data + 1); - memcpy( p_buf, tk.p_extra_data , tk.i_extra_data ); - p_buf[tk.i_extra_data] = '\0'; - - p_start = strstr( p_buf, "size:" ); - if( sscanf( p_start, "size: %dx%d", - &tk.fmt.subs.spu.i_original_frame_width, &tk.fmt.subs.spu.i_original_frame_height ) == 2 ) - { - msg_Dbg( p_demux, "original frame size vobsubs: %dx%d", tk.fmt.subs.spu.i_original_frame_width, tk.fmt.subs.spu.i_original_frame_height ); - } - else - { - msg_Warn( p_demux, "reading original frame size for vobsub failed" ); - } - free( p_buf ); - } - } - else - { - msg_Err( p_demux, "unknow codec id=`%s'", tk.psz_codec ); - tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); - } - if( tk.b_default ) - { - tk.fmt.i_priority = 1000; - } - - tk.p_es = es_out_Add( p_demux->out, &tk.fmt ); -#undef tk + if ( !p_segment->Select( 0 ) ) + { + msg_Err( p_demux, "cannot use the segment" ); + goto error; } - - /* add information */ - InformationCreate( p_demux ); - + return VLC_SUCCESS; error: - delete p_sys->es; - delete p_sys->in; - free( p_sys ); + delete p_sys; return VLC_EGENERIC; } @@ -698,43 +812,8 @@ static void Close( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys = p_demux->p_sys; - int i_track; - - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) - { -#define tk p_sys->track[i_track] - if( tk.fmt.psz_description ) - { - free( tk.fmt.psz_description ); - } - if( tk.psz_codec ) - { - free( tk.psz_codec ); - } - if( tk.fmt.psz_language ) - { - free( tk.fmt.psz_language ); - } -#undef tk - } - free( p_sys->track ); - - if( p_sys->psz_writing_application ) - { - free( p_sys->psz_writing_application ); - } - if( p_sys->psz_muxing_application ) - { - free( p_sys->psz_muxing_application ); - } - delete p_sys->segment; - - delete p_sys->ep; - delete p_sys->es; - delete p_sys->in; - - free( p_sys ); + delete p_sys; } /***************************************************************************** @@ -742,9 +821,11 @@ static void Close( vlc_object_t *p_this ) *****************************************************************************/ static int Control( demux_t *p_demux, int i_query, va_list args ) { - demux_sys_t *p_sys = p_demux->p_sys; + demux_sys_t *p_sys = p_demux->p_sys; + matroska_segment_t *p_segment = p_sys->p_current_segment->Segment(); int64_t *pi64; double *pf, f; + int i_skp; vlc_meta_t **pp_meta; @@ -766,28 +847,19 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_GET_POSITION: pf = (double*)va_arg( args, double * ); - *pf = (double)p_sys->in->getFilePointer() / (double)stream_Size( p_demux->s ); + if ( p_sys->f_duration > 0.0 ) + *pf = (double)p_sys->i_pts / (1000.0 * p_sys->f_duration); return VLC_SUCCESS; case DEMUX_SET_POSITION: f = (double)va_arg( args, double ); - Seek( p_demux, -1, (int)(100.0 * f) ); + Seek( p_demux, -1, f, NULL ); return VLC_SUCCESS; case DEMUX_GET_TIME: pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->f_duration > 0.0 ) - { - mtime_t i_duration = (mtime_t)( p_sys->f_duration / 1000 ); - - /* FIXME */ - *pi64 = (mtime_t)1000000 * - (mtime_t)i_duration* - (mtime_t)p_sys->in->getFilePointer() / - (mtime_t)stream_Size( p_demux->s ); - return VLC_SUCCESS; - } - return VLC_EGENERIC; + *pi64 = p_sys->i_pts; + return VLC_SUCCESS; case DEMUX_GET_TITLE_INFO: if( p_sys->title && p_sys->title->i_seekpoint > 0 ) @@ -805,6 +877,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_EGENERIC; case DEMUX_SET_TITLE: + /* TODO handle editions as titles & DVD titles as well */ if( p_sys->title && p_sys->title->i_seekpoint > 0 ) { return VLC_SUCCESS; @@ -813,16 +886,17 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_SET_SEEKPOINT: /* FIXME do a better implementation */ - if( p_sys->title && p_sys->title->i_seekpoint > 0 ) - { - int i_skp = (int)va_arg( args, int ); + i_skp = (int)va_arg( args, int ); - Seek( p_demux, (int64_t)p_sys->title->seekpoint[i_skp]->i_time_offset, -1); + if( p_sys->title && i_skp < p_sys->title->i_seekpoint) + { + Seek( p_demux, (int64_t)p_sys->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; - case DEMUX_SET_TIME: case DEMUX_GET_FPS: default: @@ -830,10 +904,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } } -static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ) +int matroska_segment_t::BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ) { - demux_sys_t *p_sys = p_demux->p_sys; - *pp_block = NULL; *pi_ref1 = -1; *pi_ref2 = -1; @@ -843,19 +915,19 @@ static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, in EbmlElement *el; int i_level; - if( p_demux->b_die ) + if( sys.demuxer.b_die ) { return VLC_EGENERIC; } - el = p_sys->ep->Get(); - i_level = p_sys->ep->GetLevel(); + el = ep->Get(); + i_level = ep->GetLevel(); if( el == NULL && *pp_block != NULL ) { /* update the index */ -#define idx p_sys->index[p_sys->i_index - 1] - if( p_sys->i_index > 0 && idx.i_time == -1 ) +#define idx index[i_index - 1] + if( i_index > 0 && idx.i_time == -1 ) { idx.i_time = (*pp_block)->GlobalTimecode() / (mtime_t)1000; idx.b_key = *pi_ref1 == -1 ? VLC_TRUE : VLC_FALSE; @@ -866,12 +938,12 @@ static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, in if( el == NULL ) { - if( p_sys->ep->GetLevel() > 1 ) + if( ep->GetLevel() > 1 ) { - p_sys->ep->Up(); + ep->Up(); continue; } - msg_Warn( p_demux, "EOF" ); + msg_Warn( &sys.demuxer, "EOF" ); return VLC_EGENERIC; } @@ -880,25 +952,31 @@ static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, in { if( MKV_IS_ID( el, KaxCluster ) ) { - p_sys->cluster = (KaxCluster*)el; + cluster = (KaxCluster*)el; /* add it to the index */ - if( p_sys->i_index == 0 || - ( p_sys->i_index > 0 && p_sys->index[p_sys->i_index - 1].i_position < (int64_t)p_sys->cluster->GetElementPosition() ) ) + if( i_index == 0 || + ( i_index > 0 && index[i_index - 1].i_position < (int64_t)cluster->GetElementPosition() ) ) + { + IndexAppendCluster( cluster ); + } + + // reset silent tracks + for (size_t i=0; icluster ); + tracks[i]->b_silent = VLC_FALSE; } - p_sys->ep->Down(); + ep->Down(); } else if( MKV_IS_ID( el, KaxCues ) ) { - msg_Warn( p_demux, "find KaxCues FIXME" ); + msg_Warn( &sys.demuxer, "find KaxCues FIXME" ); return VLC_EGENERIC; } else { - msg_Dbg( p_demux, "unknown (%s)", typeid( el ).name() ); + msg_Dbg( &sys.demuxer, "unknown (%s)", typeid( el ).name() ); } } else if( i_level == 2 ) @@ -907,12 +985,16 @@ static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, in { KaxClusterTimecode &ctc = *(KaxClusterTimecode*)el; - ctc.ReadData( p_sys->es->I_O(), SCOPE_ALL_DATA ); - p_sys->cluster->InitTimecode( uint64( ctc ), p_sys->i_timescale ); + ctc.ReadData( es.I_O(), SCOPE_ALL_DATA ); + cluster->InitTimecode( uint64( ctc ), i_timescale ); + } + else if( MKV_IS_ID( el, KaxClusterSilentTracks ) ) + { + ep->Down(); } else if( MKV_IS_ID( el, KaxBlockGroup ) ) { - p_sys->ep->Down(); + ep->Down(); } } else if( i_level == 3 ) @@ -921,23 +1003,23 @@ static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, in { *pp_block = (KaxBlock*)el; - (*pp_block)->ReadData( p_sys->es->I_O() ); - (*pp_block)->SetParent( *p_sys->cluster ); + (*pp_block)->ReadData( es.I_O() ); + (*pp_block)->SetParent( *cluster ); - p_sys->ep->Keep(); + ep->Keep(); } else if( MKV_IS_ID( el, KaxBlockDuration ) ) { KaxBlockDuration &dur = *(KaxBlockDuration*)el; - dur.ReadData( p_sys->es->I_O() ); + dur.ReadData( es.I_O() ); *pi_duration = uint64( dur ); } else if( MKV_IS_ID( el, KaxReferenceBlock ) ) { KaxReferenceBlock &ref = *(KaxReferenceBlock*)el; - ref.ReadData( p_sys->es->I_O() ); + ref.ReadData( es.I_O() ); if( *pi_ref1 == -1 ) { *pi_ref1 = int64( ref ); @@ -947,10 +1029,24 @@ static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, in *pi_ref2 = int64( ref ); } } + else if( MKV_IS_ID( el, KaxClusterSilentTrackNumber ) ) + { + KaxClusterSilentTrackNumber &track_num = *(KaxClusterSilentTrackNumber*)el; + track_num.ReadData( es.I_O() ); + // find the track + for (size_t i=0; ii_number == uint32(track_num)) + { + tracks[i]->b_silent = VLC_TRUE; + break; + } + } + } } else { - msg_Err( p_demux, "invalid level = %d", i_level ); + msg_Err( &sys.demuxer, "invalid level = %d", i_level ); return VLC_EGENERIC; } } @@ -968,44 +1064,54 @@ static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, int i_mem) static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, mtime_t i_duration ) { - demux_sys_t *p_sys = p_demux->p_sys; + demux_sys_t *p_sys = p_demux->p_sys; + matroska_segment_t *p_segment = p_sys->p_current_segment->Segment(); - int i_track; + size_t i_track; unsigned int i; vlc_bool_t b; -#define tk p_sys->track[i_track] - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) +#define tk p_segment->tracks[i_track] + for( i_track = 0; i_track < p_segment->tracks.size(); i_track++ ) { - if( tk.i_number == block->TrackNum() ) + if( tk->i_number == block->TrackNum() ) { break; } } - if( i_track >= p_sys->i_track ) + if( i_track >= p_segment->tracks.size() ) { msg_Err( p_demux, "invalid track number=%d", block->TrackNum() ); return; } + if( tk->p_es == NULL ) + { + msg_Err( p_demux, "unknown track number=%d", block->TrackNum() ); + return; + } + if( i_pts < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES ) + { + return; /* discard audio packets that shouldn't be rendered */ + } - es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk.p_es, &b ); + es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b ); if( !b ) { - tk.b_inited = VLC_FALSE; + tk->b_inited = VLC_FALSE; return; } /* First send init data */ - if( !tk.b_inited && tk.i_data_init > 0 ) + if( !tk->b_inited && tk->i_data_init > 0 ) { block_t *p_init; - 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 ); - if( p_init ) es_out_Send( p_demux->out, tk.p_es, p_init ); + 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 ); + if( p_init ) es_out_Send( p_demux->out, tk->p_es, p_init ); } - tk.b_inited = VLC_TRUE; + tk->b_inited = VLC_TRUE; for( i = 0; i < block->NumberFrames(); i++ ) @@ -1014,24 +1120,36 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, DataBuffer &data = block->GetBuffer(i); p_block = MemToBlock( p_demux, data.Buffer(), data.Size() ); + if( p_block == NULL ) { break; } - if( tk.fmt.i_cat != VIDEO_ES ) +#if defined(HAVE_ZLIB_H) + if( tk->i_compression_type ) + { + p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block ); + } +#endif + + // TODO implement correct timestamping when B frames are used + if( tk->fmt.i_cat != VIDEO_ES ) + { p_block->i_dts = p_block->i_pts = i_pts; + } else { p_block->i_dts = i_pts; p_block->i_pts = 0; } - if( tk.fmt.i_cat == SPU_ES && strcmp( tk.psz_codec, "S_VOBSUB" ) ) + if( tk->fmt.i_cat == SPU_ES && strcmp( tk->psz_codec, "S_VOBSUB" ) ) { p_block->i_length = i_duration * 1000; } - es_out_Send( p_demux->out, tk.p_es, p_block ); +msg_Warn( p_demux, "Sending block %d", p_block ); + es_out_Send( p_demux->out, tk->p_es, p_block ); /* use time stamp only for first block */ i_pts = 0; @@ -1040,143 +1158,642 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, #undef tk } -static void Seek( demux_t *p_demux, mtime_t i_date, int i_percent) +matroska_stream_t *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream ) { - demux_sys_t *p_sys = p_demux->p_sys; + int i_upper_lvl = 0; + size_t i; + EbmlElement *p_l0, *p_l1, *p_l2; + bool b_keep_stream = false, b_keep_segment; + + // verify the EBML Header + p_l0 = p_estream->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFL); + if (p_l0 == NULL) + { + return NULL; + } + p_l0->SkipData(*p_estream, EbmlHead_Context); + delete p_l0; - KaxBlock *block; - int64_t i_block_duration; - int64_t i_block_ref1; - int64_t i_block_ref2; + // find all segments in this file + p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL); + if (p_l0 == NULL) + { + return NULL; + } - int i_index; - int i_track_skipping; - int i_track; + matroska_stream_t *p_stream1 = new matroska_stream_t( *this ); - msg_Dbg( p_demux, "seek request to "I64Fd" (%d%%)", i_date, i_percent ); - if( i_date < 0 && i_percent < 0 ) + while (p_l0 != 0) { - return; + if (EbmlId(*p_l0) == KaxSegment::ClassInfos.GlobalId) + { + EbmlParser *ep; + matroska_segment_t *p_segment1 = new matroska_segment_t( *this, *p_estream ); + b_keep_segment = false; + + ep = new EbmlParser(p_estream, p_l0); + p_segment1->ep = ep; + p_segment1->segment = (KaxSegment*)p_l0; + + while ((p_l1 = ep->Get())) + { + if (MKV_IS_ID(p_l1, KaxInfo)) + { + // find the families of this segment + KaxInfo *p_info = static_cast(p_l1); + + p_info->Read(*p_estream, KaxInfo::ClassInfos.Context, i_upper_lvl, p_l2, true); + for( i = 0; i < p_info->ListSize(); i++ ) + { + EbmlElement *l = (*p_info)[i]; + + if( MKV_IS_ID( l, KaxSegmentUID ) ) + { + KaxSegmentUID *p_uid = static_cast(l); + b_keep_segment = (FindSegment( *p_uid ) == NULL); + if ( !b_keep_segment ) + break; // this segment is already known + opened_segments.push_back( p_segment1 ); + p_segment1->segment_uid = *( new KaxSegmentUID(*p_uid) ); + } + else if( MKV_IS_ID( l, KaxPrevUID ) ) + { + p_segment1->prev_segment_uid = *( new KaxPrevUID( *static_cast(l) ) ); + } + else if( MKV_IS_ID( l, KaxNextUID ) ) + { + p_segment1->next_segment_uid = *( new KaxNextUID( *static_cast(l) ) ); + } + else if( MKV_IS_ID( l, KaxSegmentFamily ) ) + { + KaxSegmentFamily *p_fam = new KaxSegmentFamily( *static_cast(l) ); + std::vector::iterator iter; + p_segment1->families.push_back( *p_fam ); + } + } + break; + } + } + if ( b_keep_segment ) + { + b_keep_stream = true; + p_stream1->segments.push_back( p_segment1 ); + } + else + delete p_segment1; + } + + p_l0->SkipData(*p_estream, EbmlHead_Context); + p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL); } - if( i_percent > 100 ) i_percent = 100; - delete p_sys->ep; - p_sys->ep = new EbmlParser( p_sys->es, p_sys->segment ); - p_sys->cluster = NULL; + if ( !b_keep_stream ) + { + delete p_stream1; + p_stream1 = NULL; + } - /* seek without index or without date */ - if( config_GetInt( p_demux, "mkv-seek-percent" ) || !p_sys->b_cues || i_date < 0 ) + return p_stream1; +} + +bool matroska_segment_t::Select( mtime_t i_start_time ) +{ + size_t i_track; + + /* add all es */ + msg_Dbg( &sys.demuxer, "found %d es", tracks.size() ); + for( i_track = 0; i_track < tracks.size(); i_track++ ) { - int64_t i_pos = i_percent * stream_Size( p_demux->s ) / 100; +#define tk tracks[i_track] + if( tk->fmt.i_cat == UNKNOWN_ES ) + { + msg_Warn( &sys.demuxer, "invalid track[%d, n=%d]", i_track, tk->i_number ); + tk->p_es = NULL; + continue; + } - msg_Dbg( p_demux, "inacurate way of seeking" ); - for( i_index = 0; i_index < p_sys->i_index; i_index++ ) + if( !strcmp( tk->psz_codec, "V_MS/VFW/FOURCC" ) ) { - if( p_sys->index[i_index].i_position >= i_pos) + if( tk->i_extra_data < (int)sizeof( BITMAPINFOHEADER ) ) { - break; + msg_Err( &sys.demuxer, "missing/invalid BITMAPINFOHEADER" ); + tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + } + else + { + BITMAPINFOHEADER *p_bih = (BITMAPINFOHEADER*)tk->p_extra_data; + + tk->fmt.video.i_width = GetDWLE( &p_bih->biWidth ); + tk->fmt.video.i_height= GetDWLE( &p_bih->biHeight ); + tk->fmt.i_codec = GetFOURCC( &p_bih->biCompression ); + + tk->fmt.i_extra = GetDWLE( &p_bih->biSize ) - sizeof( BITMAPINFOHEADER ); + if( tk->fmt.i_extra > 0 ) + { + tk->fmt.p_extra = malloc( tk->fmt.i_extra ); + memcpy( tk->fmt.p_extra, &p_bih[1], tk->fmt.i_extra ); + } } } - if( i_index == p_sys->i_index ) + else if( !strcmp( tk->psz_codec, "V_MPEG1" ) || + !strcmp( tk->psz_codec, "V_MPEG2" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' ); + } + else if( !strncmp( tk->psz_codec, "V_MPEG4", 7 ) ) { - i_index--; + if( !strcmp( tk->psz_codec, "V_MPEG4/MS/V3" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' ); + } + else if( !strcmp( tk->psz_codec, "V_MPEG4/ISO/AVC" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'a', 'v', 'c', '1' ); + tk->fmt.b_packetized = VLC_FALSE; + tk->fmt.i_extra = tk->i_extra_data; + tk->fmt.p_extra = malloc( tk->i_extra_data ); + memcpy( tk->fmt.p_extra,tk->p_extra_data, tk->i_extra_data ); + } + else + { + tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); + } } + else if( !strcmp( tk->psz_codec, "V_QUICKTIME" ) ) + { + MP4_Box_t *p_box = (MP4_Box_t*)malloc( sizeof( MP4_Box_t ) ); + stream_t *p_mp4_stream = stream_MemoryNew( VLC_OBJECT(&sys.demuxer), + tk->p_extra_data, + tk->i_extra_data ); + MP4_ReadBoxCommon( p_mp4_stream, p_box ); + MP4_ReadBox_sample_vide( p_mp4_stream, p_box ); + tk->fmt.i_codec = p_box->i_type; + tk->fmt.video.i_width = p_box->data.p_sample_vide->i_width; + tk->fmt.video.i_height = p_box->data.p_sample_vide->i_height; + tk->fmt.i_extra = p_box->data.p_sample_vide->i_qt_image_description; + tk->fmt.p_extra = malloc( tk->fmt.i_extra ); + memcpy( tk->fmt.p_extra, p_box->data.p_sample_vide->p_qt_image_description, tk->fmt.i_extra ); + MP4_FreeBox_sample_vide( p_box ); + stream_MemoryDelete( p_mp4_stream, VLC_TRUE ); + } + else if( !strcmp( tk->psz_codec, "A_MS/ACM" ) ) + { + if( tk->i_extra_data < (int)sizeof( WAVEFORMATEX ) ) + { + msg_Err( &sys.demuxer, "missing/invalid WAVEFORMATEX" ); + tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + } + else + { + WAVEFORMATEX *p_wf = (WAVEFORMATEX*)tk->p_extra_data; + + wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &tk->fmt.i_codec, NULL ); - p_sys->in->setFilePointer( p_sys->index[i_index].i_position, - seek_beginning ); + tk->fmt.audio.i_channels = GetWLE( &p_wf->nChannels ); + tk->fmt.audio.i_rate = GetDWLE( &p_wf->nSamplesPerSec ); + tk->fmt.i_bitrate = GetDWLE( &p_wf->nAvgBytesPerSec ) * 8; + tk->fmt.audio.i_blockalign = GetWLE( &p_wf->nBlockAlign );; + tk->fmt.audio.i_bitspersample = GetWLE( &p_wf->wBitsPerSample ); - if( p_sys->index[i_index].i_position < i_pos ) + tk->fmt.i_extra = GetWLE( &p_wf->cbSize ); + if( tk->fmt.i_extra > 0 ) + { + tk->fmt.p_extra = malloc( tk->fmt.i_extra ); + memcpy( tk->fmt.p_extra, &p_wf[1], tk->fmt.i_extra ); + } + } + } + else if( !strcmp( tk->psz_codec, "A_MPEG/L3" ) || + !strcmp( tk->psz_codec, "A_MPEG/L2" ) || + !strcmp( tk->psz_codec, "A_MPEG/L1" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' ); + } + else if( !strcmp( tk->psz_codec, "A_AC3" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); + } + else if( !strcmp( tk->psz_codec, "A_DTS" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' ); + } + else if( !strcmp( tk->psz_codec, "A_FLAC" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'f', 'l', 'a', 'c' ); + tk->fmt.i_extra = tk->i_extra_data; + tk->fmt.p_extra = malloc( tk->i_extra_data ); + memcpy( tk->fmt.p_extra,tk->p_extra_data, tk->i_extra_data ); + } + else if( !strcmp( tk->psz_codec, "A_VORBIS" ) ) { - EbmlElement *el; + int i, i_offset = 1, i_size[3], i_extra; + uint8_t *p_extra; + + tk->fmt.i_codec = VLC_FOURCC( 'v', 'o', 'r', 'b' ); - msg_Warn( p_demux, "searching for cluster, could take some time" ); + /* Split the 3 headers */ + if( tk->p_extra_data[0] != 0x02 ) + msg_Err( &sys.demuxer, "invalid vorbis header" ); - /* search a cluster */ - while( ( el = p_sys->ep->Get() ) != NULL ) + for( i = 0; i < 2; i++ ) { - if( MKV_IS_ID( el, KaxCluster ) ) + i_size[i] = 0; + while( i_offset < tk->i_extra_data ) { - KaxCluster *cluster = (KaxCluster*)el; + i_size[i] += tk->p_extra_data[i_offset]; + if( tk->p_extra_data[i_offset++] != 0xff ) break; + } + } - /* add it to the index */ - IndexAppendCluster( p_demux, cluster ); + i_size[0] = __MIN(i_size[0], tk->i_extra_data - i_offset); + i_size[1] = __MIN(i_size[1], tk->i_extra_data -i_offset -i_size[0]); + i_size[2] = tk->i_extra_data - i_offset - i_size[0] - i_size[1]; - if( (int64_t)cluster->GetElementPosition() >= i_pos ) - { - p_sys->cluster = cluster; - p_sys->ep->Down(); - break; - } + tk->fmt.i_extra = 3 * 2 + i_size[0] + i_size[1] + i_size[2]; + tk->fmt.p_extra = malloc( tk->fmt.i_extra ); + p_extra = (uint8_t *)tk->fmt.p_extra; i_extra = 0; + for( i = 0; i < 3; i++ ) + { + *(p_extra++) = i_size[i] >> 8; + *(p_extra++) = i_size[i] & 0xFF; + memcpy( p_extra, tk->p_extra_data + i_offset + i_extra, + i_size[i] ); + p_extra += i_size[i]; + i_extra += i_size[i]; + } + } + else if( !strncmp( tk->psz_codec, "A_AAC/MPEG2/", strlen( "A_AAC/MPEG2/" ) ) || + !strncmp( tk->psz_codec, "A_AAC/MPEG4/", strlen( "A_AAC/MPEG4/" ) ) ) + { + int i_profile, i_srate; + static unsigned int i_sample_rates[] = + { + 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, + 16000, 12000, 11025, 8000, 7350, 0, 0, 0 + }; + + tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); + /* create data for faad (MP4DecSpecificDescrTag)*/ + + if( !strcmp( &tk->psz_codec[12], "MAIN" ) ) + { + i_profile = 0; + } + else if( !strcmp( &tk->psz_codec[12], "LC" ) ) + { + i_profile = 1; + } + else if( !strcmp( &tk->psz_codec[12], "SSR" ) ) + { + i_profile = 2; + } + else + { + i_profile = 3; + } + + for( i_srate = 0; i_srate < 13; i_srate++ ) + { + if( i_sample_rates[i_srate] == tk->fmt.audio.i_rate ) + { + break; } } + msg_Dbg( &sys.demuxer, "profile=%d srate=%d", i_profile, i_srate ); + + tk->fmt.i_extra = 2; + tk->fmt.p_extra = malloc( tk->fmt.i_extra ); + ((uint8_t*)tk->fmt.p_extra)[0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1); + ((uint8_t*)tk->fmt.p_extra)[1] = ((i_srate & 0x1) << 7) | (tk->fmt.audio.i_channels << 3); + } + else if( !strcmp( tk->psz_codec, "A_PCM/INT/BIG" ) || + !strcmp( tk->psz_codec, "A_PCM/INT/LIT" ) || + !strcmp( tk->psz_codec, "A_PCM/FLOAT/IEEE" ) ) + { + if( !strcmp( tk->psz_codec, "A_PCM/INT/BIG" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' ); + } + else + { + tk->fmt.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' ); + } + tk->fmt.audio.i_blockalign = ( tk->fmt.audio.i_bitspersample + 7 ) / 8 * tk->fmt.audio.i_channels; + } + else if( !strcmp( tk->psz_codec, "A_TTA1" ) ) + { + /* FIXME: support this codec */ + msg_Err( &sys.demuxer, "TTA not supported yet[%d, n=%d]", i_track, tk->i_number ); + tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + } + else if( !strcmp( tk->psz_codec, "A_WAVPACK4" ) ) + { + /* FIXME: support this codec */ + msg_Err( &sys.demuxer, "Wavpack not supported yet[%d, n=%d]", i_track, tk->i_number ); + tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + } + else if( !strcmp( tk->psz_codec, "S_TEXT/UTF8" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); + tk->fmt.subs.psz_encoding = strdup( "UTF-8" ); + } + else if( !strcmp( tk->psz_codec, "S_TEXT/SSA" ) || + !strcmp( tk->psz_codec, "S_TEXT/ASS" ) || + !strcmp( tk->psz_codec, "S_SSA" ) || + !strcmp( tk->psz_codec, "S_ASS" )) + { + tk->fmt.i_codec = VLC_FOURCC( 's', 's', 'a', ' ' ); + tk->fmt.subs.psz_encoding = strdup( "UTF-8" ); + } + else if( !strcmp( tk->psz_codec, "S_VOBSUB" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 's','p','u',' ' ); + if( tk->i_extra_data ) + { + char *p_start; + char *p_buf = (char *)malloc( tk->i_extra_data + 1); + memcpy( p_buf, tk->p_extra_data , tk->i_extra_data ); + p_buf[tk->i_extra_data] = '\0'; + + p_start = strstr( p_buf, "size:" ); + if( sscanf( p_start, "size: %dx%d", + &tk->fmt.subs.spu.i_original_frame_width, &tk->fmt.subs.spu.i_original_frame_height ) == 2 ) + { + msg_Dbg( &sys.demuxer, "original frame size vobsubs: %dx%d", tk->fmt.subs.spu.i_original_frame_width, tk->fmt.subs.spu.i_original_frame_height ); + } + else + { + msg_Warn( &sys.demuxer, "reading original frame size for vobsub failed" ); + } + free( p_buf ); + } + } + else if( !strcmp( tk->psz_codec, "B_VOBBTN" ) ) + { + /* FIXME: support this codec */ + msg_Err( &sys.demuxer, "Vob Buttons not supported yet[%d, n=%d]", i_track, tk->i_number ); + tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + } + else + { + msg_Err( &sys.demuxer, "unknow codec id=`%s'", tk->psz_codec ); + tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + } + if( tk->b_default ) + { + tk->fmt.i_priority = 1000; } + + tk->p_es = es_out_Add( sys.demuxer.out, &tk->fmt ); + + es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, tk->p_es, i_start_time ); +#undef tk } - else + + sys.i_start_pts = i_start_time; + ep->Reset(); + + // reset the stream reading to the first cluster of the segment used + es.I_O().setFilePointer( i_start_pos ); + + return true; +} + +void matroska_segment_t::UnSelect( ) +{ + size_t i_track; + + for( i_track = 0; i_track < tracks.size(); i_track++ ) { - for( i_index = 0; i_index < p_sys->i_index; i_index++ ) +#define tk tracks[i_track] + if ( tk->p_es != NULL ) { - if( p_sys->index[i_index].i_time >= i_date ) + es_out_Del( sys.demuxer.out, tk->p_es ); + tk->p_es = NULL; + } +#undef tk + } +} + +static void UpdateCurrentToChapter( demux_t & demux ) +{ + demux_sys_t & sys = *demux.p_sys; + matroska_segment_t *p_segment = sys.p_current_segment->Segment(); + const chapter_item_t *psz_curr_chapter; + + /* update current chapter/seekpoint */ + if ( p_segment->editions.size()) + { + /* 1st, we need to know in which chapter we are */ + psz_curr_chapter = p_segment->editions[p_segment->i_current_edition].FindTimecode( sys.i_pts ); + + /* we have moved to a new chapter */ + if (p_segment->psz_current_chapter != NULL && psz_curr_chapter != NULL && p_segment->psz_current_chapter != psz_curr_chapter) + { + if (p_segment->psz_current_chapter->i_seekpoint_num != psz_curr_chapter->i_seekpoint_num && psz_curr_chapter->i_seekpoint_num > 0) { - break; + demux.info.i_update |= INPUT_UPDATE_SEEKPOINT; + demux.info.i_seekpoint = psz_curr_chapter->i_seekpoint_num - 1; + } + + if (p_segment->editions[p_segment->i_current_edition].b_ordered ) + { + /* TODO check if we need to silently seek to a new location in the stream (switch to another chapter) */ + if (p_segment->psz_current_chapter->i_end_time != psz_curr_chapter->i_start_time) + Seek(&demux, sys.i_pts, -1, psz_curr_chapter); + /* count the last duration time found for each track in a table (-1 not found, -2 silent) */ + /* only seek after each duration >= end timecode of the current chapter */ } + +// p_segment->i_user_time = psz_curr_chapter->i_user_start_time - psz_curr_chapter->i_start_time; +// p_segment->i_start_pts = psz_curr_chapter->i_user_start_time; } + p_segment->psz_current_chapter = psz_curr_chapter; + } +} + +static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, const chapter_item_t *psz_chapter) +{ + demux_sys_t *p_sys = p_demux->p_sys; + matroska_segment_t *p_segment = p_sys->p_current_segment->Segment(); + mtime_t i_time_offset = 0; + + KaxBlock *block; + int64_t i_block_duration; + int64_t i_block_ref1; + int64_t i_block_ref2; + + int i_index = 0; + int i_track_skipping; + size_t i_track; + + msg_Dbg( p_demux, "seek request to "I64Fd" (%f%%)", i_date, f_percent ); + if( i_date < 0 && f_percent < 0 ) + { + msg_Warn( p_demux, "cannot seek nowhere !" ); + return; + } + if( f_percent > 1.0 ) + { + msg_Warn( p_demux, "cannot seek so far !" ); + return; + } + + delete p_segment->ep; + p_segment->ep = new EbmlParser( &p_segment->es, p_segment->segment ); + p_segment->cluster = NULL; - if( i_index > 0 ) + /* seek without index or without date */ + if( f_percent >= 0 && (config_GetInt( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 )) + { + if (p_sys->f_duration >= 0) { - i_index--; + i_date = int64_t( f_percent * p_sys->f_duration * 1000.0 ); } + else + { + int64_t i_pos = int64_t( f_percent * stream_Size( p_demux->s ) ); + + msg_Dbg( p_demux, "inacurate way of seeking" ); + for( i_index = 0; i_index < p_segment->i_index; i_index++ ) + { + if( p_segment->index[i_index].i_position >= i_pos) + { + break; + } + } + if( i_index == p_segment->i_index ) + { + i_index--; + } - msg_Dbg( p_demux, "seek got "I64Fd" (%d%%)", - p_sys->index[i_index].i_time, - (int)( 100 * p_sys->index[i_index].i_position / - stream_Size( p_demux->s ) ) ); + i_date = p_segment->index[i_index].i_time; + +#if 0 + if( p_segment->index[i_index].i_position < i_pos ) + { + EbmlElement *el; - p_sys->in->setFilePointer( p_sys->index[i_index].i_position, - seek_beginning ); + msg_Warn( p_demux, "searching for cluster, could take some time" ); + + /* search a cluster */ + while( ( el = p_sys->ep->Get() ) != NULL ) + { + if( MKV_IS_ID( el, KaxCluster ) ) + { + KaxCluster *cluster = (KaxCluster*)el; + + /* add it to the index */ + p_segment->IndexAppendCluster( cluster ); + + if( (int64_t)cluster->GetElementPosition() >= i_pos ) + { + p_sys->cluster = cluster; + p_sys->ep->Down(); + break; + } + } + } + } +#endif + } } + // find the actual time for an ordered edition + if ( psz_chapter == NULL ) + { + if ( p_segment->editions.size() && p_segment->editions[p_segment->i_current_edition].b_ordered ) + { + /* 1st, we need to know in which chapter we are */ + psz_chapter = p_segment->editions[p_segment->i_current_edition].FindTimecode( i_date ); + } + } + + if ( psz_chapter != NULL ) + { + p_segment->psz_current_chapter = psz_chapter; + p_sys->i_chapter_time = i_time_offset = psz_chapter->i_user_start_time - psz_chapter->i_start_time; + p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT; + p_demux->info.i_seekpoint = psz_chapter->i_seekpoint_num - 1; + } + + for( ; i_index < p_segment->i_index; i_index++ ) + { + if( p_segment->index[i_index].i_time + i_time_offset > i_date ) + { + break; + } + } + + if( i_index > 0 ) + { + i_index--; + } + + msg_Dbg( p_demux, "seek got "I64Fd" (%d%%)", + p_segment->index[i_index].i_time, + (int)( 100 * p_segment->index[i_index].i_position / + stream_Size( p_demux->s ) ) ); + + p_segment->es.I_O().setFilePointer( p_segment->index[i_index].i_position, + seek_beginning ); + + p_sys->i_start_pts = i_date; + + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + /* now parse until key frame */ -#define tk p_sys->track[i_track] +#define tk p_segment->tracks[i_track] i_track_skipping = 0; - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) + for( i_track = 0; i_track < p_segment->tracks.size(); i_track++ ) { - if( tk.fmt.i_cat == VIDEO_ES ) + if( tk->fmt.i_cat == VIDEO_ES ) { - tk.b_search_keyframe = VLC_TRUE; + tk->b_search_keyframe = VLC_TRUE; i_track_skipping++; } + es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, tk->p_es, i_date ); } + while( i_track_skipping > 0 ) { - if( BlockGet( p_demux, &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) + if( p_segment->BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) { msg_Warn( p_demux, "cannot get block EOF?" ); return; } - p_sys->i_pts = block->GlobalTimecode() / (mtime_t) 1000 + 1; - - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) + for( i_track = 0; i_track < p_segment->tracks.size(); i_track++ ) { - if( tk.i_number == block->TrackNum() ) + if( tk->i_number == block->TrackNum() ) { break; } } - if( i_track < p_sys->i_track ) + p_sys->i_pts = p_sys->i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000; + + if( i_track < p_segment->tracks.size() ) { - if( tk.fmt.i_cat == VIDEO_ES && i_block_ref1 == -1 && tk.b_search_keyframe ) + if( p_sys->i_pts >= p_sys->i_start_pts ) { - tk.b_search_keyframe = VLC_FALSE; - i_track_skipping--; + BlockDecode( p_demux, block, p_sys->i_pts, 0 ); + i_track_skipping = 0; } - if( tk.fmt.i_cat == VIDEO_ES && !tk.b_search_keyframe ) + else if( tk->fmt.i_cat == VIDEO_ES ) { - BlockDecode( p_demux, block, 0, 0 ); - } + if( i_block_ref1 == -1 && tk->b_search_keyframe ) + { + tk->b_search_keyframe = VLC_FALSE; + i_track_skipping--; + } + if( !tk->b_search_keyframe ) + { + BlockDecode( p_demux, block, p_sys->i_pts, 0 ); + } + } } delete block; @@ -1191,29 +1808,75 @@ static void Seek( demux_t *p_demux, mtime_t i_date, int i_percent) *****************************************************************************/ static int Demux( demux_t *p_demux) { - demux_sys_t *p_sys = p_demux->p_sys; - mtime_t i_start_pts; - int i_block_count = 0; + demux_sys_t *p_sys = p_demux->p_sys; + matroska_segment_t *p_segment = p_sys->p_current_segment->Segment(); + if ( p_segment == NULL ) return 0; + int i_block_count = 0; KaxBlock *block; int64_t i_block_duration; int64_t i_block_ref1; int64_t i_block_ref2; - i_start_pts = -1; - for( ;; ) { - if( BlockGet( p_demux, &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) + if( p_sys->i_pts >= p_sys->i_start_pts ) + UpdateCurrentToChapter( *p_demux ); + + if ( p_segment->editions.size() && p_segment->editions[p_segment->i_current_edition].b_ordered && p_segment->psz_current_chapter == NULL ) + { + /* nothing left to read in this ordered edition */ + if ( !p_sys->p_current_segment->SelectNext() ) + return 0; + p_segment->UnSelect( ); + + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + + /* switch to the next segment */ + p_segment = p_sys->p_current_segment->Segment(); + if ( !p_segment->Select( 0 ) ) + { + msg_Err( p_demux, "Failed to select new segment" ); + return 0; + } + continue; + } + + if( p_segment->BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) { + if ( p_segment->editions.size() && p_segment->editions[p_segment->i_current_edition].b_ordered ) + { + // check if there are more chapters to read + if ( p_segment->psz_current_chapter != NULL ) + { + p_sys->i_pts = p_segment->psz_current_chapter->i_user_end_time; + return 1; + } + + return 0; + } msg_Warn( p_demux, "cannot get block EOF?" ); + p_segment->UnSelect( ); + + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + + /* switch to the next segment */ + if ( !p_sys->p_current_segment->SelectNext() ) + // no more segments in this stream + return 0; + p_segment = p_sys->p_current_segment->Segment(); + if ( !p_segment->Select( 0 ) ) + { + msg_Err( p_demux, "Failed to select new segment" ); + return 0; + } - return 0; + continue; } - p_sys->i_pts = block->GlobalTimecode() / (mtime_t) 1000 + 1; + p_sys->i_pts = p_sys->i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000; - if( p_sys->i_pts > 0 ) + if( p_sys->i_pts >= p_sys->i_start_pts ) { es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts ); } @@ -1223,11 +1886,8 @@ static int Demux( demux_t *p_demux) delete block; i_block_count++; - if( i_start_pts == -1 ) - { - i_start_pts = p_sys->i_pts; - } - else if( p_sys->i_pts > i_start_pts + (mtime_t)100000 || i_block_count > 5 ) + // TODO optimize when there is need to leave or when seeking has been called + if( i_block_count > 5 ) { return 1; } @@ -1358,6 +2018,23 @@ int EbmlParser::GetLevel( void ) return mi_user_level; } +void EbmlParser::Reset( void ) +{ + while ( mi_level > 0) + { + delete m_el[mi_level]; + m_el[mi_level] = NULL; + mi_level--; + } + mi_user_level = mi_level = 1; +#if LIBEBML_VERSION >= 0x000704 + // a little faster and cleaner + m_es->I_O().setFilePointer( static_cast(m_el[0])->GetGlobalPosition(0) ); +#else + m_es->I_O().setFilePointer( m_el[0]->GetElementPosition() + m_el[0]->ElementSize(true) - m_el[0]->GetSize() ); +#endif +} + EbmlElement *EbmlParser::Get( void ) { int i_ulev = 0; @@ -1422,30 +2099,39 @@ EbmlElement *EbmlParser::Get( void ) * * InformationCreate : create all information, load tags if present * *****************************************************************************/ -static void LoadCues( demux_t *p_demux ) +void matroska_segment_t::LoadCues( ) { - demux_sys_t *p_sys = p_demux->p_sys; - int64_t i_sav_position = p_sys->in->getFilePointer(); + int64_t i_sav_position = es.I_O().getFilePointer(); EbmlParser *ep; EbmlElement *el, *cues; - msg_Dbg( p_demux, "loading cues" ); - p_sys->in->setFilePointer( p_sys->i_cues_position, seek_beginning ); - cues = p_sys->es->FindNextID( KaxCues::ClassInfos, 0xFFFFFFFFL); + /* *** Load the cue if found *** */ + if( i_cues_position < 0 ) + return; + + vlc_bool_t b_seekable; + + stream_Control( sys.demuxer.s, STREAM_CAN_FASTSEEK, &b_seekable ); + if( !b_seekable ) + return; + + msg_Dbg( &sys.demuxer, "loading cues" ); + es.I_O().setFilePointer( i_cues_position, seek_beginning ); + cues = es.FindNextID( KaxCues::ClassInfos, 0xFFFFFFFFL); if( cues == NULL ) { - msg_Err( p_demux, "cannot load cues (broken seekhead or file)" ); - p_sys->in->setFilePointer( i_sav_position, seek_beginning ); + msg_Err( &sys.demuxer, "cannot load cues (broken seekhead or file)" ); + es.I_O().setFilePointer( i_sav_position, seek_beginning ); return; } - ep = new EbmlParser( p_sys->es, cues ); + ep = new EbmlParser( &es, cues ); while( ( el = ep->Get() ) != NULL ) { if( MKV_IS_ID( el, KaxCuePoint ) ) { -#define idx p_sys->index[p_sys->i_index] +#define idx index[i_index] idx.i_track = -1; idx.i_block_number= -1; @@ -1460,9 +2146,9 @@ static void LoadCues( demux_t *p_demux ) { KaxCueTime &ctime = *(KaxCueTime*)el; - ctime.ReadData( p_sys->es->I_O() ); + ctime.ReadData( es.I_O() ); - idx.i_time = uint64( ctime ) * p_sys->i_timescale / (mtime_t)1000; + idx.i_time = uint64( ctime ) * i_timescale / (mtime_t)1000; } else if( MKV_IS_ID( el, KaxCueTrackPositions ) ) { @@ -1473,206 +2159,204 @@ static void LoadCues( demux_t *p_demux ) { KaxCueTrack &ctrack = *(KaxCueTrack*)el; - ctrack.ReadData( p_sys->es->I_O() ); + ctrack.ReadData( es.I_O() ); idx.i_track = uint16( ctrack ); } else if( MKV_IS_ID( el, KaxCueClusterPosition ) ) { KaxCueClusterPosition &ccpos = *(KaxCueClusterPosition*)el; - ccpos.ReadData( p_sys->es->I_O() ); - idx.i_position = p_sys->segment->GetGlobalPosition( uint64( ccpos ) ); + ccpos.ReadData( es.I_O() ); + idx.i_position = segment->GetGlobalPosition( uint64( ccpos ) ); } else if( MKV_IS_ID( el, KaxCueBlockNumber ) ) { KaxCueBlockNumber &cbnum = *(KaxCueBlockNumber*)el; - cbnum.ReadData( p_sys->es->I_O() ); + cbnum.ReadData( es.I_O() ); idx.i_block_number = uint32( cbnum ); } else { - msg_Dbg( p_demux, " * Unknown (%s)", typeid(*el).name() ); + msg_Dbg( &sys.demuxer, " * Unknown (%s)", typeid(*el).name() ); } } ep->Up(); } else { - msg_Dbg( p_demux, " * Unknown (%s)", typeid(*el).name() ); + msg_Dbg( &sys.demuxer, " * Unknown (%s)", typeid(*el).name() ); } } ep->Up(); #if 0 - msg_Dbg( p_demux, " * added time="I64Fd" pos="I64Fd + msg_Dbg( &sys.demuxer, " * added time="I64Fd" pos="I64Fd " track=%d bnum=%d", idx.i_time, idx.i_position, idx.i_track, idx.i_block_number ); #endif - p_sys->i_index++; - if( p_sys->i_index >= p_sys->i_index_max ) + i_index++; + if( i_index >= i_index_max ) { - p_sys->i_index_max += 1024; - p_sys->index = (mkv_index_t*)realloc( p_sys->index, sizeof( mkv_index_t ) * p_sys->i_index_max ); + i_index_max += 1024; + index = (mkv_index_t*)realloc( index, sizeof( mkv_index_t ) * i_index_max ); } #undef idx } else { - msg_Dbg( p_demux, " * Unknown (%s)", typeid(*el).name() ); + msg_Dbg( &sys.demuxer, " * Unknown (%s)", typeid(*el).name() ); } } delete ep; delete cues; - p_sys->b_cues = VLC_TRUE; + b_cues = VLC_TRUE; - msg_Dbg( p_demux, "loading cues done." ); - p_sys->in->setFilePointer( i_sav_position, seek_beginning ); + msg_Dbg( &sys.demuxer, "loading cues done." ); + es.I_O().setFilePointer( i_sav_position, seek_beginning ); } -static void LoadTags( demux_t *p_demux ) +void matroska_segment_t::LoadTags( ) { - demux_sys_t *p_sys = p_demux->p_sys; - int64_t i_sav_position = p_sys->in->getFilePointer(); + int64_t i_sav_position = es.I_O().getFilePointer(); EbmlParser *ep; EbmlElement *el, *tags; - msg_Dbg( p_demux, "loading tags" ); - p_sys->in->setFilePointer( p_sys->i_tags_position, seek_beginning ); - tags = p_sys->es->FindNextID( KaxTags::ClassInfos, 0xFFFFFFFFL); + msg_Dbg( &sys.demuxer, "loading tags" ); + es.I_O().setFilePointer( i_tags_position, seek_beginning ); + tags = es.FindNextID( KaxTags::ClassInfos, 0xFFFFFFFFL); if( tags == NULL ) { - msg_Err( p_demux, "cannot load tags (broken seekhead or file)" ); - p_sys->in->setFilePointer( i_sav_position, seek_beginning ); + msg_Err( &sys.demuxer, "cannot load tags (broken seekhead or file)" ); + es.I_O().setFilePointer( i_sav_position, seek_beginning ); return; } - msg_Dbg( p_demux, "Tags" ); - ep = new EbmlParser( p_sys->es, tags ); + msg_Dbg( &sys.demuxer, "Tags" ); + ep = new EbmlParser( &es, tags ); while( ( el = ep->Get() ) != NULL ) { if( MKV_IS_ID( el, KaxTag ) ) { - msg_Dbg( p_demux, "+ Tag" ); + msg_Dbg( &sys.demuxer, "+ Tag" ); ep->Down(); while( ( el = ep->Get() ) != NULL ) { if( MKV_IS_ID( el, KaxTagTargets ) ) { - msg_Dbg( p_demux, "| + Targets" ); + msg_Dbg( &sys.demuxer, "| + Targets" ); ep->Down(); while( ( el = ep->Get() ) != NULL ) { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() ); + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); } ep->Up(); } else if( MKV_IS_ID( el, KaxTagGeneral ) ) { - msg_Dbg( p_demux, "| + General" ); + msg_Dbg( &sys.demuxer, "| + General" ); ep->Down(); while( ( el = ep->Get() ) != NULL ) { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() ); + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); } ep->Up(); } else if( MKV_IS_ID( el, KaxTagGenres ) ) { - msg_Dbg( p_demux, "| + Genres" ); + msg_Dbg( &sys.demuxer, "| + Genres" ); ep->Down(); while( ( el = ep->Get() ) != NULL ) { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() ); + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); } ep->Up(); } else if( MKV_IS_ID( el, KaxTagAudioSpecific ) ) { - msg_Dbg( p_demux, "| + Audio Specific" ); + msg_Dbg( &sys.demuxer, "| + Audio Specific" ); ep->Down(); while( ( el = ep->Get() ) != NULL ) { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() ); + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); } ep->Up(); } else if( MKV_IS_ID( el, KaxTagImageSpecific ) ) { - msg_Dbg( p_demux, "| + Images Specific" ); + msg_Dbg( &sys.demuxer, "| + Images Specific" ); ep->Down(); while( ( el = ep->Get() ) != NULL ) { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() ); + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); } ep->Up(); } else if( MKV_IS_ID( el, KaxTagMultiComment ) ) { - msg_Dbg( p_demux, "| + Multi Comment" ); + msg_Dbg( &sys.demuxer, "| + Multi Comment" ); } else if( MKV_IS_ID( el, KaxTagMultiCommercial ) ) { - msg_Dbg( p_demux, "| + Multi Commercial" ); + msg_Dbg( &sys.demuxer, "| + Multi Commercial" ); } else if( MKV_IS_ID( el, KaxTagMultiDate ) ) { - msg_Dbg( p_demux, "| + Multi Date" ); + msg_Dbg( &sys.demuxer, "| + Multi Date" ); } else if( MKV_IS_ID( el, KaxTagMultiEntity ) ) { - msg_Dbg( p_demux, "| + Multi Entity" ); + msg_Dbg( &sys.demuxer, "| + Multi Entity" ); } else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) ) { - msg_Dbg( p_demux, "| + Multi Identifier" ); + msg_Dbg( &sys.demuxer, "| + Multi Identifier" ); } else if( MKV_IS_ID( el, KaxTagMultiLegal ) ) { - msg_Dbg( p_demux, "| + Multi Legal" ); + msg_Dbg( &sys.demuxer, "| + Multi Legal" ); } else if( MKV_IS_ID( el, KaxTagMultiTitle ) ) { - msg_Dbg( p_demux, "| + Multi Title" ); + msg_Dbg( &sys.demuxer, "| + Multi Title" ); } else { - msg_Dbg( p_demux, "| + Unknown (%s)", typeid( *el ).name() ); + msg_Dbg( &sys.demuxer, "| + Unknown (%s)", typeid( *el ).name() ); } } ep->Up(); } else { - msg_Dbg( p_demux, "+ Unknown (%s)", typeid( *el ).name() ); + msg_Dbg( &sys.demuxer, "+ Unknown (%s)", typeid( *el ).name() ); } } delete ep; delete tags; - msg_Dbg( p_demux, "loading tags done." ); - p_sys->in->setFilePointer( i_sav_position, seek_beginning ); + msg_Dbg( &sys.demuxer, "loading tags done." ); + es.I_O().setFilePointer( i_sav_position, seek_beginning ); } /***************************************************************************** - * ParseInfo: + * ParseSeekHead: *****************************************************************************/ -static void ParseSeekHead( demux_t *p_demux, EbmlElement *seekhead ) +void matroska_segment_t::ParseSeekHead( EbmlElement *seekhead ) { - demux_sys_t *p_sys = p_demux->p_sys; EbmlElement *el; EbmlMaster *m; unsigned int i; int i_upper_level = 0; - msg_Dbg( p_demux, "| + Seek head" ); + msg_Dbg( &sys.demuxer, "| + Seek head" ); /* Master elements */ m = static_cast(seekhead); - m->Read( *p_sys->es, seekhead->Generic().Context, i_upper_level, el, true ); + m->Read( es, seekhead->Generic().Context, i_upper_level, el, true ); for( i = 0; i < m->ListSize(); i++ ) { @@ -1702,7 +2386,7 @@ static void ParseSeekHead( demux_t *p_demux, EbmlElement *seekhead ) } else { - msg_Dbg( p_demux, "| | | + Unknown (%s)", typeid(*l).name() ); + msg_Dbg( &sys.demuxer, "| | | + Unknown (%s)", typeid(*l).name() ); } } @@ -1710,46 +2394,43 @@ static void ParseSeekHead( demux_t *p_demux, EbmlElement *seekhead ) { if( id == KaxCues::ClassInfos.GlobalId ) { - msg_Dbg( p_demux, "| | | = cues at "I64Fd, i_pos ); - p_sys->i_cues_position = p_sys->segment->GetGlobalPosition( i_pos ); + msg_Dbg( &sys.demuxer, "| | | = cues at "I64Fd, i_pos ); + i_cues_position = segment->GetGlobalPosition( i_pos ); } else if( id == KaxChapters::ClassInfos.GlobalId ) { - msg_Dbg( p_demux, "| | | = chapters at "I64Fd, i_pos ); - p_sys->i_chapters_position = p_sys->segment->GetGlobalPosition( i_pos ); + msg_Dbg( &sys.demuxer, "| | | = chapters at "I64Fd, i_pos ); + i_chapters_position = segment->GetGlobalPosition( i_pos ); } else if( id == KaxTags::ClassInfos.GlobalId ) { - msg_Dbg( p_demux, "| | | = tags at "I64Fd, i_pos ); - p_sys->i_tags_position = p_sys->segment->GetGlobalPosition( i_pos ); + msg_Dbg( &sys.demuxer, "| | | = tags at "I64Fd, i_pos ); + i_tags_position = segment->GetGlobalPosition( i_pos ); } } } else { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid(*l).name() ); + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid(*l).name() ); } } } /***************************************************************************** - * ParseTracks: + * ParseTrackEntry: *****************************************************************************/ -static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) +void matroska_segment_t::ParseTrackEntry( EbmlMaster *m ) { - demux_sys_t *p_sys = p_demux->p_sys; unsigned int i; mkv_track_t *tk; - msg_Dbg( p_demux, "| | + Track Entry" ); + msg_Dbg( &sys.demuxer, "| | + Track Entry" ); - p_sys->i_track++; - p_sys->track = (mkv_track_t*)realloc( p_sys->track, sizeof( mkv_track_t ) * (p_sys->i_track + 1 ) ); + tk = new mkv_track_t(); + tracks.push_back( tk ); /* Init the track */ - tk = &p_sys->track[p_sys->i_track - 1]; - memset( tk, 0, sizeof( mkv_track_t ) ); es_format_Init( &tk->fmt, UNKNOWN_ES, 0 ); @@ -1758,7 +2439,8 @@ static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) tk->b_default = VLC_TRUE; tk->b_enabled = VLC_TRUE; - tk->i_number = p_sys->i_track - 1; + tk->b_silent = VLC_FALSE; + tk->i_number = tracks.size() - 1; tk->i_extra_data = 0; tk->p_extra_data = NULL; tk->psz_codec = NULL; @@ -1773,6 +2455,8 @@ static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) tk->psz_codec_settings = NULL; tk->psz_codec_info_url = NULL; tk->psz_codec_download_url = NULL; + + tk->i_compression_type = MATROSKA_COMPRESSION_NONE; for( i = 0; i < m->ListSize(); i++ ) { @@ -1783,13 +2467,13 @@ static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) KaxTrackNumber &tnum = *(KaxTrackNumber*)l; tk->i_number = uint32( tnum ); - msg_Dbg( p_demux, "| | | + Track Number=%u", uint32( tnum ) ); + msg_Dbg( &sys.demuxer, "| | | + Track Number=%u", uint32( tnum ) ); } else if( MKV_IS_ID( l, KaxTrackUID ) ) { KaxTrackUID &tuid = *(KaxTrackUID*)l; - msg_Dbg( p_demux, "| | | + Track UID=%u", uint32( tuid ) ); + msg_Dbg( &sys.demuxer, "| | | + Track UID=%u", uint32( tuid ) ); } else if( MKV_IS_ID( l, KaxTrackType ) ) { @@ -1816,14 +2500,14 @@ static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) break; } - msg_Dbg( p_demux, "| | | + Track Type=%s", psz_type ); + msg_Dbg( &sys.demuxer, "| | | + Track Type=%s", psz_type ); } // else if( EbmlId( *l ) == KaxTrackFlagEnabled::ClassInfos.GlobalId ) // { // KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)l; // tk->b_enabled = uint32( fenb ); -// msg_Dbg( p_demux, "| | | + Track Enabled=%u", +// msg_Dbg( &sys.demuxer, "| | | + Track Enabled=%u", // uint32( fenb ) ); // } else if( MKV_IS_ID( l, KaxTrackFlagDefault ) ) @@ -1831,53 +2515,53 @@ static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) KaxTrackFlagDefault &fdef = *(KaxTrackFlagDefault*)l; tk->b_default = uint32( fdef ); - msg_Dbg( p_demux, "| | | + Track Default=%u", uint32( fdef ) ); + msg_Dbg( &sys.demuxer, "| | | + Track Default=%u", uint32( fdef ) ); } else if( MKV_IS_ID( l, KaxTrackFlagLacing ) ) { KaxTrackFlagLacing &lac = *(KaxTrackFlagLacing*)l; - msg_Dbg( p_demux, "| | | + Track Lacing=%d", uint32( lac ) ); + msg_Dbg( &sys.demuxer, "| | | + Track Lacing=%d", uint32( lac ) ); } else if( MKV_IS_ID( l, KaxTrackMinCache ) ) { KaxTrackMinCache &cmin = *(KaxTrackMinCache*)l; - msg_Dbg( p_demux, "| | | + Track MinCache=%d", uint32( cmin ) ); + msg_Dbg( &sys.demuxer, "| | | + Track MinCache=%d", uint32( cmin ) ); } else if( MKV_IS_ID( l, KaxTrackMaxCache ) ) { KaxTrackMaxCache &cmax = *(KaxTrackMaxCache*)l; - msg_Dbg( p_demux, "| | | + Track MaxCache=%d", uint32( cmax ) ); + msg_Dbg( &sys.demuxer, "| | | + Track MaxCache=%d", uint32( cmax ) ); } else if( MKV_IS_ID( l, KaxTrackDefaultDuration ) ) { KaxTrackDefaultDuration &defd = *(KaxTrackDefaultDuration*)l; tk->i_default_duration = uint64(defd); - msg_Dbg( p_demux, "| | | + Track Default Duration="I64Fd, uint64(defd) ); + msg_Dbg( &sys.demuxer, "| | | + Track Default Duration="I64Fd, uint64(defd) ); } else if( MKV_IS_ID( l, KaxTrackTimecodeScale ) ) { KaxTrackTimecodeScale &ttcs = *(KaxTrackTimecodeScale*)l; tk->f_timecodescale = float( ttcs ); - msg_Dbg( p_demux, "| | | + Track TimeCodeScale=%f", tk->f_timecodescale ); + msg_Dbg( &sys.demuxer, "| | | + Track TimeCodeScale=%f", tk->f_timecodescale ); } else if( MKV_IS_ID( l, KaxTrackName ) ) { KaxTrackName &tname = *(KaxTrackName*)l; tk->fmt.psz_description = UTF8ToStr( UTFstring( tname ) ); - msg_Dbg( p_demux, "| | | + Track Name=%s", tk->fmt.psz_description ); + msg_Dbg( &sys.demuxer, "| | | + Track Name=%s", tk->fmt.psz_description ); } else if( MKV_IS_ID( l, KaxTrackLanguage ) ) { KaxTrackLanguage &lang = *(KaxTrackLanguage*)l; tk->fmt.psz_language = strdup( string( lang ).c_str() ); - msg_Dbg( p_demux, + msg_Dbg( &sys.demuxer, "| | | + Track Language=`%s'", tk->fmt.psz_language ); } else if( MKV_IS_ID( l, KaxCodecID ) ) @@ -1885,7 +2569,7 @@ static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) KaxCodecID &codecid = *(KaxCodecID*)l; tk->psz_codec = strdup( string( codecid ).c_str() ); - msg_Dbg( p_demux, "| | | + Track CodecId=%s", string( codecid ).c_str() ); + msg_Dbg( &sys.demuxer, "| | | + Track CodecId=%s", string( codecid ).c_str() ); } else if( MKV_IS_ID( l, KaxCodecPrivate ) ) { @@ -1897,54 +2581,120 @@ static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) tk->p_extra_data = (uint8_t*)malloc( tk->i_extra_data ); memcpy( tk->p_extra_data, cpriv.GetBuffer(), tk->i_extra_data ); } - msg_Dbg( p_demux, "| | | + Track CodecPrivate size="I64Fd, cpriv.GetSize() ); + msg_Dbg( &sys.demuxer, "| | | + Track CodecPrivate size="I64Fd, cpriv.GetSize() ); } else if( MKV_IS_ID( l, KaxCodecName ) ) { KaxCodecName &cname = *(KaxCodecName*)l; tk->psz_codec_name = UTF8ToStr( UTFstring( cname ) ); - msg_Dbg( p_demux, "| | | + Track Codec Name=%s", tk->psz_codec_name ); + msg_Dbg( &sys.demuxer, "| | | + Track Codec Name=%s", tk->psz_codec_name ); + } + else if( MKV_IS_ID( l, KaxContentEncodings ) ) + { + EbmlMaster *cencs = static_cast(l); + MkvTree( sys.demuxer, 3, "Content Encodings" ); + for( unsigned int i = 0; i < cencs->ListSize(); i++ ) + { + EbmlElement *l2 = (*cencs)[i]; + if( MKV_IS_ID( l2, KaxContentEncoding ) ) + { + MkvTree( sys.demuxer, 4, "Content Encoding" ); + EbmlMaster *cenc = static_cast(l2); + for( unsigned int i = 0; i < cenc->ListSize(); i++ ) + { + EbmlElement *l3 = (*cenc)[i]; + if( MKV_IS_ID( l3, KaxContentEncodingOrder ) ) + { + KaxContentEncodingOrder &encord = *(KaxContentEncodingOrder*)l3; + MkvTree( sys.demuxer, 5, "Order: %i", uint32( encord ) ); + } + else if( MKV_IS_ID( l3, KaxContentEncodingScope ) ) + { + KaxContentEncodingScope &encscope = *(KaxContentEncodingScope*)l3; + MkvTree( sys.demuxer, 5, "Scope: %i", uint32( encscope ) ); + } + else if( MKV_IS_ID( l3, KaxContentEncodingType ) ) + { + KaxContentEncodingType &enctype = *(KaxContentEncodingType*)l3; + MkvTree( sys.demuxer, 5, "Type: %i", uint32( enctype ) ); + } + else if( MKV_IS_ID( l3, KaxContentCompression ) ) + { + EbmlMaster *compr = static_cast(l3); + MkvTree( sys.demuxer, 5, "Content Compression" ); + for( unsigned int i = 0; i < compr->ListSize(); i++ ) + { + EbmlElement *l4 = (*compr)[i]; + if( MKV_IS_ID( l4, KaxContentCompAlgo ) ) + { + KaxContentCompAlgo &compalg = *(KaxContentCompAlgo*)l4; + MkvTree( sys.demuxer, 6, "Compression Algorithm: %i", uint32(compalg) ); + if( uint32( compalg ) == 0 ) + { + tk->i_compression_type = MATROSKA_COMPRESSION_ZLIB; + } + } + else + { + MkvTree( sys.demuxer, 6, "Unknown (%s)", typeid(*l4).name() ); + } + } + } + + else + { + MkvTree( sys.demuxer, 5, "Unknown (%s)", typeid(*l3).name() ); + } + } + + } + else + { + MkvTree( sys.demuxer, 4, "Unknown (%s)", typeid(*l2).name() ); + } + } + } // else if( EbmlId( *l ) == KaxCodecSettings::ClassInfos.GlobalId ) // { // KaxCodecSettings &cset = *(KaxCodecSettings*)l; // tk->psz_codec_settings = UTF8ToStr( UTFstring( cset ) ); -// msg_Dbg( p_demux, "| | | + Track Codec Settings=%s", tk->psz_codec_settings ); +// msg_Dbg( &sys.demuxer, "| | | + Track Codec Settings=%s", tk->psz_codec_settings ); // } // else if( EbmlId( *l ) == KaxCodecInfoURL::ClassInfos.GlobalId ) // { // KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)l; // tk->psz_codec_info_url = strdup( string( ciurl ).c_str() ); -// msg_Dbg( p_demux, "| | | + Track Codec Info URL=%s", tk->psz_codec_info_url ); +// msg_Dbg( &sys.demuxer, "| | | + Track Codec Info URL=%s", tk->psz_codec_info_url ); // } // else if( EbmlId( *l ) == KaxCodecDownloadURL::ClassInfos.GlobalId ) // { // KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)l; // tk->psz_codec_download_url = strdup( string( cdurl ).c_str() ); -// msg_Dbg( p_demux, "| | | + Track Codec Info URL=%s", tk->psz_codec_download_url ); +// msg_Dbg( &sys.demuxer, "| | | + Track Codec Info URL=%s", tk->psz_codec_download_url ); // } // else if( EbmlId( *l ) == KaxCodecDecodeAll::ClassInfos.GlobalId ) // { // KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)l; -// msg_Dbg( p_demux, "| | | + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) ); +// msg_Dbg( &sys.demuxer, "| | | + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) ); // } // else if( EbmlId( *l ) == KaxTrackOverlay::ClassInfos.GlobalId ) // { // KaxTrackOverlay &tovr = *(KaxTrackOverlay*)l; -// msg_Dbg( p_demux, "| | | + Track Overlay=%u <== UNUSED", uint32( tovr ) ); +// msg_Dbg( &sys.demuxer, "| | | + Track Overlay=%u <== UNUSED", uint32( tovr ) ); // } else if( MKV_IS_ID( l, KaxTrackVideo ) ) { EbmlMaster *tkv = static_cast(l); unsigned int j; - msg_Dbg( p_demux, "| | | + Track Video" ); + msg_Dbg( &sys.demuxer, "| | | + Track Video" ); tk->f_fps = 0.0; for( j = 0; j < tkv->ListSize(); j++ ) @@ -1954,13 +2704,13 @@ static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) // { // KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)el4; -// msg_Dbg( p_demux, "| | | | + Track Video Interlaced=%u", uint8( fint ) ); +// msg_Dbg( &sys.demuxer, "| | | | + Track Video Interlaced=%u", uint8( fint ) ); // } // else if( EbmlId( *el4 ) == KaxVideoStereoMode::ClassInfos.GlobalId ) // { // KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)el4; -// msg_Dbg( p_demux, "| | | | + Track Video Stereo Mode=%u", uint8( stereo ) ); +// msg_Dbg( &sys.demuxer, "| | | | + Track Video Stereo Mode=%u", uint8( stereo ) ); // } // else if( MKV_IS_ID( l, KaxVideoPixelWidth ) ) @@ -1968,67 +2718,69 @@ static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)l; tk->fmt.video.i_width = uint16( vwidth ); - msg_Dbg( p_demux, "| | | | + width=%d", uint16( vwidth ) ); + msg_Dbg( &sys.demuxer, "| | | | + width=%d", uint16( vwidth ) ); } else if( MKV_IS_ID( l, KaxVideoPixelHeight ) ) { KaxVideoPixelWidth &vheight = *(KaxVideoPixelWidth*)l; tk->fmt.video.i_height = uint16( vheight ); - msg_Dbg( p_demux, "| | | | + height=%d", uint16( vheight ) ); + msg_Dbg( &sys.demuxer, "| | | | + height=%d", uint16( vheight ) ); } else if( MKV_IS_ID( l, KaxVideoDisplayWidth ) ) { KaxVideoDisplayWidth &vwidth = *(KaxVideoDisplayWidth*)l; tk->fmt.video.i_visible_width = uint16( vwidth ); - msg_Dbg( p_demux, "| | | | + display width=%d", uint16( vwidth ) ); + msg_Dbg( &sys.demuxer, "| | | | + display width=%d", uint16( vwidth ) ); } else if( MKV_IS_ID( l, KaxVideoDisplayHeight ) ) { KaxVideoDisplayWidth &vheight = *(KaxVideoDisplayWidth*)l; tk->fmt.video.i_visible_height = uint16( vheight ); - msg_Dbg( p_demux, "| | | | + display height=%d", uint16( vheight ) ); + msg_Dbg( &sys.demuxer, "| | | | + display height=%d", uint16( vheight ) ); } else if( MKV_IS_ID( l, KaxVideoFrameRate ) ) { KaxVideoFrameRate &vfps = *(KaxVideoFrameRate*)l; tk->f_fps = float( vfps ); - msg_Dbg( p_demux, " | | | + fps=%f", float( vfps ) ); + msg_Dbg( &sys.demuxer, " | | | + fps=%f", float( vfps ) ); } // else if( EbmlId( *l ) == KaxVideoDisplayUnit::ClassInfos.GlobalId ) // { // KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l; -// msg_Dbg( p_demux, "| | | | + Track Video Display Unit=%s", +// msg_Dbg( &sys.demuxer, "| | | | + Track Video Display Unit=%s", // uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) ); // } // else if( EbmlId( *l ) == KaxVideoAspectRatio::ClassInfos.GlobalId ) // { // KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)l; -// msg_Dbg( p_demux, " | | | + Track Video Aspect Ratio Type=%u", uint8( ratio ) ); +// msg_Dbg( &sys.demuxer, " | | | + Track Video Aspect Ratio Type=%u", uint8( ratio ) ); // } // else if( EbmlId( *l ) == KaxVideoGamma::ClassInfos.GlobalId ) // { // KaxVideoGamma &gamma = *(KaxVideoGamma*)l; -// msg_Dbg( p_demux, " | | | + fps=%f", float( gamma ) ); +// msg_Dbg( &sys.demuxer, " | | | + fps=%f", float( gamma ) ); // } else { - msg_Dbg( p_demux, "| | | | + Unknown (%s)", typeid(*l).name() ); + msg_Dbg( &sys.demuxer, "| | | | + Unknown (%s)", typeid(*l).name() ); } } + if ( tk->fmt.video.i_visible_height && tk->fmt.video.i_visible_width ) + tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * tk->fmt.video.i_visible_width / tk->fmt.video.i_visible_height; } else if( MKV_IS_ID( l, KaxTrackAudio ) ) { EbmlMaster *tka = static_cast(l); unsigned int j; - msg_Dbg( p_demux, "| | | + Track Audio" ); + msg_Dbg( &sys.demuxer, "| | | + Track Audio" ); for( j = 0; j < tka->ListSize(); j++ ) { @@ -2039,49 +2791,51 @@ static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) KaxAudioSamplingFreq &afreq = *(KaxAudioSamplingFreq*)l; tk->fmt.audio.i_rate = (int)float( afreq ); - msg_Dbg( p_demux, "| | | | + afreq=%d", tk->fmt.audio.i_rate ); + msg_Dbg( &sys.demuxer, "| | | | + afreq=%d", tk->fmt.audio.i_rate ); } else if( MKV_IS_ID( l, KaxAudioChannels ) ) { KaxAudioChannels &achan = *(KaxAudioChannels*)l; tk->fmt.audio.i_channels = uint8( achan ); - msg_Dbg( p_demux, "| | | | + achan=%u", uint8( achan ) ); + msg_Dbg( &sys.demuxer, "| | | | + achan=%u", uint8( achan ) ); } else if( MKV_IS_ID( l, KaxAudioBitDepth ) ) { KaxAudioBitDepth &abits = *(KaxAudioBitDepth*)l; tk->fmt.audio.i_bitspersample = uint8( abits ); - msg_Dbg( p_demux, "| | | | + abits=%u", uint8( abits ) ); + msg_Dbg( &sys.demuxer, "| | | | + abits=%u", uint8( abits ) ); } else { - msg_Dbg( p_demux, "| | | | + Unknown (%s)", typeid(*l).name() ); + msg_Dbg( &sys.demuxer, "| | | | + Unknown (%s)", typeid(*l).name() ); } } } else { - msg_Dbg( p_demux, "| | | + Unknown (%s)", + msg_Dbg( &sys.demuxer, "| | | + Unknown (%s)", typeid(*l).name() ); } } } -static void ParseTracks( demux_t *p_demux, EbmlElement *tracks ) +/***************************************************************************** + * ParseTracks: + *****************************************************************************/ +void matroska_segment_t::ParseTracks( EbmlElement *tracks ) { - demux_sys_t *p_sys = p_demux->p_sys; EbmlElement *el; EbmlMaster *m; unsigned int i; int i_upper_level = 0; - msg_Dbg( p_demux, "| + Tracks" ); + msg_Dbg( &sys.demuxer, "| + Tracks" ); /* Master elements */ m = static_cast(tracks); - m->Read( *p_sys->es, tracks->Generic().Context, i_upper_level, el, true ); + m->Read( es, tracks->Generic().Context, i_upper_level, el, true ); for( i = 0; i < m->ListSize(); i++ ) { @@ -2089,11 +2843,11 @@ static void ParseTracks( demux_t *p_demux, EbmlElement *tracks ) if( MKV_IS_ID( l, KaxTrackEntry ) ) { - ParseTrackEntry( p_demux, static_cast(l) ); + ParseTrackEntry( static_cast(l) ); } else { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid(*l).name() ); + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid(*l).name() ); } } } @@ -2101,19 +2855,18 @@ static void ParseTracks( demux_t *p_demux, EbmlElement *tracks ) /***************************************************************************** * ParseInfo: *****************************************************************************/ -static void ParseInfo( demux_t *p_demux, EbmlElement *info ) +void matroska_segment_t::ParseInfo( EbmlElement *info ) { - demux_sys_t *p_sys = p_demux->p_sys; EbmlElement *el; EbmlMaster *m; unsigned int i; int i_upper_level = 0; - msg_Dbg( p_demux, "| + Information" ); + msg_Dbg( &sys.demuxer, "| + Information" ); /* Master elements */ m = static_cast(info); - m->Read( *p_sys->es, info->Generic().Context, i_upper_level, el, true ); + m->Read( es, info->Generic().Context, i_upper_level, el, true ); for( i = 0; i < m->ListSize(); i++ ) { @@ -2121,62 +2874,82 @@ static void ParseInfo( demux_t *p_demux, EbmlElement *info ) if( MKV_IS_ID( l, KaxSegmentUID ) ) { - KaxSegmentUID &uid = *(KaxSegmentUID*)l; + segment_uid = *(new KaxSegmentUID(*static_cast(l))); + + msg_Dbg( &sys.demuxer, "| | + UID=%d", *(uint32*)segment_uid.GetBuffer() ); + } + else if( MKV_IS_ID( l, KaxPrevUID ) ) + { + prev_segment_uid = *(new KaxPrevUID(*static_cast(l))); - msg_Dbg( p_demux, "| | + UID=%d", uint32(uid) ); + msg_Dbg( &sys.demuxer, "| | + PrevUID=%d", *(uint32*)prev_segment_uid.GetBuffer() ); + } + else if( MKV_IS_ID( l, KaxNextUID ) ) + { + next_segment_uid = *(new KaxNextUID(*static_cast(l))); + + msg_Dbg( &sys.demuxer, "| | + NextUID=%d", *(uint32*)next_segment_uid.GetBuffer() ); } else if( MKV_IS_ID( l, KaxTimecodeScale ) ) { KaxTimecodeScale &tcs = *(KaxTimecodeScale*)l; - p_sys->i_timescale = uint64(tcs); + i_timescale = uint64(tcs); - msg_Dbg( p_demux, "| | + TimecodeScale="I64Fd, - p_sys->i_timescale ); + msg_Dbg( &sys.demuxer, "| | + TimecodeScale="I64Fd, + i_timescale ); } else if( MKV_IS_ID( l, KaxDuration ) ) { KaxDuration &dur = *(KaxDuration*)l; - p_sys->f_duration = float(dur); + f_duration = float(dur); - msg_Dbg( p_demux, "| | + Duration=%f", - p_sys->f_duration ); + msg_Dbg( &sys.demuxer, "| | + Duration=%f", + f_duration ); } else if( MKV_IS_ID( l, KaxMuxingApp ) ) { KaxMuxingApp &mapp = *(KaxMuxingApp*)l; - p_sys->psz_muxing_application = UTF8ToStr( UTFstring( mapp ) ); + psz_muxing_application = UTF8ToStr( UTFstring( mapp ) ); - msg_Dbg( p_demux, "| | + Muxing Application=%s", - p_sys->psz_muxing_application ); + msg_Dbg( &sys.demuxer, "| | + Muxing Application=%s", + psz_muxing_application ); } else if( MKV_IS_ID( l, KaxWritingApp ) ) { KaxWritingApp &wapp = *(KaxWritingApp*)l; - p_sys->psz_writing_application = UTF8ToStr( UTFstring( wapp ) ); + psz_writing_application = UTF8ToStr( UTFstring( wapp ) ); - msg_Dbg( p_demux, "| | + Writing Application=%s", - p_sys->psz_writing_application ); + msg_Dbg( &sys.demuxer, "| | + Writing Application=%s", + psz_writing_application ); } else if( MKV_IS_ID( l, KaxSegmentFilename ) ) { KaxSegmentFilename &sfn = *(KaxSegmentFilename*)l; - p_sys->psz_segment_filename = UTF8ToStr( UTFstring( sfn ) ); + psz_segment_filename = UTF8ToStr( UTFstring( sfn ) ); - msg_Dbg( p_demux, "| | + Segment Filename=%s", - p_sys->psz_segment_filename ); + msg_Dbg( &sys.demuxer, "| | + Segment Filename=%s", + psz_segment_filename ); } else if( MKV_IS_ID( l, KaxTitle ) ) { KaxTitle &title = *(KaxTitle*)l; - p_sys->psz_title = UTF8ToStr( UTFstring( title ) ); + psz_title = UTF8ToStr( UTFstring( title ) ); + + msg_Dbg( &sys.demuxer, "| | + Title=%s", psz_title ); + } + else if( MKV_IS_ID( l, KaxSegmentFamily ) ) + { + KaxSegmentFamily *uid = static_cast(l); - msg_Dbg( p_demux, "| | + Title=%s", p_sys->psz_title ); + families.push_back(*uid); + + msg_Dbg( &sys.demuxer, "| | + family=%d", *(uint32*)uid->GetBuffer() ); } #if defined( HAVE_GMTIME_R ) && !defined( SYS_DARWIN ) else if( MKV_IS_ID( l, KaxDateUTC ) ) @@ -2192,120 +2965,127 @@ static void ParseInfo( demux_t *p_demux, EbmlElement *info ) asctime_r( &tmres, buffer ) ) { buffer[strlen( buffer)-1]= '\0'; - p_sys->psz_date_utc = strdup( buffer ); - msg_Dbg( p_demux, "| | + Date=%s", p_sys->psz_date_utc ); + psz_date_utc = strdup( buffer ); + msg_Dbg( &sys.demuxer, "| | + Date=%s", psz_date_utc ); } } #endif else { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid(*l).name() ); + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid(*l).name() ); } } - p_sys->f_duration = p_sys->f_duration * p_sys->i_timescale / 1000000.0; + f_duration *= i_timescale / 1000000.0; } /***************************************************************************** * ParseChapterAtom *****************************************************************************/ -static void ParseChapterAtom( demux_t *p_demux, int i_level, EbmlMaster *ca ) +void matroska_segment_t::ParseChapterAtom( int i_level, EbmlMaster *ca, chapter_item_t & chapters ) { - demux_sys_t *p_sys = p_demux->p_sys; unsigned int i; - seekpoint_t *sk; - if( p_sys->title == NULL ) + if( sys.title == NULL ) { - p_sys->title = vlc_input_title_New(); + sys.title = vlc_input_title_New(); } - sk = vlc_seekpoint_New(); - msg_Dbg( p_demux, "| | | + ChapterAtom (level=%d)", i_level ); + msg_Dbg( &sys.demuxer, "| | | + ChapterAtom (level=%d)", i_level ); for( i = 0; i < ca->ListSize(); i++ ) { EbmlElement *l = (*ca)[i]; if( MKV_IS_ID( l, KaxChapterUID ) ) { - KaxChapterUID &uid = *(KaxChapterUID*)l; - uint32_t i_uid = uint32( uid ); - msg_Dbg( p_demux, "| | | | + ChapterUID: 0x%x", i_uid ); + chapters.i_uid = uint64_t(*(KaxChapterUID*)l); + msg_Dbg( &sys.demuxer, "| | | | + ChapterUID: %lld", chapters.i_uid ); + } + else if( MKV_IS_ID( l, KaxChapterFlagHidden ) ) + { + KaxChapterFlagHidden &flag =*(KaxChapterFlagHidden*)l; + chapters.b_display_seekpoint = uint8( flag ) == 0; + + msg_Dbg( &sys.demuxer, "| | | | + ChapterFlagHidden: %s", chapters.b_display_seekpoint ? "no":"yes" ); } else if( MKV_IS_ID( l, KaxChapterTimeStart ) ) { KaxChapterTimeStart &start =*(KaxChapterTimeStart*)l; - sk->i_time_offset = uint64( start ) / I64C(1000); + chapters.i_start_time = uint64( start ) / I64C(1000); - msg_Dbg( p_demux, "| | | | + ChapterTimeStart: %lld", sk->i_time_offset ); + msg_Dbg( &sys.demuxer, "| | | | + ChapterTimeStart: %lld", chapters.i_start_time ); } else if( MKV_IS_ID( l, KaxChapterTimeEnd ) ) { KaxChapterTimeEnd &end =*(KaxChapterTimeEnd*)l; - int64_t i_end = uint64( end ); + chapters.i_end_time = uint64( end ) / I64C(1000); - msg_Dbg( p_demux, "| | | | + ChapterTimeEnd: %lld", i_end ); + msg_Dbg( &sys.demuxer, "| | | | + ChapterTimeEnd: %lld", chapters.i_end_time ); } else if( MKV_IS_ID( l, KaxChapterDisplay ) ) { EbmlMaster *cd = static_cast(l); unsigned int j; - msg_Dbg( p_demux, "| | | | + ChapterDisplay" ); + msg_Dbg( &sys.demuxer, "| | | | + ChapterDisplay" ); for( j = 0; j < cd->ListSize(); j++ ) { EbmlElement *l= (*cd)[j]; if( MKV_IS_ID( l, KaxChapterString ) ) { + int k; + KaxChapterString &name =*(KaxChapterString*)l; - char *psz = UTF8ToStr( UTFstring( name ) ); - sk->psz_name = strdup( psz ); - msg_Dbg( p_demux, "| | | | | + ChapterString '%s'", psz ); + for (k = 0; k < i_level; k++) + chapters.psz_name += '+'; + chapters.psz_name += ' '; + chapters.psz_name += UTF8ToStr( UTFstring( name ) ); + + msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", UTF8ToStr(UTFstring(name)) ); } else if( MKV_IS_ID( l, KaxChapterLanguage ) ) { KaxChapterLanguage &lang =*(KaxChapterLanguage*)l; const char *psz = string( lang ).c_str(); - msg_Dbg( p_demux, "| | | | | + ChapterLanguage '%s'", psz ); + msg_Dbg( &sys.demuxer, "| | | | | + ChapterLanguage '%s'", psz ); } else if( MKV_IS_ID( l, KaxChapterCountry ) ) { KaxChapterCountry &ct =*(KaxChapterCountry*)l; const char *psz = string( ct ).c_str(); - msg_Dbg( p_demux, "| | | | | + ChapterCountry '%s'", psz ); + msg_Dbg( &sys.demuxer, "| | | | | + ChapterCountry '%s'", psz ); } } } else if( MKV_IS_ID( l, KaxChapterAtom ) ) { - ParseChapterAtom( p_demux, i_level+1, static_cast(l) ); + chapter_item_t new_sub_chapter; + ParseChapterAtom( i_level+1, static_cast(l), new_sub_chapter ); + new_sub_chapter.psz_parent = &chapters; + chapters.sub_chapters.push_back( new_sub_chapter ); } } - // A start time of '0' is ok. A missing ChapterTime element is ok, too, because '0' is its default value. - p_sys->title->i_seekpoint++; - p_sys->title->seekpoint = (seekpoint_t**)realloc( p_sys->title->seekpoint, p_sys->title->i_seekpoint * sizeof( seekpoint_t* ) ); - p_sys->title->seekpoint[p_sys->title->i_seekpoint-1] = sk; } /***************************************************************************** * ParseChapters: *****************************************************************************/ -static void ParseChapters( demux_t *p_demux, EbmlElement *chapters ) +void matroska_segment_t::ParseChapters( EbmlElement *chapters ) { - demux_sys_t *p_sys = p_demux->p_sys; EbmlElement *el; EbmlMaster *m; unsigned int i; int i_upper_level = 0; - + int i_default_edition = 0; + float f_dur; /* Master elements */ m = static_cast(chapters); - m->Read( *p_sys->es, chapters->Generic().Context, i_upper_level, el, true ); + m->Read( es, chapters->Generic().Context, i_upper_level, el, true ); for( i = 0; i < m->ListSize(); i++ ) { @@ -2313,100 +3093,132 @@ static void ParseChapters( demux_t *p_demux, EbmlElement *chapters ) if( MKV_IS_ID( l, KaxEditionEntry ) ) { + chapter_edition_t edition; + EbmlMaster *E = static_cast(l ); unsigned int j; - msg_Dbg( p_demux, "| | + EditionEntry" ); + msg_Dbg( &sys.demuxer, "| | + EditionEntry" ); for( j = 0; j < E->ListSize(); j++ ) { EbmlElement *l = (*E)[j]; if( MKV_IS_ID( l, KaxChapterAtom ) ) { - ParseChapterAtom( p_demux, 0, static_cast(l) ); + chapter_item_t new_sub_chapter; + ParseChapterAtom( 0, static_cast(l), new_sub_chapter ); + edition.chapters.push_back( new_sub_chapter ); + } + else if( MKV_IS_ID( l, KaxEditionUID ) ) + { + edition.i_uid = uint64(*static_cast( l )); + } + else if( MKV_IS_ID( l, KaxEditionFlagOrdered ) ) + { + edition.b_ordered = config_GetInt( &sys.demuxer, "mkv-use-ordered-chapters" ) ? (uint8(*static_cast( l )) != 0) : 0; + } + else if( MKV_IS_ID( l, KaxEditionFlagDefault ) ) + { + if (uint8(*static_cast( l )) != 0) + i_default_edition = editions.size(); } else { - msg_Dbg( p_demux, "| | | + Unknown (%s)", typeid(*l).name() ); + msg_Dbg( &sys.demuxer, "| | | + Unknown (%s)", typeid(*l).name() ); } } + editions.push_back( edition ); } else { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid(*l).name() ); + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid(*l).name() ); } } + + for( i = 0; i < editions.size(); i++ ) + { + editions[i].RefreshChapters( *sys.title ); + } + + i_current_edition = i_default_edition; + + if ( editions[i_default_edition].b_ordered ) + { + /* update the duration of the segment according to the sum of all sub chapters */ + f_dur = editions[i_default_edition].Duration() / I64C(1000); + if (f_dur > 0.0) + f_duration = f_dur; + } } /***************************************************************************** * InformationCreate: *****************************************************************************/ -static void InformationCreate( demux_t *p_demux ) +void matroska_segment_t::InformationCreate( ) { - demux_sys_t *p_sys = p_demux->p_sys; - int i_track; + size_t i_track; - p_sys->meta = vlc_meta_New(); + sys.meta = vlc_meta_New(); - if( p_sys->psz_title ) + if( psz_title ) { - vlc_meta_Add( p_sys->meta, VLC_META_TITLE, p_sys->psz_title ); + vlc_meta_Add( sys.meta, VLC_META_TITLE, psz_title ); } - if( p_sys->psz_date_utc ) + if( psz_date_utc ) { - vlc_meta_Add( p_sys->meta, VLC_META_DATE, p_sys->psz_date_utc ); + vlc_meta_Add( sys.meta, VLC_META_DATE, psz_date_utc ); } - if( p_sys->psz_segment_filename ) + if( psz_segment_filename ) { - vlc_meta_Add( p_sys->meta, _("Segment filename"), p_sys->psz_segment_filename ); + vlc_meta_Add( sys.meta, _("Segment filename"), psz_segment_filename ); } - if( p_sys->psz_muxing_application ) + if( psz_muxing_application ) { - vlc_meta_Add( p_sys->meta, _("Muxing application"), p_sys->psz_muxing_application ); + vlc_meta_Add( sys.meta, _("Muxing application"), psz_muxing_application ); } - if( p_sys->psz_writing_application ) + if( psz_writing_application ) { - vlc_meta_Add( p_sys->meta, _("Writing application"), p_sys->psz_writing_application ); + vlc_meta_Add( sys.meta, _("Writing application"), psz_writing_application ); } - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) + for( i_track = 0; i_track < tracks.size(); i_track++ ) { - mkv_track_t *tk = &p_sys->track[i_track]; + mkv_track_t *tk = tracks[i_track]; vlc_meta_t *mtk = vlc_meta_New(); - p_sys->meta->track = (vlc_meta_t**)realloc( p_sys->meta->track, - sizeof( vlc_meta_t * ) * ( p_sys->meta->i_track + 1 ) ); - p_sys->meta->track[p_sys->meta->i_track++] = mtk; + sys.meta->track = (vlc_meta_t**)realloc( sys.meta->track, + sizeof( vlc_meta_t * ) * ( sys.meta->i_track + 1 ) ); + sys.meta->track[sys.meta->i_track++] = mtk; if( tk->fmt.psz_description ) { - vlc_meta_Add( p_sys->meta, VLC_META_DESCRIPTION, tk->fmt.psz_description ); + vlc_meta_Add( sys.meta, VLC_META_DESCRIPTION, tk->fmt.psz_description ); } if( tk->psz_codec_name ) { - vlc_meta_Add( p_sys->meta, VLC_META_CODEC_NAME, tk->psz_codec_name ); + vlc_meta_Add( sys.meta, VLC_META_CODEC_NAME, tk->psz_codec_name ); } if( tk->psz_codec_settings ) { - vlc_meta_Add( p_sys->meta, VLC_META_SETTING, tk->psz_codec_settings ); + vlc_meta_Add( sys.meta, VLC_META_SETTING, tk->psz_codec_settings ); } if( tk->psz_codec_info_url ) { - vlc_meta_Add( p_sys->meta, VLC_META_CODEC_DESCRIPTION, tk->psz_codec_info_url ); + vlc_meta_Add( sys.meta, VLC_META_CODEC_DESCRIPTION, tk->psz_codec_info_url ); } if( tk->psz_codec_download_url ) { - vlc_meta_Add( p_sys->meta, VLC_META_URL, tk->psz_codec_download_url ); + vlc_meta_Add( sys.meta, VLC_META_URL, tk->psz_codec_download_url ); } } - if( p_sys->i_tags_position >= 0 ) + if( i_tags_position >= 0 ) { vlc_bool_t b_seekable; - stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable ); + stream_Control( sys.demuxer.s, STREAM_CAN_FASTSEEK, &b_seekable ); if( b_seekable ) { - LoadTags( p_demux ); + LoadTags( ); } } } @@ -2416,22 +3228,20 @@ static void InformationCreate( demux_t *p_demux ) * Divers *****************************************************************************/ -static void IndexAppendCluster( demux_t *p_demux, KaxCluster *cluster ) +void matroska_segment_t::IndexAppendCluster( KaxCluster *cluster ) { - demux_sys_t *p_sys = p_demux->p_sys; - -#define idx p_sys->index[p_sys->i_index] +#define idx index[i_index] idx.i_track = -1; idx.i_block_number= -1; idx.i_position = cluster->GetElementPosition(); idx.i_time = -1; idx.b_key = VLC_TRUE; - p_sys->i_index++; - if( p_sys->i_index >= p_sys->i_index_max ) + i_index++; + if( i_index >= i_index_max ) { - p_sys->i_index_max += 1024; - p_sys->index = (mkv_index_t*)realloc( p_sys->index, sizeof( mkv_index_t ) * p_sys->i_index_max ); + i_index_max += 1024; + index = (mkv_index_t*)realloc( index, sizeof( mkv_index_t ) * i_index_max ); } #undef idx } @@ -2464,3 +3274,351 @@ static char * UTF8ToStr( const UTFstring &u ) return dst; } +void chapter_edition_t::RefreshChapters( input_title_t & title ) +{ + int64_t i_prev_user_time = 0; + std::vector::iterator index = chapters.begin(); + + while ( index != chapters.end() ) + { + i_prev_user_time = (*index).RefreshChapters( b_ordered, i_prev_user_time, title ); + index++; + } +} + +int64_t chapter_item_t::RefreshChapters( bool b_ordered, int64_t i_prev_user_time, input_title_t & title ) +{ + int64_t i_user_time = i_prev_user_time; + + // first the sub-chapters, and then ourself + std::vector::iterator index = sub_chapters.begin(); + while ( index != sub_chapters.end() ) + { + i_user_time = (*index).RefreshChapters( b_ordered, i_user_time, title ); + index++; + } + + if ( b_ordered ) + { + i_user_start_time = i_prev_user_time; + if ( i_end_time != -1 && i_user_time == i_prev_user_time ) + { + i_user_end_time = i_user_start_time - i_start_time + i_end_time; + } + else + { + i_user_end_time = i_user_time; + } + } + else + { + std::sort( sub_chapters.begin(), sub_chapters.end() ); + i_user_start_time = i_start_time; + i_user_end_time = i_end_time; + } + + if (b_display_seekpoint) + { + seekpoint_t *sk = vlc_seekpoint_New(); + +// sk->i_level = i_level; + sk->i_time_offset = i_start_time; + sk->psz_name = strdup( psz_name.c_str() ); + + // A start time of '0' is ok. A missing ChapterTime element is ok, too, because '0' is its default value. + title.i_seekpoint++; + title.seekpoint = (seekpoint_t**)realloc( title.seekpoint, title.i_seekpoint * sizeof( seekpoint_t* ) ); + title.seekpoint[title.i_seekpoint-1] = sk; + } + + i_seekpoint_num = title.i_seekpoint; + + return i_user_end_time; +} + +double chapter_edition_t::Duration() const +{ + double f_result = 0.0; + + if ( chapters.size() ) + { + std::vector::const_iterator index = chapters.end(); + index--; + f_result = (*index).i_user_end_time; + } + + return f_result; +} + +const chapter_item_t *chapter_item_t::FindTimecode( mtime_t i_user_timecode ) const +{ + const chapter_item_t *psz_result = NULL; + + if (i_user_timecode >= i_user_start_time && i_user_timecode < i_user_end_time) + { + std::vector::const_iterator index = sub_chapters.begin(); + while ( index != sub_chapters.end() && psz_result == NULL ) + { + psz_result = (*index).FindTimecode( i_user_timecode ); + index++; + } + + if ( psz_result == NULL ) + psz_result = this; + } + + return psz_result; +} + +const chapter_item_t *chapter_edition_t::FindTimecode( mtime_t i_user_timecode ) const +{ + const chapter_item_t *psz_result = NULL; + + std::vector::const_iterator index = chapters.begin(); + while ( index != chapters.end() && psz_result == NULL ) + { + psz_result = (*index).FindTimecode( i_user_timecode ); + index++; + } + + return psz_result; +} + +void demux_sys_t::PreloadFamily( ) +{ +/* family handling disabled for the moment + matroska_stream_t *p_stream = Stream(); + if ( p_stream ) + { + matroska_segment_t *p_segment = p_stream->Segment(); + if ( p_segment ) + { + for (size_t i=0; iPreloadFamily( *p_segment ); + } + } + } +*/ +} + +void matroska_stream_t::PreloadFamily( const matroska_segment_t & of_segment ) +{ + for (size_t i=0; iPreloadFamily( of_segment ); + } +} + +bool matroska_segment_t::PreloadFamily( const matroska_segment_t & of_segment ) +{ + if ( b_preloaded ) + return false; + + for (size_t i=0; iAddSegment( opened_segments[i] ); + } + } while ( i_preloaded ); // worst case: will stop when all segments are found as linked + + p_current_segment->Sort( ); + + p_current_segment->PreloadLinked( ); +} + +void demux_sys_t::PreparePlayback( ) +{ + f_duration = p_current_segment->Duration(); + p_current_segment->LoadCues(); +} + +bool matroska_segment_t::CompareSegmentUIDs( const matroska_segment_t * p_item_a, const matroska_segment_t * p_item_b ) +{ + EbmlBinary * p_itema = (EbmlBinary *)(&p_item_a->segment_uid); + if ( *p_itema == p_item_b->prev_segment_uid ) + return true; + + p_itema = (EbmlBinary *)(&p_item_a->next_segment_uid); + if ( *p_itema == p_item_b->segment_uid ) + return true; + + if ( *p_itema == p_item_b->prev_segment_uid ) + return true; + + return false; +} + +bool matroska_segment_t::Preload( ) +{ + if ( b_preloaded ) + return false; + + EbmlElement *el = NULL; + + ep->Reset(); + + while( ( el = ep->Get() ) != NULL ) + { + if( MKV_IS_ID( el, KaxInfo ) ) + { + ParseInfo( el ); + } + else if( MKV_IS_ID( el, KaxTracks ) ) + { + ParseTracks( el ); + } + else if( MKV_IS_ID( el, KaxSeekHead ) ) + { + ParseSeekHead( el ); + } + else if( MKV_IS_ID( el, KaxCues ) ) + { + msg_Dbg( &sys.demuxer, "| + Cues" ); + } + else if( MKV_IS_ID( el, KaxCluster ) ) + { + msg_Dbg( &sys.demuxer, "| + Cluster" ); + + cluster = (KaxCluster*)el; + + i_start_pos = cluster->GetElementPosition(); + + ep->Down(); + /* stop parsing the stream */ + break; + } + else if( MKV_IS_ID( el, KaxAttachments ) ) + { + msg_Dbg( &sys.demuxer, "| + Attachments FIXME TODO (but probably never supported)" ); + } + else if( MKV_IS_ID( el, KaxChapters ) ) + { + msg_Dbg( &sys.demuxer, "| + Chapters" ); + ParseChapters( el ); + } + else if( MKV_IS_ID( el, KaxTag ) ) + { + msg_Dbg( &sys.demuxer, "| + Tags FIXME TODO" ); + } + else + { + msg_Dbg( &sys.demuxer, "| + Unknown (%s)", typeid(*el).name() ); + } + } + + b_preloaded = true; + + return true; +} + +matroska_segment_t *demux_sys_t::FindSegment( const EbmlBinary & uid ) const +{ + for (size_t i=0; isegment_uid == uid ) + return opened_segments[i]; + } + return NULL; +} + +void virtual_segment_t::Sort() +{ + // keep the current segment index + matroska_segment_t *p_segment = linked_segments[i_current_segment]; + + std::sort( linked_segments.begin(), linked_segments.end(), matroska_segment_t::CompareSegmentUIDs ); + + for ( i_current_segment=0; i_current_segmentsegment_uid == linked_segments[i]->segment_uid ) + return 0; + } + + // find possible mates + for ( i=0; isegment_uid == linked_uids[i] + || p_segment->prev_segment_uid == linked_uids[i] + || p_segment->next_segment_uid == linked_uids[i] ) + { + linked_segments.push_back( p_segment ); + + AppendUID( p_segment->prev_segment_uid ); + AppendUID( p_segment->next_segment_uid ); + + return 1; + } + } + return 0; +} + +void virtual_segment_t::PreloadLinked( ) +{ + for ( size_t i=0; iPreload( ); + } +} + +float virtual_segment_t::Duration() const +{ + float f_duration = 0.0; + for ( size_t i=0; if_duration; + } + return f_duration; +} + +void virtual_segment_t::LoadCues( ) +{ + for ( size_t i=0; iLoadCues(); + } +} + +void virtual_segment_t::AppendUID( const EbmlBinary & UID ) +{ + if ( UID.GetBuffer() == NULL ) + return; + + for (size_t i=0; i