X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmkv.cpp;h=966c00de55d1aa7d610a882e07617d31b607f39e;hb=f35cdf2aa8b7dbb85043b238064f0740e4b2444d;hp=131e053acf5d9393060fc1f19c8d7b6ecd9af3f2;hpb=e3078ba375ee0a8cfee6f6d2b2877500f7a5482b;p=vlc diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index 131e053acf..966c00de55 100644 --- a/modules/demux/mkv.cpp +++ b/modules/demux/mkv.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * mkv.cpp : matroska demuxer ***************************************************************************** - * Copyright (C) 2003-2004 VideoLAN + * Copyright (C) 2003-2004 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -99,11 +99,6 @@ extern "C" { #define MKVD_TIMECODESCALE 1000000 //////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef VSLHC1 -#define DVDNAV_COMPILE -#include -#else /* VSLHC */ - #undef ATTRIBUTE_PACKED #undef PRAGMA_PACK_BEGIN #undef PRAGMA_PACK_END @@ -364,8 +359,6 @@ typedef struct { #if PRAGMA_PACK #pragma pack() #endif - -#endif /* VSLHC */ //////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -388,7 +381,7 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); - set_shortname( _("Matroska") ); + set_shortname( "Matroska" ); set_description( _("Matroska stream demuxer" ) ); set_capability( "demux2", 50 ); set_callbacks( Open, Close ); @@ -397,19 +390,19 @@ vlc_module_begin(); add_bool( "mkv-use-ordered-chapters", 1, NULL, N_("Ordered chapters"), - N_("Play ordered chapters as specified in the segment"), VLC_TRUE ); + N_("Play ordered chapters as specified in the segment."), VLC_TRUE ); add_bool( "mkv-use-chapter-codec", 1, NULL, N_("Chapter codecs"), - N_("Use chapter codecs found in the segment"), VLC_TRUE ); + N_("Use chapter codecs found in the segment."), 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 ); + N_("Seek based on percent not time."), + N_("Seek based on percent not time."), VLC_TRUE ); add_bool( "mkv-use-dummy", 0, NULL, N_("Dummy Elements"), - N_("Read and discard unknown EBML elements (not good for broken files)"), VLC_TRUE ); + N_("Read and discard unknown EBML elements (not good for broken files)."), VLC_TRUE ); add_shortcut( "mka" ); add_shortcut( "mkv" ); @@ -499,9 +492,16 @@ class vlc_stream_io_callback: public IOCallback private: stream_t *s; vlc_bool_t mb_eof; + vlc_bool_t b_owner; public: - vlc_stream_io_callback( stream_t * ); + vlc_stream_io_callback( stream_t *, vlc_bool_t ); + + virtual ~vlc_stream_io_callback() + { + if( b_owner ) + stream_Delete( s ); + } virtual uint32 read ( void *p_buffer, size_t i_size); virtual void setFilePointer ( int64_t i_offset, seek_mode mode = seek_beginning ); @@ -524,6 +524,7 @@ class EbmlParser void Reset( demux_t *p_demux ); EbmlElement *Get( void ); void Keep( void ); + EbmlElement *UnGet( uint64 i_block_pos, uint64 i_cluster_pos ); int GetLevel( void ); @@ -617,15 +618,37 @@ class chapter_codec_cmds_c { public: chapter_codec_cmds_c( demux_sys_t & demuxer, int codec_id = -1) - :i_codec_id( codec_id ) + :p_private_data(NULL) + ,i_codec_id( codec_id ) ,sys( demuxer ) {} - virtual ~chapter_codec_cmds_c() {} + virtual ~chapter_codec_cmds_c() + { + delete p_private_data; + std::vector::iterator indexe = enter_cmds.begin(); + while ( indexe != enter_cmds.end() ) + { + delete (*indexe); + indexe++; + } + std::vector::iterator indexl = leave_cmds.begin(); + while ( indexl != leave_cmds.end() ) + { + delete (*indexl); + indexl++; + } + std::vector::iterator indexd = during_cmds.begin(); + while ( indexd != during_cmds.end() ) + { + delete (*indexd); + indexd++; + } + } void SetPrivate( const KaxChapterProcessPrivate & private_data ) { - m_private_data = *( new KaxChapterProcessPrivate( private_data ) ); + p_private_data = new KaxChapterProcessPrivate( private_data ); } void AddCommand( const KaxChapterProcessCommand & command ); @@ -634,13 +657,14 @@ public: virtual bool Enter() { return false; } virtual bool Leave() { return false; } virtual std::string GetCodecName( bool f_for_title = false ) const { return ""; } + virtual int16 GetTitleNumber() { return -1; } - KaxChapterProcessPrivate m_private_data; + KaxChapterProcessPrivate *p_private_data; protected: - std::vector enter_cmds; - std::vector during_cmds; - std::vector leave_cmds; + std::vector enter_cmds; + std::vector during_cmds; + std::vector leave_cmds; int i_codec_id; demux_sys_t & sys; @@ -757,14 +781,15 @@ protected: // DVD command IDs // Tests - // wether the test has to be positive or not - static const uint16 CMD_DVD_IF_NOT = 0x10; // wether it's a comparison on the value or register static const uint16 CMD_DVD_TEST_VALUE = 0x80; - static const uint16 CMD_DVD_IF_GPREG_AND = (0 << 5); - static const uint16 CMD_DVD_IF_GPREG_EQUAL = (1 << 5); - static const uint16 CMD_DVD_IF_GPREG_SUP_EQUAL = (2 << 5); - static const uint16 CMD_DVD_IF_GPREG_INF = (3 << 5); + static const uint16 CMD_DVD_IF_GPREG_AND = (1 << 4); + static const uint16 CMD_DVD_IF_GPREG_EQUAL = (2 << 4); + static const uint16 CMD_DVD_IF_GPREG_NOT_EQUAL = (3 << 4); + static const uint16 CMD_DVD_IF_GPREG_SUP_EQUAL = (4 << 4); + static const uint16 CMD_DVD_IF_GPREG_SUP = (5 << 4); + static const uint16 CMD_DVD_IF_GPREG_INF_EQUAL = (6 << 4); + static const uint16 CMD_DVD_IF_GPREG_INF = (7 << 4); static const uint16 CMD_DVD_NOP = 0x0000; static const uint16 CMD_DVD_GOTO_LINE = 0x0001; @@ -776,12 +801,13 @@ protected: static const uint16 CMD_DVD_LINKCN = 0x2007; static const uint16 CMD_DVD_JUMP_TT = 0x3002; static const uint16 CMD_DVD_JUMPVTS_TT = 0x3003; + static const uint16 CMD_DVD_JUMPVTS_PTT = 0x3005; static const uint16 CMD_DVD_JUMP_SS = 0x3006; static const uint16 CMD_DVD_CALLSS_VTSM1 = 0x3008; // static const uint16 CMD_DVD_SET_HL_BTNN2 = 0x4600; static const uint16 CMD_DVD_SET_HL_BTNN_LINKPGCN1 = 0x4604; - static const uint16 CMD_DVD_SET_AUDIO = 0x5100; + static const uint16 CMD_DVD_SET_STREAM = 0x5100; static const uint16 CMD_DVD_SET_GPRMMD = 0x5300; static const uint16 CMD_DVD_SET_HL_BTNN1 = 0x5600; static const uint16 CMD_DVD_SET_HL_BTNN_LINKPGCN2 = 0x5604; @@ -795,10 +821,15 @@ protected: static const uint16 CMD_DVD_GPREG_AND_VALUE = 0x7900; // callbacks when browsing inside CodecPrivate - static bool MatchTitleNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); - static bool MatchPgcType ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); - static bool MatchPgcNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); - static bool MatchCellNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchIsDomain ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchIsVMG ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchVTSNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchVTSMNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchTitleNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchPgcType ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchPgcNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchChapterNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchCellNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); }; class dvd_chapter_codec_c : public chapter_codec_cmds_c @@ -811,6 +842,7 @@ public: bool Enter(); bool Leave(); std::string GetCodecName( bool f_for_title = false ) const; + int16 GetTitleNumber(); }; class matroska_script_interpretor_c @@ -850,7 +882,16 @@ protected: class chapter_translation_c { public: - KaxChapterTranslateID translated; + chapter_translation_c() + :p_translated(NULL) + {} + + ~chapter_translation_c() + { + delete p_translated; + } + + KaxChapterTranslateID *p_translated; unsigned int codec_id; std::vector editions; }; @@ -888,7 +929,7 @@ public: int64_t RefreshChapters( bool b_ordered, int64_t i_prev_user_time ); int PublishChapters( input_title_t & title, int & i_user_chapters, int i_level = 0 ); - chapter_item_c * FindTimecode( mtime_t i_timecode ); + virtual chapter_item_c * FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current, bool & b_found ); void Append( const chapter_item_c & edition ); chapter_item_c * FindChapter( int64_t i_find_uid ); virtual chapter_item_c *BrowseCodecPrivate( unsigned int codec_id, @@ -897,6 +938,7 @@ public: size_t i_cookie_size ); std::string GetCodecName( bool f_for_title = false ) const; bool ParentOf( const chapter_item_c & item ) const; + int16 GetTitleNumber( ) 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 */ @@ -918,7 +960,7 @@ public: bool Enter( bool b_do_subchapters ); bool Leave( bool b_do_subchapters ); - bool EnterAndLeave( chapter_item_c *p_item ); + bool EnterAndLeave( chapter_item_c *p_item, bool b_enter = true ); }; class chapter_edition_c : public chapter_item_c @@ -931,6 +973,7 @@ public: void RefreshChapters( ); mtime_t Duration() const; std::string GetMainName() const; + chapter_item_c * FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current ); bool b_ordered; }; @@ -948,7 +991,12 @@ public: ,i_chapters_position(-1) ,i_tags_position(-1) ,cluster(NULL) + ,i_block_pos(0) + ,i_cluster_pos(0) ,i_start_pos(0) + ,p_segment_uid(NULL) + ,p_prev_segment_uid(NULL) + ,p_next_segment_uid(NULL) ,b_cues(VLC_FALSE) ,i_index(0) ,i_index_max(1024) @@ -962,7 +1010,7 @@ public: ,ep(NULL) ,b_preloaded(false) { - index = (mkv_index_t*)malloc( sizeof( mkv_index_t ) * i_index_max ); + p_indexes = (mkv_index_t*)malloc( sizeof( mkv_index_t ) * i_index_max ); } virtual ~matroska_segment_c() @@ -973,14 +1021,14 @@ public: { free( tracks[i_track]->fmt.psz_description ); } - if( tracks[i_track]->psz_codec ) +/* if( tracks[i_track]->psz_codec ) { free( tracks[i_track]->psz_codec ); } if( tracks[i_track]->fmt.psz_language ) { free( tracks[i_track]->fmt.psz_language ); - } + }*/ delete tracks[i_track]; } @@ -1004,10 +1052,13 @@ public: { free( psz_date_utc ); } - if ( index ) - free( index ); + if ( p_indexes ) + free( p_indexes ); delete ep; + delete p_segment_uid; + delete p_prev_segment_uid; + delete p_next_segment_uid; std::vector::iterator index = stored_editions.begin(); while ( index != stored_editions.end() ) @@ -1015,6 +1066,12 @@ public: delete (*index); index++; } + std::vector::iterator indext = translations.begin(); + while ( indext != translations.end() ) + { + delete (*indext); + indext++; + } } KaxSegment *segment; @@ -1036,15 +1093,17 @@ public: int64_t i_tags_position; KaxCluster *cluster; + uint64 i_block_pos; + uint64 i_cluster_pos; int64_t i_start_pos; - KaxSegmentUID segment_uid; - KaxPrevUID prev_segment_uid; - KaxNextUID next_segment_uid; + KaxSegmentUID *p_segment_uid; + KaxPrevUID *p_prev_segment_uid; + KaxNextUID *p_next_segment_uid; vlc_bool_t b_cues; int i_index; int i_index_max; - mkv_index_t *index; + mkv_index_t *p_indexes; /* info */ char *psz_muxing_application; @@ -1059,7 +1118,7 @@ public: std::vector stored_editions; int i_default_edition; - std::vector translations; + std::vector translations; std::vector families; demux_sys_t & sys; @@ -1080,7 +1139,7 @@ public: void LoadTags( ); void InformationCreate( ); void Seek( mtime_t i_date, mtime_t i_time_offset ); - int BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ); + 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( ); @@ -1100,9 +1159,9 @@ public: { linked_segments.push_back( p_segment ); - AppendUID( p_segment->segment_uid ); - AppendUID( p_segment->prev_segment_uid ); - AppendUID( p_segment->next_segment_uid ); + AppendUID( p_segment->p_segment_uid ); + AppendUID( p_segment->p_prev_segment_uid ); + AppendUID( p_segment->p_next_segment_uid ); } void Sort(); @@ -1170,7 +1229,7 @@ protected: int i_current_edition; chapter_item_c *psz_current_chapter; - void AppendUID( const EbmlBinary & UID ); + void AppendUID( const EbmlBinary * UID ); }; class matroska_stream_c @@ -1215,6 +1274,7 @@ public: demux_sys_t( demux_t & demux ) :demuxer(demux) ,i_pts(0) + ,i_last_dts(0) ,i_start_pts(0) ,i_chapter_time(0) ,meta(NULL) @@ -1224,9 +1284,11 @@ public: ,f_duration(-1.0) ,b_ui_hooked(false) ,p_input(NULL) - ,i_curr_button(0) + ,b_pci_packet_set(false) ,p_ev(NULL) - {} + { + vlc_mutex_init( &demuxer, &lock_demuxer ); + } virtual ~demux_sys_t() { @@ -1238,18 +1300,20 @@ public: delete opened_segments[i]; for ( i=0; i titles; // matroska editions + std::vector titles; // matroska editions size_t i_current_title; std::vector streams; @@ -1274,6 +1338,7 @@ public: void PreloadLinked( matroska_segment_c *p_segment ); bool PreparePlayback( virtual_segment_c *p_new_segment ); matroska_stream_c *AnalyseAllSegmentsFound( EbmlStream *p_estream ); + void JumpTo( virtual_segment_c & p_segment, chapter_item_c * p_chapter ); void StartUiThread(); void StopUiThread(); @@ -1283,8 +1348,9 @@ public: /* for spu variables */ input_thread_t *p_input; pci_t pci_packet; - int16 i_curr_button; - uint8_t alpha[4]; + bool b_pci_packet_set; + uint8_t palette[4][4]; + vlc_mutex_t lock_demuxer; /* event */ event_thread_t *p_ev; @@ -1307,7 +1373,10 @@ static void Seek ( demux_t *, mtime_t i_date, double f_percent, chapter_item_c #define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId ) -static char *UTF8ToStr ( const UTFstring &u ); +static inline char * ToUTF8( const UTFstring &u ) +{ + return strdup( u.GetUTF8().c_str() ); +} /***************************************************************************** * Open: initializes matroska demux structures @@ -1335,7 +1404,7 @@ static int Open( vlc_object_t * p_this ) p_demux->pf_control = Control; 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_callback = new vlc_stream_io_callback( p_demux->s, VLC_FALSE ); p_io_stream = new EbmlStream( *p_io_callback ); if( p_io_stream == NULL ) @@ -1411,22 +1480,31 @@ static int Open( vlc_object_t * p_this ) !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); - - p_stream = p_sys->AnalyseAllSegmentsFound( p_estream ); - if ( p_stream == NULL ) + // test wether this file belongs to our family + stream_t *p_file_stream = stream_UrlNew( p_demux, s_filename.c_str()); + if ( p_file_stream != NULL ) { - msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() ); - delete p_estream; - delete p_file_io; + vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, VLC_TRUE ); + EbmlStream *p_estream = new EbmlStream(*p_file_io); + + 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 ); + } } else { - p_stream->p_in = p_file_io; - p_stream->p_es = p_estream; - p_sys->streams.push_back( p_stream ); + msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() ); } } } @@ -1442,6 +1520,8 @@ static int Open( vlc_object_t * p_this ) msg_Err( p_demux, "cannot use the segment" ); goto error; } + + p_sys->StartUiThread(); return VLC_SUCCESS; @@ -1517,7 +1597,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) for( size_t i = 0; i < p_sys->titles.size(); i++ ) { - (*ppp_title)[i] = vlc_input_title_Duplicate( &p_sys->titles[i] ); + (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] ); } return VLC_SUCCESS; @@ -1529,7 +1609,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) i_idx = (int)va_arg( args, int ); if( i_idx < p_sys->used_segments.size() ) { - p_sys->PreparePlayback( p_sys->used_segments[i_idx] ); + p_sys->JumpTo( *p_sys->used_segments[i_idx], NULL ); return VLC_SUCCESS; } return VLC_EGENERIC; @@ -1538,9 +1618,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) i_skp = (int)va_arg( args, int ); // TODO change the way it works with the << & >> buttons on the UI (+1/-1 instead of a number) - if( p_sys->titles.size() && i_skp < p_sys->titles[p_sys->i_current_title].i_seekpoint) + if( p_sys->titles.size() && i_skp < p_sys->titles[p_sys->i_current_title]->i_seekpoint) { - Seek( p_demux, (int64_t)p_sys->titles[p_sys->i_current_title].seekpoint[i_skp]->i_time_offset, -1, NULL); + Seek( p_demux, (int64_t)p_sys->titles[p_sys->i_current_title]->seekpoint[i_skp]->i_time_offset, -1, NULL); p_demux->info.i_seekpoint |= INPUT_UPDATE_SEEKPOINT; p_demux->info.i_seekpoint = i_skp; return VLC_SUCCESS; @@ -1554,11 +1634,11 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } } -int matroska_segment_c::BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ) +int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ) { - *pp_block = NULL; - *pi_ref1 = -1; - *pi_ref2 = -1; + pp_block = NULL; + *pi_ref1 = 0; + *pi_ref2 = 0; for( ;; ) { @@ -1571,14 +1651,14 @@ int matroska_segment_c::BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t el = ep->Get(); i_level = ep->GetLevel(); - if( el == NULL && *pp_block != NULL ) + if( el == NULL && pp_block != NULL ) { /* update the index */ -#define idx index[i_index - 1] +#define idx p_indexes[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; + idx.i_time = (*pp_block).GlobalTimecode() / (mtime_t)1000; + idx.b_key = *pi_ref1 == 0 ? VLC_TRUE : VLC_FALSE; } #undef idx return VLC_SUCCESS; @@ -1602,10 +1682,11 @@ int matroska_segment_c::BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t if( MKV_IS_ID( el, KaxCluster ) ) { cluster = (KaxCluster*)el; + i_cluster_pos = cluster->GetElementPosition(); /* add it to the index */ if( i_index == 0 || - ( i_index > 0 && index[i_index - 1].i_position < (int64_t)cluster->GetElementPosition() ) ) + ( i_index > 0 && p_indexes[i_index - 1].i_position < (int64_t)cluster->GetElementPosition() ) ) { IndexAppendCluster( cluster ); } @@ -1642,16 +1723,17 @@ int matroska_segment_c::BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t } else if( MKV_IS_ID( el, KaxBlockGroup ) ) { + i_block_pos = el->GetElementPosition(); ep->Down(); } break; case 3: if( MKV_IS_ID( el, KaxBlock ) ) { - *pp_block = (KaxBlock*)el; + pp_block = (KaxBlock*)el; - (*pp_block)->ReadData( es.I_O() ); - (*pp_block)->SetParent( *cluster ); + pp_block->ReadData( es.I_O() ); + pp_block->SetParent( *cluster ); ep->Keep(); } @@ -1667,13 +1749,13 @@ int matroska_segment_c::BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t KaxReferenceBlock &ref = *(KaxReferenceBlock*)el; ref.ReadData( es.I_O() ); - if( *pi_ref1 == -1 ) + if( *pi_ref1 == 0 ) { - *pi_ref1 = int64( ref ); + *pi_ref1 = int64( ref ) * cluster->GlobalTimecodeScale(); } else { - *pi_ref2 = int64( ref ); + *pi_ref2 = int64( ref ) * cluster->GlobalTimecodeScale(); } } else if( MKV_IS_ID( el, KaxClusterSilentTrackNumber ) ) @@ -1731,17 +1813,17 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, msg_Err( p_demux, "invalid track number=%d", block->TrackNum() ); return; } - if( tk->p_es == NULL ) + if( tk->fmt.i_cat != NAV_ES && 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 ) + if( i_pts + i_duration < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES ) { return; /* discard audio packets that shouldn't be rendered */ } - if ( tk->fmt.i_cat != SPU_ES || strcmp( tk->psz_codec, "B_VOBBTN" ) ) + if ( tk->fmt.i_cat != NAV_ES ) { es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b ); @@ -1784,37 +1866,46 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, } #endif + if ( tk->fmt.i_cat == NAV_ES ) + { + // TODO handle the start/stop times of this packet + if ( p_sys->b_ui_hooked ) + { + vlc_mutex_lock( &p_sys->p_ev->lock ); + memcpy( &p_sys->pci_packet, &p_block->p_buffer[1], sizeof(pci_t) ); + p_sys->SwapButtons(); + p_sys->b_pci_packet_set = true; + vlc_mutex_unlock( &p_sys->p_ev->lock ); + block_Release( p_block ); + } + return; + } // TODO implement correct timestamping when B frames are used +#if 0 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; + p_block->i_pts = i_pts; + p_block->i_dts = p_sys->i_pts; } +#else + p_block->i_pts = i_pts; + p_block->i_dts = p_sys->i_last_dts; +#endif - if ( tk->fmt.i_cat == SPU_ES ) +#if 0 +msg_Dbg( p_demux, "block i_dts: "I64Fd" / i_pts: "I64Fd, p_block->i_dts, p_block->i_pts); +#endif + if( strcmp( tk->psz_codec, "S_VOBSUB" ) ) { - if ( !strcmp( tk->psz_codec, "B_VOBBTN" ) ) - { - // TODO handle the start/stop times of this packet - if ( p_sys->b_ui_hooked ) - { - vlc_mutex_lock( &p_sys->p_ev->lock ); - memcpy( &p_sys->pci_packet, &p_block->p_buffer[1], sizeof(pci_t) ); - p_sys->SwapButtons(); - vlc_mutex_unlock( &p_sys->p_ev->lock ); - block_Release( p_block ); - } - return; - } - - else if ( strcmp( tk->psz_codec, "S_VOBSUB" ) ) - { - p_block->i_length = i_duration * 1000; - } + p_block->i_length = i_duration * 1000; + } + if( !strcmp( tk->psz_codec, "V_MS/VFW/FOURCC" ) ) + { + p_block->i_pts = 0; } es_out_Send( p_demux->out, tk->p_es, p_block ); @@ -1843,7 +1934,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream ) delete p_l0; // find all segments in this file - p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL); + p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFFLL); if (p_l0 == NULL) { return NULL; @@ -1882,15 +1973,16 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream ) if ( !b_keep_segment ) break; // this segment is already known opened_segments.push_back( p_segment1 ); - p_segment1->segment_uid = *( new KaxSegmentUID(*p_uid) ); + delete p_segment1->p_segment_uid; + p_segment1->p_segment_uid = new KaxSegmentUID(*p_uid); } else if( MKV_IS_ID( l, KaxPrevUID ) ) { - p_segment1->prev_segment_uid = *( new KaxPrevUID( *static_cast(l) ) ); + p_segment1->p_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) ) ); + p_segment1->p_next_segment_uid = new KaxNextUID( *static_cast(l) ); } else if( MKV_IS_ID( l, KaxSegmentFamily ) ) { @@ -1928,13 +2020,14 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) size_t i_track; /* add all es */ - msg_Dbg( &sys.demuxer, "found %d es", tracks.size() ); - sys.StopUiThread(); + msg_Dbg( &sys.demuxer, "found %d es", (int)tracks.size() ); + sys.b_pci_packet_set = false; + for( i_track = 0; i_track < tracks.size(); i_track++ ) { if( tracks[i_track]->fmt.i_cat == UNKNOWN_ES ) { - msg_Warn( &sys.demuxer, "invalid track[%d, n=%d]", i_track, tracks[i_track]->i_number ); + msg_Warn( &sys.demuxer, "invalid track[%d, n=%d]", (int)i_track, tracks[i_track]->i_number ); tracks[i_track]->p_es = NULL; continue; } @@ -1989,16 +2082,10 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) else if( !strcmp( tracks[i_track]->psz_codec, "V_QUICKTIME" ) ) { MP4_Box_t *p_box = (MP4_Box_t*)malloc( sizeof( MP4_Box_t ) ); -#ifdef VSLHC - stream_t *p_mp4_stream = stream_MemoryNew( VLC_OBJECT(&sys.demuxer), - tracks[i_track]->p_extra_data, - tracks[i_track]->i_extra_data ); -#else stream_t *p_mp4_stream = stream_MemoryNew( VLC_OBJECT(&sys.demuxer), tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data, VLC_FALSE ); -#endif MP4_ReadBoxCommon( p_mp4_stream, p_box ); MP4_ReadBox_sample_vide( p_mp4_stream, p_box ); tracks[i_track]->fmt.i_codec = p_box->i_type; @@ -2008,11 +2095,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->fmt.i_extra ); memcpy( tracks[i_track]->fmt.p_extra, p_box->data.p_sample_vide->p_qt_image_description, tracks[i_track]->fmt.i_extra ); MP4_FreeBox_sample_vide( p_box ); -#ifdef VSLHC - stream_MemoryDelete( p_mp4_stream, VLC_TRUE ); -#else stream_Delete( p_mp4_stream ); -#endif } else if( !strcmp( tracks[i_track]->psz_codec, "A_MS/ACM" ) ) { @@ -2161,13 +2244,13 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) else if( !strcmp( tracks[i_track]->psz_codec, "A_TTA1" ) ) { /* FIXME: support this codec */ - msg_Err( &sys.demuxer, "TTA not supported yet[%d, n=%d]", i_track, tracks[i_track]->i_number ); + msg_Err( &sys.demuxer, "TTA not supported yet[%d, n=%d]", (int)i_track, tracks[i_track]->i_number ); tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); } else if( !strcmp( tracks[i_track]->psz_codec, "A_WAVPACK4" ) ) { /* FIXME: support this codec */ - msg_Err( &sys.demuxer, "Wavpack not supported yet[%d, n=%d]", i_track, tracks[i_track]->i_number ); + msg_Err( &sys.demuxer, "Wavpack not supported yet[%d, n=%d]", (int)i_track, tracks[i_track]->i_number ); tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); } else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/UTF8" ) ) @@ -2208,8 +2291,8 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) } else if( !strcmp( tracks[i_track]->psz_codec, "B_VOBBTN" ) ) { - tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's','p','u',' ' ); - sys.StartUiThread(); + tracks[i_track]->fmt.i_cat = NAV_ES; + continue; } else { @@ -2250,13 +2333,14 @@ void demux_sys_t::StartUiThread() var_Create( p_input, "x-end", VLC_VAR_INTEGER ); var_Create( p_input, "y-end", VLC_VAR_INTEGER ); var_Create( p_input, "color", VLC_VAR_ADDRESS ); - var_Create( p_input, "menu-contrast", VLC_VAR_ADDRESS ); + var_Create( p_input, "menu-palette", VLC_VAR_ADDRESS ); var_Create( p_input, "highlight", VLC_VAR_BOOL ); var_Create( p_input, "highlight-mutex", VLC_VAR_MUTEX ); /* Now create our event thread catcher */ p_ev = (event_thread_t *) vlc_object_create( &demuxer, sizeof( event_thread_t ) ); p_ev->p_demux = &demuxer; + p_ev->b_die = VLC_FALSE; vlc_mutex_init( p_ev, &p_ev->lock ); vlc_thread_create( p_ev, "mkv event thread handler", EventThread, VLC_THREAD_PRIORITY_LOW, VLC_FALSE ); @@ -2269,6 +2353,11 @@ void demux_sys_t::StopUiThread() { p_ev->b_die = VLC_TRUE; + vlc_thread_join( p_ev ); + vlc_object_destroy( p_ev ); + + p_ev = NULL; + var_Destroy( p_input, "highlight-mutex" ); var_Destroy( p_input, "highlight" ); var_Destroy( p_input, "x-start" ); @@ -2276,10 +2365,9 @@ void demux_sys_t::StopUiThread() var_Destroy( p_input, "y-start" ); var_Destroy( p_input, "y-end" ); var_Destroy( p_input, "color" ); - var_Destroy( p_input, "menu-contrast" ); + var_Destroy( p_input, "menu-palette" ); - vlc_thread_join( p_ev ); - vlc_object_destroy( p_ev ); + vlc_object_release( p_input ); msg_Dbg( &demuxer, "Stopping the UI Hook" ); } @@ -2327,6 +2415,13 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) /* main loop */ while( !p_ev->b_die ) { + if ( !p_sys->b_pci_packet_set ) + { + /* Wait 100ms */ + msleep( 100000 ); + continue; + } + vlc_bool_t b_activated = VLC_FALSE; /* KEY part */ @@ -2349,23 +2444,118 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) } } + uint16 i_curr_button = p_sys->dvd_interpretor.GetSPRM( 0x88 ); + switch( i_action ) { case ACTIONID_NAV_LEFT: -// dvdnav_left_button_select( NULL, pci ); + if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns ) + { + btni_t *p_button_ptr = &(pci->hli.btnit[i_curr_button-1]); + if ( p_button_ptr->left > 0 && p_button_ptr->left <= pci->hli.hl_gi.btn_ns ) + { + i_curr_button = p_button_ptr->left; + p_sys->dvd_interpretor.SetSPRM( 0x88, i_curr_button ); + btni_t button_ptr = pci->hli.btnit[i_curr_button-1]; + if ( button_ptr.auto_action_mode ) + { + vlc_mutex_unlock( &p_ev->lock ); + vlc_mutex_lock( &p_sys->lock_demuxer ); + + // process the button action + p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 ); + + vlc_mutex_unlock( &p_sys->lock_demuxer ); + vlc_mutex_lock( &p_ev->lock ); + } + } + } break; case ACTIONID_NAV_RIGHT: -// dvdnav_right_button_select( NULL, pci ); + if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns ) + { + btni_t *p_button_ptr = &(pci->hli.btnit[i_curr_button-1]); + if ( p_button_ptr->right > 0 && p_button_ptr->right <= pci->hli.hl_gi.btn_ns ) + { + i_curr_button = p_button_ptr->right; + p_sys->dvd_interpretor.SetSPRM( 0x88, i_curr_button ); + btni_t button_ptr = pci->hli.btnit[i_curr_button-1]; + if ( button_ptr.auto_action_mode ) + { + vlc_mutex_unlock( &p_ev->lock ); + vlc_mutex_lock( &p_sys->lock_demuxer ); + + // process the button action + p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 ); + + vlc_mutex_unlock( &p_sys->lock_demuxer ); + vlc_mutex_lock( &p_ev->lock ); + } + } + } break; case ACTIONID_NAV_UP: -// dvdnav_upper_button_select( NULL, pci ); + if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns ) + { + btni_t *p_button_ptr = &(pci->hli.btnit[i_curr_button-1]); + if ( p_button_ptr->up > 0 && p_button_ptr->up <= pci->hli.hl_gi.btn_ns ) + { + i_curr_button = p_button_ptr->up; + p_sys->dvd_interpretor.SetSPRM( 0x88, i_curr_button ); + btni_t button_ptr = pci->hli.btnit[i_curr_button-1]; + if ( button_ptr.auto_action_mode ) + { + vlc_mutex_unlock( &p_ev->lock ); + vlc_mutex_lock( &p_sys->lock_demuxer ); + + // process the button action + p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 ); + + vlc_mutex_unlock( &p_sys->lock_demuxer ); + vlc_mutex_lock( &p_ev->lock ); + } + } + } break; case ACTIONID_NAV_DOWN: -// dvdnav_lower_button_select( NULL, pci ); + if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns ) + { + btni_t *p_button_ptr = &(pci->hli.btnit[i_curr_button-1]); + if ( p_button_ptr->down > 0 && p_button_ptr->down <= pci->hli.hl_gi.btn_ns ) + { + i_curr_button = p_button_ptr->down; + p_sys->dvd_interpretor.SetSPRM( 0x88, i_curr_button ); + btni_t button_ptr = pci->hli.btnit[i_curr_button-1]; + if ( button_ptr.auto_action_mode ) + { + vlc_mutex_unlock( &p_ev->lock ); + vlc_mutex_lock( &p_sys->lock_demuxer ); + + // process the button action + p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 ); + + vlc_mutex_unlock( &p_sys->lock_demuxer ); + vlc_mutex_lock( &p_ev->lock ); + } + } + } break; case ACTIONID_NAV_ACTIVATE: b_activated = VLC_TRUE; -// dvdnav_button_activate( NULL, pci ); + + if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns ) + { + btni_t button_ptr = pci->hli.btnit[i_curr_button-1]; + + vlc_mutex_unlock( &p_ev->lock ); + vlc_mutex_lock( &p_sys->lock_demuxer ); + + // process the button action + p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 ); + + vlc_mutex_unlock( &p_sys->lock_demuxer ); + vlc_mutex_lock( &p_ev->lock ); + } break; default: break; @@ -2374,7 +2564,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) vlc_mutex_unlock( &p_ev->lock ); } - /* VOUT part */ + /* MOUSE part */ if( p_vout && ( p_ev->b_moved || p_ev->b_clicked ) ) { vlc_value_t valx, valy; @@ -2384,11 +2574,6 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) var_Get( p_vout, "mouse-x", &valx ); var_Get( p_vout, "mouse-y", &valy ); - if( p_ev->b_moved ) - { -// dvdnav_mouse_select( NULL, pci, valx.i_int, valy.i_int ); - p_ev->b_moved = 0; - } if( p_ev->b_clicked ) { int32_t button; @@ -2403,8 +2588,10 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) { btni_t *button_ptr = &(pci->hli.btnit[button-1]); - if((valx.i_int >= button_ptr->x_start) && (valx.i_int <= button_ptr->x_end) && - (valy.i_int >= button_ptr->y_start) && (valy.i_int <= button_ptr->y_end)) + if(((unsigned)valx.i_int >= button_ptr->x_start) + && ((unsigned)valx.i_int <= button_ptr->x_end) + && ((unsigned)valy.i_int >= button_ptr->y_start) + && ((unsigned)valy.i_int <= button_ptr->y_end)) { mx = (button_ptr->x_start + button_ptr->x_end)/2; my = (button_ptr->y_start + button_ptr->y_end)/2; @@ -2422,58 +2609,75 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) if ( best != 0) { - btni_t *button_ptr = &(pci->hli.btnit[best-1]); + btni_t button_ptr = pci->hli.btnit[best-1]; + uint16 i_curr_button = p_sys->dvd_interpretor.GetSPRM( 0x88 ); msg_Dbg( &p_sys->demuxer, "Clicked button %d", best ); + vlc_mutex_unlock( &p_ev->lock ); + vlc_mutex_lock( &p_sys->lock_demuxer ); // process the button action p_sys->dvd_interpretor.SetSPRM( 0x88, best ); - p_sys->dvd_interpretor.Interpret( button_ptr->cmd.bytes, 8 ); + p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 ); + + msg_Dbg( &p_sys->demuxer, "Processed button %d", best ); // select new button - if ( best != p_sys->i_curr_button ) + if ( best != i_curr_button ) { vlc_value_t val; if( var_Get( p_sys->p_input, "highlight-mutex", &val ) == VLC_SUCCESS ) { vlc_mutex_t *p_mutex = (vlc_mutex_t *) val.p_address; - btni_t *button_ptr = &(pci->hli.btnit[best-1]); uint32_t i_palette; - if(button_ptr->btn_coln != 0) { - i_palette = pci->hli.btn_colit.btn_coli[button_ptr->btn_coln-1][1]; + if(button_ptr.btn_coln != 0) { + i_palette = pci->hli.btn_colit.btn_coli[button_ptr.btn_coln-1][1]; } else { i_palette = 0; } - p_sys->alpha[0] = i_palette & 0x0f; - p_sys->alpha[1] = (i_palette>>4) & 0x0f; - p_sys->alpha[2] = (i_palette>>8) & 0x0f; - p_sys->alpha[3] = (i_palette>>12)& 0x0f; + + for( int i = 0; i < 4; i++ ) + { + uint32_t i_yuv = 0xFF;//p_sys->clut[(hl.palette>>(16+i*4))&0x0f]; + uint8_t i_alpha = (i_palette>>(i*4))&0x0f; + i_alpha = i_alpha == 0xf ? 0xff : i_alpha << 4; + + p_sys->palette[i][0] = (i_yuv >> 16) & 0xff; + p_sys->palette[i][1] = (i_yuv >> 0) & 0xff; + p_sys->palette[i][2] = (i_yuv >> 8) & 0xff; + p_sys->palette[i][3] = i_alpha; + } vlc_mutex_lock( p_mutex ); - val.i_int = button_ptr->x_start; var_Set( p_sys->p_input, "x-start", val ); - val.i_int = button_ptr->x_end; var_Set( p_sys->p_input, "x-end", val ); - val.i_int = button_ptr->y_start; var_Set( p_sys->p_input, "y-start", val ); - val.i_int = button_ptr->y_end; var_Set( p_sys->p_input, "y-end", val ); + val.i_int = button_ptr.x_start; var_Set( p_sys->p_input, "x-start", val ); + val.i_int = button_ptr.x_end; var_Set( p_sys->p_input, "x-end", val ); + val.i_int = button_ptr.y_start; var_Set( p_sys->p_input, "y-start", val ); + val.i_int = button_ptr.y_end; var_Set( p_sys->p_input, "y-end", val ); - val.p_address = (void *)p_sys->alpha; - var_Set( p_sys->p_input, "menu-contrast", val ); + val.p_address = (void *)p_sys->palette; + var_Set( p_sys->p_input, "menu-palette", val ); val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val ); vlc_mutex_unlock( p_mutex ); - - p_sys->i_curr_button = best; } } + vlc_mutex_unlock( &p_sys->lock_demuxer ); + vlc_mutex_lock( &p_ev->lock ); } } + else if( p_ev->b_moved ) + { +// dvdnav_mouse_select( NULL, pci, valx.i_int, valy.i_int ); + } p_ev->b_moved = VLC_FALSE; p_ev->b_clicked = VLC_FALSE; vlc_mutex_unlock( &p_ev->lock ); } + /* VOUT part */ if( p_vout && p_vout->b_die ) { var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev ); @@ -2482,7 +2686,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) p_vout = NULL; } - if( p_vout == NULL ) + else if( p_vout == NULL ) { p_vout = (vlc_object_t*) vlc_object_find( p_sys->p_input, VLC_OBJECT_VOUT, FIND_CHILD ); @@ -2493,7 +2697,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) } } - /* Wait a bit */ + /* Wait a bit, 10ms */ msleep( 10000 ); } @@ -2515,12 +2719,11 @@ void matroska_segment_c::UnSelect( ) { size_t i_track; - sys.StopUiThread(); - for( i_track = 0; i_track < tracks.size(); i_track++ ) { if ( tracks[i_track]->p_es != NULL ) { +// es_format_Clean( &tracks[i_track]->fmt ); es_out_Del( sys.demuxer.out, tracks[i_track]->p_es ); tracks[i_track]->p_es = NULL; } @@ -2601,12 +2804,13 @@ bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux ) { demux_sys_t & sys = *demux.p_sys; chapter_item_c *psz_curr_chapter; + bool b_has_seeked = false; /* update current chapter/seekpoint */ if ( p_editions->size() ) { /* 1st, we need to know in which chapter we are */ - psz_curr_chapter = (*p_editions)[i_current_edition]->FindTimecode( sys.i_pts ); + psz_curr_chapter = (*p_editions)[i_current_edition]->FindTimecode( sys.i_pts, psz_current_chapter ); /* we have moved to a new chapter */ if (psz_curr_chapter != NULL && psz_current_chapter != psz_curr_chapter) @@ -2614,24 +2818,24 @@ bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux ) if ( (*p_editions)[i_current_edition]->b_ordered ) { // Leave/Enter up to the link point - if ( !psz_curr_chapter->EnterAndLeave( psz_current_chapter ) ) + b_has_seeked = psz_curr_chapter->EnterAndLeave( psz_current_chapter ); + if ( !b_has_seeked ) { - // only seek if necessary + // only physically seek if necessary if ( psz_current_chapter == NULL || (psz_current_chapter->i_end_time != psz_curr_chapter->i_start_time) ) Seek( demux, sys.i_pts, 0, psz_curr_chapter ); - psz_current_chapter = psz_curr_chapter; } } - else if ( psz_curr_chapter->i_seekpoint_num > 0 ) - { - demux.info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT; - demux.info.i_title = sys.i_current_title = i_sys_title; - demux.info.i_seekpoint = psz_curr_chapter->i_seekpoint_num - 1; - psz_current_chapter = psz_curr_chapter; - } - else + + if ( !b_has_seeked ) { psz_current_chapter = psz_curr_chapter; + if ( psz_curr_chapter->i_seekpoint_num > 0 ) + { + demux.info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT; + demux.info.i_title = sys.i_current_title = i_sys_title; + demux.info.i_seekpoint = psz_curr_chapter->i_seekpoint_num - 1; + } } return true; @@ -2641,8 +2845,10 @@ bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux ) // out of the scope of the data described by chapters, leave the edition if ( (*p_editions)[i_current_edition]->b_ordered && psz_current_chapter != NULL ) { - if ( !(*p_editions)[i_current_edition]->EnterAndLeave( psz_current_chapter ) ) + if ( !(*p_editions)[i_current_edition]->EnterAndLeave( psz_current_chapter, false ) ) psz_current_chapter = NULL; + else + return true; } } } @@ -2765,9 +2971,9 @@ std::string chapter_item_c::GetCodecName( bool f_for_title ) const std::string dvd_chapter_codec_c::GetCodecName( bool f_for_title ) const { std::string result; - if ( m_private_data.GetSize() >= 3) + if ( p_private_data->GetSize() >= 3) { - const binary* p_data = m_private_data.GetBuffer(); + const binary* p_data = p_private_data->GetBuffer(); /* if ( p_data[0] == MATROSKA_DVD_LEVEL_TT ) { uint16_t i_title = (p_data[1] << 8) + p_data[2]; @@ -2803,6 +3009,35 @@ std::string dvd_chapter_codec_c::GetCodecName( bool f_for_title ) const return result; } +int16 chapter_item_c::GetTitleNumber( ) const +{ + int result = -1; + + std::vector::const_iterator index = codecs.begin(); + while ( index != codecs.end() ) + { + result = (*index)->GetTitleNumber( ); + if ( result >= 0 ) + break; + index++; + } + + return result; +} + +int16 dvd_chapter_codec_c::GetTitleNumber() +{ + if ( p_private_data->GetSize() >= 3) + { + const binary* p_data = p_private_data->GetBuffer(); + if ( p_data[0] == MATROSKA_DVD_LEVEL_SS ) + { + return int16( (p_data[2] << 8) + p_data[3] ); + } + } + return -1; +} + static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_item_c *psz_chapter ) { demux_sys_t *p_sys = p_demux->p_sys; @@ -2838,7 +3073,7 @@ static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_it 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) + if( p_segment->p_indexes[i_index].i_position >= i_pos) { break; } @@ -2848,10 +3083,10 @@ static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_it i_index--; } - i_date = p_segment->index[i_index].i_time; + i_date = p_segment->p_indexes[i_index].i_time; #if 0 - if( p_segment->index[i_index].i_position < i_pos ) + if( p_segment->p_indexes[i_index].i_position < i_pos ) { EbmlElement *el; @@ -2891,46 +3126,52 @@ static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_it static int Demux( demux_t *p_demux) { demux_sys_t *p_sys = p_demux->p_sys; + + vlc_mutex_lock( &p_sys->lock_demuxer ); + virtual_segment_c *p_vsegment = p_sys->p_current_segment; - matroska_segment_c *p_segmet = p_vsegment->Segment(); - if ( p_segmet == NULL ) return 0; + matroska_segment_c *p_segment = p_vsegment->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; + int i_return = 0; for( ;; ) { if ( p_sys->demuxer.b_die ) - return 0; + break; if( p_sys->i_pts >= p_sys->i_start_pts ) if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) ) - return 1; + { + i_return = 1; + break; + } if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL ) { /* nothing left to read in this ordered edition */ if ( !p_vsegment->SelectNext() ) - return 0; - p_segmet->UnSelect( ); + break; + p_segment->UnSelect( ); es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); /* switch to the next segment */ - p_segmet = p_vsegment->Segment(); - if ( !p_segmet->Select( 0 ) ) + p_segment = p_vsegment->Segment(); + if ( !p_segment->Select( 0 ) ) { msg_Err( p_demux, "Failed to select new segment" ); - return 0; + break; } continue; } + KaxBlock *block; + int64_t i_block_duration = 0; + int64_t i_block_ref1; + int64_t i_block_ref2; - if( p_segmet->BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) + if( p_segment->BlockGet( block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) { if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered ) { @@ -2942,41 +3183,86 @@ static int Demux( demux_t *p_demux) if ( p_chap->i_user_start_time == p_chap->i_user_start_time ) p_vsegment->SelectNext(); */ - p_sys->i_pts = p_chap->i_user_end_time; + p_sys->i_last_dts = p_sys->i_pts = p_chap->i_user_end_time; p_sys->i_pts++; // trick to avoid staying on segments with no duration and no content - return 1; + i_return = 1; } - return 0; + break; } - msg_Warn( p_demux, "cannot get block EOF?" ); - p_segmet->UnSelect( ); - - es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); - - /* switch to the next segment */ - if ( !p_vsegment->SelectNext() ) - // no more segments in this stream - return 0; - p_segmet = p_vsegment->Segment(); - if ( !p_segmet->Select( 0 ) ) + else { - msg_Err( p_demux, "Failed to select new segment" ); - return 0; - } + msg_Warn( p_demux, "cannot get block EOF?" ); + p_segment->UnSelect( ); + + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); - continue; + /* switch to the next segment */ + if ( !p_vsegment->SelectNext() ) + // no more segments in this stream + break; + p_segment = p_vsegment->Segment(); + if ( !p_segment->Select( 0 ) ) + { + msg_Err( p_demux, "Failed to select new segment" ); + break; + } + + continue; + } } - p_sys->i_pts = p_sys->i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000; + mtime_t i_pts, i_dts; + + mtime_t i_time = block->GlobalTimecode(); + if ( i_block_ref1 != 0 ) + i_time += min( 0, i_block_ref1 ); + if ( i_block_ref2 != 0 ) + i_time += min( 0, i_block_ref2 ); + + i_pts = (p_sys->i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; + i_dts = (p_sys->i_chapter_time + i_time) / (mtime_t) 1000; + + if ( i_dts != i_pts && p_sys->i_last_dts >= i_dts ) + p_sys->i_last_dts += 200; + else + p_sys->i_last_dts = i_dts; + + p_sys->i_pts = i_pts; if( p_sys->i_pts >= p_sys->i_start_pts ) { es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts ); } - BlockDecode( p_demux, block, p_sys->i_pts, i_block_duration ); + if( i_pts >= p_sys->i_start_pts ) + if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) ) + { + i_return = 1; + break; + } + + if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL ) + { + /* nothing left to read in this ordered edition */ + if ( !p_vsegment->SelectNext() ) + break; + p_segment->UnSelect( ); + + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + + /* switch to the next segment */ + p_segment = p_vsegment->Segment(); + if ( !p_segment->Select( 0 ) ) + { + msg_Err( p_demux, "Failed to select new segment" ); + break; + } + continue; + } + + BlockDecode( p_demux, block, i_pts, i_block_duration ); delete block; i_block_count++; @@ -2984,9 +3270,14 @@ static int Demux( demux_t *p_demux) // TODO optimize when there is need to leave or when seeking has been called if( i_block_count > 5 ) { - return 1; + i_return = 1; + break; } } + + vlc_mutex_unlock( &p_sys->lock_demuxer ); + + return i_return; } @@ -2994,9 +3285,10 @@ static int Demux( demux_t *p_demux) /***************************************************************************** * Stream managment *****************************************************************************/ -vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_ ) +vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_, vlc_bool_t b_owner_ ) { s = s_; + b_owner = b_owner_; mb_eof = VLC_FALSE; } @@ -3045,6 +3337,8 @@ size_t vlc_stream_io_callback::write( const void *p_buffer, size_t i_size ) } uint64 vlc_stream_io_callback::getFilePointer( void ) { + if ( s == NULL ) + return 0; return stream_Tell( s ); } void vlc_stream_io_callback::close( void ) @@ -3089,6 +3383,36 @@ EbmlParser::~EbmlParser( void ) } } +EbmlElement* EbmlParser::UnGet( uint64 i_block_pos, uint64 i_cluster_pos ) +{ + if ( mi_user_level > mi_level ) + { + while ( mi_user_level != mi_level ) + { + delete m_el[mi_user_level]; + m_el[mi_user_level] = NULL; + mi_user_level--; + } + } + m_got = NULL; + mb_keep = VLC_FALSE; + if ( m_el[1]->GetElementPosition() == i_cluster_pos ) + { + m_es->I_O().setFilePointer( i_block_pos, seek_beginning ); + return (EbmlMaster*) m_el[1]; + } + else + { + // seek to the previous Cluster + m_es->I_O().setFilePointer( i_cluster_pos, seek_beginning ); + mi_level--; + mi_user_level--; + delete m_el[mi_level]; + m_el[mi_level] = NULL; + return NULL; + } +} + void EbmlParser::Up( void ) { if( mi_user_level == mi_level ) @@ -3159,7 +3483,7 @@ EbmlElement *EbmlParser::Get( void ) mb_keep = VLC_FALSE; } - m_el[mi_level] = m_es->FindNextElement( m_el[mi_level - 1]->Generic().Context, i_ulev, 0xFFFFFFFFL, mb_dummy, 1 ); + m_el[mi_level] = m_es->FindNextElement( m_el[mi_level - 1]->Generic().Context, i_ulev, 0xFFFFFFFFL, mb_dummy != 0, 1 ); // mi_remain_size[mi_level] = m_el[mi_level]->GetSize(); if( i_ulev > 0 ) { @@ -3234,7 +3558,7 @@ void matroska_segment_c::LoadCues( ) { if( MKV_IS_ID( el, KaxCuePoint ) ) { -#define idx index[i_index] +#define idx p_indexes[i_index] idx.i_track = -1; idx.i_block_number= -1; @@ -3303,7 +3627,7 @@ void matroska_segment_c::LoadCues( ) if( i_index >= i_index_max ) { i_index_max += 1024; - index = (mkv_index_t*)realloc( index, sizeof( mkv_index_t ) * i_index_max ); + p_indexes = (mkv_index_t*)realloc( p_indexes, sizeof( mkv_index_t ) * i_index_max ); } #undef idx } @@ -3656,7 +3980,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxTrackName &tname = *(KaxTrackName*)l; - tk->fmt.psz_description = UTF8ToStr( UTFstring( tname ) ); + tk->fmt.psz_description = ToUTF8( UTFstring( tname ) ); msg_Dbg( &sys.demuxer, "| | | + Track Name=%s", tk->fmt.psz_description ); } else if( MKV_IS_ID( l, KaxTrackLanguage ) ) @@ -3690,7 +4014,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxCodecName &cname = *(KaxCodecName*)l; - tk->psz_codec_name = UTF8ToStr( UTFstring( cname ) ); + tk->psz_codec_name = ToUTF8( UTFstring( cname ) ); msg_Dbg( &sys.demuxer, "| | | + Track Codec Name=%s", tk->psz_codec_name ); } else if( MKV_IS_ID( l, KaxContentEncodings ) ) @@ -3763,7 +4087,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) // { // KaxCodecSettings &cset = *(KaxCodecSettings*)l; -// tk->psz_codec_settings = UTF8ToStr( UTFstring( cset ) ); +// tk->psz_codec_settings = ToUTF8( UTFstring( cset ) ); // msg_Dbg( &sys.demuxer, "| | | + Track Codec Settings=%s", tk->psz_codec_settings ); // } // else if( EbmlId( *l ) == KaxCodecInfoURL::ClassInfos.GlobalId ) @@ -3800,6 +4124,9 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) msg_Dbg( &sys.demuxer, "| | | + Track Video" ); tk->f_fps = 0.0; + tk->fmt.video.i_frame_rate_base = (unsigned int)(tk->i_default_duration / 1000); + tk->fmt.video.i_frame_rate = 1000000; + for( j = 0; j < tkv->ListSize(); j++ ) { EbmlElement *l = (*tkv)[j]; @@ -3975,21 +4302,21 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) if( MKV_IS_ID( l, KaxSegmentUID ) ) { - segment_uid = *(new KaxSegmentUID(*static_cast(l))); + p_segment_uid = new KaxSegmentUID(*static_cast(l)); - msg_Dbg( &sys.demuxer, "| | + UID=%d", *(uint32*)segment_uid.GetBuffer() ); + msg_Dbg( &sys.demuxer, "| | + UID=%d", *(uint32*)p_segment_uid->GetBuffer() ); } else if( MKV_IS_ID( l, KaxPrevUID ) ) { - prev_segment_uid = *(new KaxPrevUID(*static_cast(l))); + p_prev_segment_uid = new KaxPrevUID(*static_cast(l)); - msg_Dbg( &sys.demuxer, "| | + PrevUID=%d", *(uint32*)prev_segment_uid.GetBuffer() ); + msg_Dbg( &sys.demuxer, "| | + PrevUID=%d", *(uint32*)p_prev_segment_uid->GetBuffer() ); } else if( MKV_IS_ID( l, KaxNextUID ) ) { - next_segment_uid = *(new KaxNextUID(*static_cast(l))); + p_next_segment_uid = new KaxNextUID(*static_cast(l)); - msg_Dbg( &sys.demuxer, "| | + NextUID=%d", *(uint32*)next_segment_uid.GetBuffer() ); + msg_Dbg( &sys.demuxer, "| | + NextUID=%d", *(uint32*)p_next_segment_uid->GetBuffer() ); } else if( MKV_IS_ID( l, KaxTimecodeScale ) ) { @@ -4013,7 +4340,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) { KaxMuxingApp &mapp = *(KaxMuxingApp*)l; - psz_muxing_application = UTF8ToStr( UTFstring( mapp ) ); + psz_muxing_application = ToUTF8( UTFstring( mapp ) ); msg_Dbg( &sys.demuxer, "| | + Muxing Application=%s", psz_muxing_application ); @@ -4022,7 +4349,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) { KaxWritingApp &wapp = *(KaxWritingApp*)l; - psz_writing_application = UTF8ToStr( UTFstring( wapp ) ); + psz_writing_application = ToUTF8( UTFstring( wapp ) ); msg_Dbg( &sys.demuxer, "| | + Writing Application=%s", psz_writing_application ); @@ -4031,7 +4358,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) { KaxSegmentFilename &sfn = *(KaxSegmentFilename*)l; - psz_segment_filename = UTF8ToStr( UTFstring( sfn ) ); + psz_segment_filename = ToUTF8( UTFstring( sfn ) ); msg_Dbg( &sys.demuxer, "| | + Segment Filename=%s", psz_segment_filename ); @@ -4040,7 +4367,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) { KaxTitle &title = *(KaxTitle*)l; - psz_title = UTF8ToStr( UTFstring( title ) ); + psz_title = ToUTF8( UTFstring( title ) ); msg_Dbg( &sys.demuxer, "| | + Title=%s", psz_title ); } @@ -4075,7 +4402,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) else if( MKV_IS_ID( l, KaxChapterTranslate ) ) { KaxChapterTranslate *p_trans = static_cast( l ); - chapter_translation_c translated; + chapter_translation_c *p_translate = new chapter_translation_c(); p_trans->Read( es, p_trans->Generic().Context, i_upper_level, el, true ); for( j = 0; j < p_trans->ListSize(); j++ ) @@ -4084,19 +4411,19 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) if( MKV_IS_ID( l, KaxChapterTranslateEditionUID ) ) { - translated.editions.push_back( uint64( *static_cast( l ) ) ); + p_translate->editions.push_back( uint64( *static_cast( l ) ) ); } else if( MKV_IS_ID( l, KaxChapterTranslateCodec ) ) { - translated.codec_id = uint32( *static_cast( l ) ); + p_translate->codec_id = uint32( *static_cast( l ) ); } else if( MKV_IS_ID( l, KaxChapterTranslateID ) ) { - translated.translated = *( new KaxChapterTranslateID( *static_cast( l ) ) ); + p_translate->p_translated = new KaxChapterTranslateID( *static_cast( l ) ); } } - translations.push_back( translated ); + translations.push_back( p_translate ); } #endif else @@ -4165,10 +4492,10 @@ void matroska_segment_c::ParseChapterAtom( int i_level, KaxChapterAtom *ca, chap for (k = 0; k < i_level; k++) chapters.psz_name += '+'; chapters.psz_name += ' '; - chapters.psz_name += UTF8ToStr( UTFstring( name ) ); + chapters.psz_name += ToUTF8( UTFstring( name ) ); chapters.b_user_display = true; - msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", UTF8ToStr(UTFstring(name)) ); + msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", ToUTF8(UTFstring(name)) ); } else if( MKV_IS_ID( l, KaxChapterLanguage ) ) { @@ -4302,7 +4629,7 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters ) stored_editions[i]->RefreshChapters( ); } - if ( stored_editions[i_default_edition]->b_ordered ) + if ( stored_editions.size() != 0 && stored_editions[i_default_edition]->b_ordered ) { /* update the duration of the segment according to the sum of all sub chapters */ i_dur = stored_editions[i_default_edition]->Duration() / I64C(1000); @@ -4418,7 +4745,7 @@ void matroska_segment_c::InformationCreate( ) void matroska_segment_c::IndexAppendCluster( KaxCluster *cluster ) { -#define idx index[i_index] +#define idx p_indexes[i_index] idx.i_track = -1; idx.i_block_number= -1; idx.i_position = cluster->GetElementPosition(); @@ -4429,39 +4756,11 @@ void matroska_segment_c::IndexAppendCluster( KaxCluster *cluster ) if( i_index >= i_index_max ) { i_index_max += 1024; - index = (mkv_index_t*)realloc( index, sizeof( mkv_index_t ) * i_index_max ); + p_indexes = (mkv_index_t*)realloc( p_indexes, sizeof( mkv_index_t ) * i_index_max ); } #undef idx } -static char * UTF8ToStr( const UTFstring &u ) -{ - int i_src; - const wchar_t *src; - char *dst, *p; - - i_src = u.length(); - src = u.c_str(); - - p = dst = (char*)malloc( i_src + 1); - while( i_src > 0 ) - { - if( *src < 255 ) - { - *p++ = (char)*src; - } - else - { - *p++ = '?'; - } - src++; - i_src--; - } - *p++= '\0'; - - return dst; -} - void chapter_edition_c::RefreshChapters( ) { chapter_item_c::RefreshChapters( b_ordered, -1 ); @@ -4529,18 +4828,29 @@ mtime_t chapter_edition_c::Duration() const return i_result; } -chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode ) +chapter_item_c * chapter_edition_c::FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current ) +{ + if ( !b_ordered ) + p_current = NULL; + bool b_found_current = false; + return chapter_item_c::FindTimecode( i_timecode, p_current, b_found_current ); +} + +chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode, const chapter_item_c * p_current, bool & b_found ) { chapter_item_c *psz_result = NULL; + if ( p_current == this ) + b_found = true; + if ( i_user_timecode >= i_user_start_time && ( i_user_timecode < i_user_end_time || ( i_user_start_time == i_user_end_time && i_user_timecode == i_user_end_time ))) { std::vector::iterator index = sub_chapters.begin(); - while ( index != sub_chapters.end() && psz_result == NULL ) + while ( index != sub_chapters.end() && ((p_current == NULL && psz_result == NULL) || (p_current != NULL && (!b_found || psz_result == NULL)))) { - psz_result = (*index)->FindTimecode( i_user_timecode ); + psz_result = (*index)->FindTimecode( i_user_timecode, p_current, b_found ); index++; } @@ -4647,12 +4957,12 @@ void demux_sys_t::PreloadLinked( matroska_segment_c *p_segment ) { sz_name = N_("Segment "); char psz_str[6]; - sprintf( psz_str, "%d", i ); + sprintf( psz_str, "%d", (int)i ); sz_name += psz_str; p_title->psz_name = strdup( sz_name.c_str() ); } - titles.push_back( *p_title ); + titles.push_back( p_title ); } } @@ -4663,7 +4973,7 @@ bool demux_sys_t::IsUsedSegment( matroska_segment_c &segment ) const { for ( size_t i=0; i< used_segments.size(); i++ ) { - if ( used_segments[i]->FindUID( segment.segment_uid ) ) + if ( used_segments[i]->FindUID( *segment.p_segment_uid ) ) return true; } return false; @@ -4715,17 +5025,39 @@ bool demux_sys_t::PreparePlayback( virtual_segment_c *p_new_segment ) return true; } +void demux_sys_t::JumpTo( virtual_segment_c & vsegment, chapter_item_c * p_chapter ) +{ + // if the segment is not part of the current segment, select the new one + if ( &vsegment != p_current_segment ) + { + PreparePlayback( &vsegment ); + } + + if ( p_chapter != NULL ) + { + if ( !p_chapter->Enter( true ) ) + { + // jump to the location in the found segment + vsegment.Seek( demuxer, p_chapter->i_user_start_time, -1, p_chapter ); + } + } + +} + bool matroska_segment_c::CompareSegmentUIDs( const matroska_segment_c * p_item_a, const matroska_segment_c * p_item_b ) { - EbmlBinary * p_itema = (EbmlBinary *)(&p_item_a->segment_uid); - if ( *p_itema == p_item_b->prev_segment_uid ) + if ( p_item_a == NULL || p_item_b == NULL ) + return false; + + EbmlBinary * p_itema = (EbmlBinary *)(p_item_a->p_segment_uid); + if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid ) return true; - p_itema = (EbmlBinary *)(&p_item_a->next_segment_uid); - if ( *p_itema == p_item_b->segment_uid ) + p_itema = (EbmlBinary *)(&p_item_a->p_next_segment_uid); + if ( p_item_b->p_segment_uid != NULL && *p_itema == *p_item_b->p_segment_uid ) return true; - if ( *p_itema == p_item_b->prev_segment_uid ) + if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid ) return true; return false; @@ -4764,7 +5096,7 @@ bool matroska_segment_c::Preload( ) cluster = (KaxCluster*)el; - i_start_pos = cluster->GetElementPosition(); + i_cluster_pos = i_start_pos = cluster->GetElementPosition(); ParseCluster( ); ep->Down(); @@ -4799,7 +5131,7 @@ matroska_segment_c *demux_sys_t::FindSegment( const EbmlBinary & uid ) const { for (size_t i=0; isegment_uid == uid ) + if ( *opened_segments[i]->p_segment_uid == uid ) return opened_segments[i]; } return NULL; @@ -4857,21 +5189,21 @@ size_t virtual_segment_c::AddSegment( matroska_segment_c *p_segment ) // check if it's not already in here for ( i=0; isegment_uid == linked_segments[i]->segment_uid ) + if ( *p_segment->p_segment_uid == *linked_segments[i]->p_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] ) + if ( (p_segment->p_segment_uid != NULL && *p_segment->p_segment_uid == linked_uids[i]) + || (p_segment->p_prev_segment_uid != NULL && *p_segment->p_prev_segment_uid == linked_uids[i]) + || (p_segment->p_next_segment_uid !=NULL && *p_segment->p_next_segment_uid == linked_uids[i]) ) { linked_segments.push_back( p_segment ); - AppendUID( p_segment->prev_segment_uid ); - AppendUID( p_segment->next_segment_uid ); + AppendUID( p_segment->p_prev_segment_uid ); + AppendUID( p_segment->p_next_segment_uid ); return 1; } @@ -4910,17 +5242,19 @@ void virtual_segment_c::LoadCues( ) } } -void virtual_segment_c::AppendUID( const EbmlBinary & UID ) +void virtual_segment_c::AppendUID( const EbmlBinary * p_UID ) { - if ( UID.GetBuffer() == NULL ) + if ( p_UID == NULL ) + return; + if ( p_UID->GetBuffer() == NULL ) return; for (size_t i=0; i i_date ) + if( p_indexes[i_idx].i_time + i_time_offset > i_date ) { break; } @@ -4951,8 +5285,8 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) i_idx--; } - i_seek_position = index[i_idx].i_position; - i_seek_time = index[i_idx].i_time; + i_seek_position = p_indexes[i_idx].i_position; + i_seek_time = p_indexes[i_idx].i_time; } msg_Dbg( &sys.demuxer, "seek got "I64Fd" (%d%%)", @@ -4983,12 +5317,13 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) while( i_track_skipping > 0 ) { - if( BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) + if( BlockGet( block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) { msg_Warn( &sys.demuxer, "cannot get block EOF?" ); return; } + ep->Down(); for( i_track = 0; i_track < tracks.size(); i_track++ ) { @@ -4998,18 +5333,18 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) } } - sys.i_pts = sys.i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000; + sys.i_last_dts = sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; if( i_track < tracks.size() ) { - if( sys.i_pts >= sys.i_start_pts ) + if( sys.i_pts >= sys.i_start_pts ) { - BlockDecode( &sys.demuxer, block, sys.i_pts, 0 ); + cluster = static_cast(ep->UnGet( i_block_pos, i_cluster_pos )); i_track_skipping = 0; } else if( tracks[i_track]->fmt.i_cat == VIDEO_ES ) { - if( i_block_ref1 == -1 && tracks[i_track]->b_search_keyframe ) + if( i_block_ref1 == 0 && tracks[i_track]->b_search_keyframe ) { tracks[i_track]->b_search_keyframe = VLC_FALSE; i_track_skipping--; @@ -5036,7 +5371,7 @@ void virtual_segment_c::Seek( demux_t & demuxer, mtime_t i_date, mtime_t i_time_ if ( Edition() && Edition()->b_ordered ) { /* 1st, we need to know in which chapter we are */ - psz_chapter = (*p_editions)[i_current_edition]->FindTimecode( i_date ); + psz_chapter = (*p_editions)[i_current_edition]->FindTimecode( i_date, psz_current_chapter ); } } @@ -5098,13 +5433,13 @@ void chapter_codec_cmds_c::AddCommand( const KaxChapterProcessCommand & command switch ( codec_time ) { case 0: - during_cmds.push_back( *p_data ); + during_cmds.push_back( p_data ); break; case 1: - enter_cmds.push_back( *p_data ); + enter_cmds.push_back( p_data ); break; case 2: - leave_cmds.push_back( *p_data ); + leave_cmds.push_back( p_data ); break; default: delete p_data; @@ -5161,7 +5496,7 @@ bool chapter_item_c::Leave( bool b_do_subs ) return f_result; } -bool chapter_item_c::EnterAndLeave( chapter_item_c *p_item ) +bool chapter_item_c::EnterAndLeave( chapter_item_c *p_item, bool b_final_enter ) { chapter_item_c *p_common_parent = p_item; @@ -5196,21 +5531,24 @@ bool chapter_item_c::EnterAndLeave( chapter_item_c *p_item ) } while ( 1 ); } - return Enter( true ); + if ( b_final_enter ) + return Enter( true ); + else + return false; } bool dvd_chapter_codec_c::Enter() { bool f_result = false; - std::vector::iterator index = enter_cmds.begin(); + std::vector::iterator index = enter_cmds.begin(); while ( index != enter_cmds.end() ) { - if ( (*index).GetSize() ) + if ( (*index)->GetSize() ) { - binary *p_data = (*index).GetBuffer(); + binary *p_data = (*index)->GetBuffer(); size_t i_size = *p_data++; // avoid reading too much from the buffer - i_size = min( i_size, ((*index).GetSize() - 1) >> 3 ); + i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 ); for ( ; i_size > 0; i_size--, p_data += 8 ) { msg_Dbg( &sys.demuxer, "Matroska DVD enter command" ); @@ -5225,15 +5563,15 @@ bool dvd_chapter_codec_c::Enter() bool dvd_chapter_codec_c::Leave() { bool f_result = false; - std::vector::iterator index = leave_cmds.begin(); + std::vector::iterator index = leave_cmds.begin(); while ( index != leave_cmds.end() ) { - if ( (*index).GetSize() ) + if ( (*index)->GetSize() ) { - binary *p_data = (*index).GetBuffer(); + binary *p_data = (*index)->GetBuffer(); size_t i_size = *p_data++; // avoid reading too much from the buffer - i_size = min( i_size, ((*index).GetSize() - 1) >> 3 ); + i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 ); for ( ; i_size > 0; i_size--, p_data += 8 ) { msg_Dbg( &sys.demuxer, "Matroska DVD leave command" ); @@ -5259,48 +5597,103 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si // handle register tests if there are some if ( (i_command & 0xF0) != 0 ) { - bool b_test_positive = (i_command & CMD_DVD_IF_NOT) == 0; + bool b_test_positive = true;//(i_command & CMD_DVD_IF_NOT) == 0; bool b_test_value = (i_command & CMD_DVD_TEST_VALUE) != 0; uint8 i_test = i_command & 0x70; uint16 i_value; + // see http://dvd.sourceforge.net/dvdinfo/vmi.html + uint8 i_cr1; + uint16 i_cr2; + switch ( i_command >> 12 ) + { + default: + i_cr1 = p_command[3]; + i_cr2 = (p_command[4] << 8) + p_command[5]; + break; + case 3: + case 4: + case 5: + i_cr1 = p_command[6]; + i_cr2 = p_command[7]; + b_test_value = false; + break; + case 6: + case 7: + if ( ((p_command[1] >> 4) & 0x7) == 0) + { + i_cr1 = p_command[2]; + i_cr2 = (p_command[6] << 8) + p_command[7]; + } + else + { + i_cr1 = p_command[2]; + i_cr2 = (p_command[6] << 8) + p_command[7]; + } + break; + } + if ( b_test_value ) - i_value = ( p_command[4] << 8 ) + p_command[5]; + i_value = i_cr2; else - i_value = GetPRM( p_command[7] ); + i_value = GetPRM( i_cr2 ); switch ( i_test ) { case CMD_DVD_IF_GPREG_EQUAL: // if equals - msg_Dbg( &sys.demuxer, "IF %s EQUALS %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() ); - if (!( GetPRM( p_command[3] ) == i_value )) + msg_Dbg( &sys.demuxer, "IF %s EQUALS %s", GetRegTypeName( false, i_cr1 ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() ); + if (!( GetPRM( i_cr1 ) == i_value )) { - b_test_positive = !b_test_positive; + b_test_positive = false; + } + break; + case CMD_DVD_IF_GPREG_NOT_EQUAL: + // if not equals + msg_Dbg( &sys.demuxer, "IF %s NOT EQUALS %s", GetRegTypeName( false, i_cr1 ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() ); + if (!( GetPRM( i_cr1 ) != i_value )) + { + b_test_positive = false; } break; case CMD_DVD_IF_GPREG_INF: // if inferior msg_Dbg( &sys.demuxer, "IF %s < %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() ); - if (!( GetPRM( p_command[3] ) < i_value )) + if (!( GetPRM( i_cr1 ) < i_value )) { - b_test_positive = !b_test_positive; + b_test_positive = false; + } + break; + case CMD_DVD_IF_GPREG_INF_EQUAL: + // if inferior or equal + msg_Dbg( &sys.demuxer, "IF %s < %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() ); + if (!( GetPRM( i_cr1 ) <= i_value )) + { + b_test_positive = false; } break; case CMD_DVD_IF_GPREG_AND: // if logical and msg_Dbg( &sys.demuxer, "IF %s & %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() ); - if (!( GetPRM( p_command[3] ) & i_value )) + if (!( GetPRM( i_cr1 ) & i_value )) { - b_test_positive = !b_test_positive; + b_test_positive = false; + } + break; + case CMD_DVD_IF_GPREG_SUP: + // if superior + msg_Dbg( &sys.demuxer, "IF %s >= %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() ); + if (!( GetPRM( i_cr1 ) > i_value )) + { + b_test_positive = false; } break; case CMD_DVD_IF_GPREG_SUP_EQUAL: // if superior or equal msg_Dbg( &sys.demuxer, "IF %s >= %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() ); - if (!( GetPRM( p_command[3] ) >= i_value )) + if (!( GetPRM( i_cr1 ) >= i_value )) { - b_test_positive = !b_test_positive; + b_test_positive = false; } break; } @@ -5333,18 +5726,9 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si // find in the ChapProcessPrivate matching this Title level p_chapter = sys.BrowseCodecPrivate( 1, MatchTitleNumber, &i_title, sizeof(i_title), p_segment ); - if ( p_chapter != NULL ) + if ( p_segment != NULL ) { - // if the segment is not part of the current segment, select the new one - if ( p_segment != sys.p_current_segment ) - { - sys.PreparePlayback( p_segment ); - } - - // jump to the location in the found segment - p_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, NULL ); - p_chapter->Enter( true ); - + sys.JumpTo( *p_segment, p_chapter ); f_result = true; } @@ -5352,64 +5736,201 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si } case CMD_DVD_CALLSS_VTSM1: { - msg_Dbg( &sys.demuxer, "CallSS VTSM" ); + msg_Dbg( &sys.demuxer, "CallSS" ); + binary p_type; switch( (p_command[6] & 0xC0) >> 6 ) { case 0: - switch ( p_command[5] ) + p_type = p_command[5] & 0x0F; + switch ( p_type ) { case 0x00: - msg_Dbg( &sys.demuxer, "CallSS PGC (rsm_cell %x)", p_command[5]); + msg_Dbg( &sys.demuxer, "CallSS PGC (rsm_cell %x)", p_command[4]); break; - case 0x82: - msg_Dbg( &sys.demuxer, "CallSS Title Entry (rsm_cell %x)", p_command[5]); + case 0x02: + msg_Dbg( &sys.demuxer, "CallSS Title Entry (rsm_cell %x)", p_command[4]); break; - case 0x83: - msg_Dbg( &sys.demuxer, "CallSS Root Menu (rsm_cell %x)", p_command[5]); + case 0x03: + msg_Dbg( &sys.demuxer, "CallSS Root Menu (rsm_cell %x)", p_command[4]); break; - case 0x84: - msg_Dbg( &sys.demuxer, "CallSS Subpicture Menu (rsm_cell %x)", p_command[5]); + case 0x04: + msg_Dbg( &sys.demuxer, "CallSS Subpicture Menu (rsm_cell %x)", p_command[4]); break; - case 0x85: - msg_Dbg( &sys.demuxer, "CallSS Audio Menu (rsm_cell %x)", p_command[5]); + case 0x05: + msg_Dbg( &sys.demuxer, "CallSS Audio Menu (rsm_cell %x)", p_command[4]); break; - case 0x86: - msg_Dbg( &sys.demuxer, "CallSS Angle Menu (rsm_cell %x)", p_command[5]); + case 0x06: + msg_Dbg( &sys.demuxer, "CallSS Angle Menu (rsm_cell %x)", p_command[4]); break; - case 0x87: - msg_Dbg( &sys.demuxer, "CallSS Chapter Menu (rsm_cell %x)", p_command[5]); + case 0x07: + msg_Dbg( &sys.demuxer, "CallSS Chapter Menu (rsm_cell %x)", p_command[4]); break; default: - msg_Dbg( &sys.demuxer, "CallSS (rsm_cell %x)", p_command[5]); + msg_Dbg( &sys.demuxer, "CallSS (rsm_cell %x)", p_command[4]); break; } - p_chapter = sys.BrowseCodecPrivate( 1, MatchPgcType, &p_command[5], 1, p_segment ); - if ( p_chapter != NULL ) + p_chapter = sys.BrowseCodecPrivate( 1, MatchPgcType, &p_type, 1, p_segment ); + if ( p_segment != NULL ) { - // if the segment is not part of the current segment, select the new one - if ( p_segment != sys.p_current_segment ) - { - sys.PreparePlayback( p_segment ); - } - - p_chapter->Enter( true ); - - // jump to the location in the found segment - p_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter ); + sys.JumpTo( *p_segment, p_chapter ); f_result = true; } break; case 1: - msg_Dbg( &sys.demuxer, "CallSS VMGM (menu %d, rsm_cell %x)", p_command[6] & 0x0F, p_command[5]); + msg_Dbg( &sys.demuxer, "CallSS VMGM (menu %d, rsm_cell %x)", p_command[5] & 0x0F, p_command[4]); + break; + case 2: + msg_Dbg( &sys.demuxer, "CallSS VTSM (menu %d, rsm_cell %x)", p_command[5] & 0x0F, p_command[4]); + break; + case 3: + msg_Dbg( &sys.demuxer, "CallSS VMGM (pgc %d, rsm_cell %x)", (p_command[2] << 8) + p_command[3], p_command[4]); + break; + } + break; + } + case CMD_DVD_JUMP_SS: + { + msg_Dbg( &sys.demuxer, "JumpSS"); + binary p_type; + switch( (p_command[5] & 0xC0) >> 6 ) { + case 0: + msg_Dbg( &sys.demuxer, "JumpSS FP"); + break; + case 1: + p_type = p_command[5] & 0x0F; + switch ( p_type ) + { + case 0x02: + msg_Dbg( &sys.demuxer, "JumpSS VMGM Title Entry"); + break; + case 0x03: + msg_Dbg( &sys.demuxer, "JumpSS VMGM Root Menu"); + break; + case 0x04: + msg_Dbg( &sys.demuxer, "JumpSS VMGM Subpicture Menu"); + break; + case 0x05: + msg_Dbg( &sys.demuxer, "JumpSS VMGM Audio Menu"); + break; + case 0x06: + msg_Dbg( &sys.demuxer, "JumpSS VMGM Angle Menu"); + break; + case 0x07: + msg_Dbg( &sys.demuxer, "JumpSS VMGM Chapter Menu"); + break; + default: + msg_Dbg( &sys.demuxer, "JumpSS "); + break; + } + // find the VMG + p_chapter = sys.BrowseCodecPrivate( 1, MatchIsVMG, NULL, 0, p_segment ); + if ( p_segment != NULL ) + { + p_chapter = p_segment->BrowseCodecPrivate( 1, MatchPgcType, &p_type, 1 ); + if ( p_chapter != NULL ) + { + sys.JumpTo( *p_segment, p_chapter ); + f_result = true; + } + } break; case 2: - msg_Dbg( &sys.demuxer, "CallSS VTSM (menu %d, rsm_cell %x)", p_command[6] & 0x0F, p_command[5]); + p_type = p_command[5] & 0x0F; + switch ( p_type ) + { + case 0x02: + msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Title Entry", p_command[4], p_command[3]); + break; + case 0x03: + msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Root Menu", p_command[4], p_command[3]); + break; + case 0x04: + msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Subpicture Menu", p_command[4], p_command[3]); + break; + case 0x05: + msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Audio Menu", p_command[4], p_command[3]); + break; + case 0x06: + msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Angle Menu", p_command[4], p_command[3]); + break; + case 0x07: + msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Chapter Menu", p_command[4], p_command[3]); + break; + default: + msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) ", p_command[4], p_command[3]); + break; + } + + p_chapter = sys.BrowseCodecPrivate( 1, MatchVTSMNumber, &p_command[4], 1, p_segment ); + + if ( p_segment != NULL && p_chapter != NULL ) + { + // find the title in the VTS + p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchTitleNumber, &p_command[3], 1 ); + if ( p_chapter != NULL ) + { + // find the specified menu in the VTSM + p_chapter = p_segment->BrowseCodecPrivate( 1, MatchPgcType, &p_type, 1 ); + if ( p_chapter != NULL ) + { + sys.JumpTo( *p_segment, p_chapter ); + f_result = true; + } + } + else + msg_Dbg( &sys.demuxer, "Title (%d) does not exist in this VTS", p_command[3] ); + } + else + msg_Dbg( &sys.demuxer, "DVD Domain VTS (%d) not found", p_command[4] ); break; case 3: - msg_Dbg( &sys.demuxer, "CallSS VMGM (pgc %d, rsm_cell %x)", (p_command[3] << 8) + p_command[4], p_command[5]); + msg_Dbg( &sys.demuxer, "JumpSS VMGM (pgc %d)", (p_command[2] << 8) + p_command[3]); break; } break; } + case CMD_DVD_JUMPVTS_PTT: + { + uint8 i_title = p_command[5]; + uint8 i_ptt = p_command[3]; + + msg_Dbg( &sys.demuxer, "JumpVTS Title (%d) PTT (%d)", i_title, i_ptt); + + // find the current VTS content segment + p_chapter = sys.p_current_segment->BrowseCodecPrivate( 1, MatchIsDomain, NULL, 0 ); + if ( p_chapter != NULL ) + { + int16 i_curr_title = p_chapter->GetTitleNumber( ); + if ( i_curr_title > 0 ) + { + p_chapter = sys.BrowseCodecPrivate( 1, MatchVTSNumber, &i_curr_title, sizeof(i_curr_title), p_segment ); + + if ( p_segment != NULL && p_chapter != NULL ) + { + // find the title in the VTS + p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchTitleNumber, &i_title, sizeof(i_title) ); + if ( p_chapter != NULL ) + { + // find the chapter in the title + p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchChapterNumber, &i_ptt, sizeof(i_ptt) ); + if ( p_chapter != NULL ) + { + sys.JumpTo( *p_segment, p_chapter ); + f_result = true; + } + } + else + msg_Dbg( &sys.demuxer, "Title (%d) does not exist in this VTS", i_title ); + } + else + msg_Dbg( &sys.demuxer, "DVD Domain VTS (%d) not found", i_curr_title ); + } + else + msg_Dbg( &sys.demuxer, "JumpVTS_PTT command found but not in a VTS(M)"); + } + else + msg_Dbg( &sys.demuxer, "JumpVTS_PTT command but the DVD domain wasn't found"); + break; + } case CMD_DVD_SET_GPRMMD: { msg_Dbg( &sys.demuxer, "Set GPRMMD [%d]=%d", (p_command[4] << 8) + p_command[5], (p_command[2] << 8) + p_command[3]); @@ -5426,10 +5947,10 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si p_chapter = sys.p_current_segment->BrowseCodecPrivate( 1, MatchPgcNumber, &i_pgcn, 2 ); if ( p_chapter != NULL ) { - p_chapter->Enter( true ); - - // jump to the location in the found segment - sys.p_current_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter ); + if ( !p_chapter->Enter( true ) ) + // jump to the location in the found segment + sys.p_current_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter ); + f_result = true; } break; @@ -5444,10 +5965,10 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchCellNumber, &i_cn, 1 ); if ( p_chapter != NULL ) { - p_chapter->Enter( true ); - - // jump to the location in the found segment - sys.p_current_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter ); + if ( !p_chapter->Enter( true ) ) + // jump to the location in the found segment + sys.p_current_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter ); + f_result = true; } break; @@ -5458,6 +5979,12 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si // TODO break; } + case CMD_DVD_SET_HL_BTNN1: + { + msg_Dbg( &sys.demuxer, "SetHL_BTN (%d)", p_command[4] ); + SetSPRM( 0x88, p_command[4] ); + break; + } default: { msg_Dbg( &sys.demuxer, "unsupported command : %02X %02X %02X %02X %02X %02X %02X %02X" @@ -5476,15 +6003,56 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si return f_result; } +bool dvd_command_interpretor_c::MatchIsDomain( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) +{ + return ( data.p_private_data != NULL && data.p_private_data->GetBuffer()[0] == MATROSKA_DVD_LEVEL_SS ); +} + +bool dvd_command_interpretor_c::MatchIsVMG( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) +{ + if ( data.p_private_data == NULL || data.p_private_data->GetSize() < 2 ) + return false; + + return ( data.p_private_data->GetBuffer()[0] == MATROSKA_DVD_LEVEL_SS && data.p_private_data->GetBuffer()[1] == 0xC0); +} + +bool dvd_command_interpretor_c::MatchVTSNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) +{ + if ( i_cookie_size != 2 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 ) + return false; + + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_SS || data.p_private_data->GetBuffer()[1] != 0x80 ) + return false; + + uint16 i_gtitle = (data.p_private_data->GetBuffer()[2] << 8 ) + data.p_private_data->GetBuffer()[3]; + uint16 i_title = *(uint16*)p_cookie; + + return (i_gtitle == i_title); +} + +bool dvd_command_interpretor_c::MatchVTSMNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) +{ + if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 ) + return false; + + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_SS || data.p_private_data->GetBuffer()[1] != 0x40 ) + return false; + + uint8 i_gtitle = data.p_private_data->GetBuffer()[3]; + uint8 i_title = *(uint8*)p_cookie; + + return (i_gtitle == i_title); +} + bool dvd_command_interpretor_c::MatchTitleNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) { - if ( i_cookie_size != 1 || data.m_private_data.GetSize() < 4 ) + if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 ) return false; - if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_TT ) + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_TT ) return false; - uint16 i_gtitle = (data.m_private_data.GetBuffer()[1] << 8 ) + data.m_private_data.GetBuffer()[2]; + uint16 i_gtitle = (data.p_private_data->GetBuffer()[1] << 8 ) + data.p_private_data->GetBuffer()[2]; uint8 i_title = *(uint8*)p_cookie; return (i_gtitle == i_title); @@ -5492,13 +6060,13 @@ bool dvd_command_interpretor_c::MatchTitleNumber( const chapter_codec_cmds_c &da bool dvd_command_interpretor_c::MatchPgcType( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) { - if ( i_cookie_size != 1 || data.m_private_data.GetSize() < 8 ) + if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 8 ) return false; - if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC ) + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC ) return false; - uint8 i_pgc_type = data.m_private_data.GetBuffer()[3]; + uint8 i_pgc_type = data.p_private_data->GetBuffer()[3] & 0x0F; uint8 i_pgc = *(uint8*)p_cookie; return (i_pgc_type == i_pgc); @@ -5506,28 +6074,42 @@ bool dvd_command_interpretor_c::MatchPgcType( const chapter_codec_cmds_c &data, bool dvd_command_interpretor_c::MatchPgcNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) { - if ( i_cookie_size != 2 || data.m_private_data.GetSize() < 8 ) + if ( i_cookie_size != 2 || data.p_private_data == NULL || data.p_private_data->GetSize() < 8 ) return false; - if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC ) + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC ) return false; uint16 *i_pgc_n = (uint16 *)p_cookie; - uint16 i_pgc_num = (data.m_private_data.GetBuffer()[1] << 8) + data.m_private_data.GetBuffer()[2]; + uint16 i_pgc_num = (data.p_private_data->GetBuffer()[1] << 8) + data.p_private_data->GetBuffer()[2]; return (i_pgc_num == *i_pgc_n); } +bool dvd_command_interpretor_c::MatchChapterNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) +{ + if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 2 ) + return false; + + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PTT ) + return false; + + uint8 i_chapter = data.p_private_data->GetBuffer()[1]; + uint8 i_ptt = *(uint8*)p_cookie; + + return (i_chapter == i_ptt); +} + bool dvd_command_interpretor_c::MatchCellNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) { - if ( i_cookie_size != 1 || data.m_private_data.GetSize() < 5 ) + if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 5 ) return false; - if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_CN ) + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_CN ) return false; uint8 *i_cell_n = (uint8 *)p_cookie; - uint8 i_cell_num = data.m_private_data.GetBuffer()[3]; + uint8 i_cell_num = data.p_private_data->GetBuffer()[3]; return (i_cell_num == *i_cell_n); } @@ -5535,13 +6117,13 @@ bool dvd_command_interpretor_c::MatchCellNumber( const chapter_codec_cmds_c &dat bool matroska_script_codec_c::Enter() { bool f_result = false; - std::vector::iterator index = enter_cmds.begin(); + std::vector::iterator index = enter_cmds.begin(); while ( index != enter_cmds.end() ) { - if ( (*index).GetSize() ) + if ( (*index)->GetSize() ) { msg_Dbg( &sys.demuxer, "Matroska Script enter command" ); - f_result |= interpretor.Interpret( (*index).GetBuffer(), (*index).GetSize() ); + f_result |= interpretor.Interpret( (*index)->GetBuffer(), (*index)->GetSize() ); } index++; } @@ -5551,13 +6133,13 @@ bool matroska_script_codec_c::Enter() bool matroska_script_codec_c::Leave() { bool f_result = false; - std::vector::iterator index = leave_cmds.begin(); + std::vector::iterator index = leave_cmds.begin(); while ( index != leave_cmds.end() ) { - if ( (*index).GetSize() ) + if ( (*index)->GetSize() ) { msg_Dbg( &sys.demuxer, "Matroska Script leave command" ); - f_result |= interpretor.Interpret( (*index).GetBuffer(), (*index).GetSize() ); + f_result |= interpretor.Interpret( (*index)->GetBuffer(), (*index)->GetSize() ); } index++; } @@ -5579,7 +6161,11 @@ bool matroska_script_interpretor_c::Interpret( const binary * p_command, size_t msg_Dbg( &sys.demuxer, "command : %s", sz_command.c_str() ); +#if defined(__GNUC__) && (__GNUC__ < 3) + if ( sz_command.compare( CMD_MS_GOTO_AND_PLAY, 0, CMD_MS_GOTO_AND_PLAY.size() ) == 0 ) +#else if ( sz_command.compare( 0, CMD_MS_GOTO_AND_PLAY.size(), CMD_MS_GOTO_AND_PLAY ) == 0 ) +#endif { size_t i,j;