X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmkv.cpp;h=a86f299174a3f5a212657a9055058bbff6895d46;hb=ed0b72e3714ad87cb4e10b9a7239e19b9ef0724e;hp=d32ba2875a9324a8d3e947b7c6a1b52ca91ea072;hpb=62171bcd3dba82fcccd90b7322af6181dd4cd539;p=vlc diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index d32ba2875a..a86f299174 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 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -84,6 +84,12 @@ #include "ebml/StdIOCallback.h" +#if LIBMATROSKA_VERSION < 0x000706 +START_LIBMATROSKA_NAMESPACE +extern const EbmlSemanticContext MATROSKA_DLL_API KaxMatroska_Context; +END_LIBMATROSKA_NAMESPACE +#endif + #include "vlc_keys.h" extern "C" { @@ -93,8 +99,11 @@ extern "C" { # include #endif -#define MATROSKA_COMPRESSION_NONE 0 -#define MATROSKA_COMPRESSION_ZLIB 1 +#define MATROSKA_COMPRESSION_NONE -1 +#define MATROSKA_COMPRESSION_ZLIB 0 +#define MATROSKA_COMPRESSION_BLIB 1 +#define MATROSKA_COMPRESSION_LZOX 2 +#define MATROSKA_COMPRESSION_HEADER 3 #define MKVD_TIMECODESCALE 1000000 @@ -272,19 +281,19 @@ typedef struct { } ATTRIBUTE_PACKED hl_gi_t; -/** - * Button Color Information Table +/** + * Button Color Information Table * Each entry beeing a 32bit word that contains the color indexs and alpha * values to use. They are all represented by 4 bit number and stored * like this [Ci3, Ci2, Ci1, Ci0, A3, A2, A1, A0]. The actual palette * that the indexes reference is in the PGC. - * @TODO split the uint32_t into a struct + * \todo split the uint32_t into a struct */ typedef struct { uint32_t btn_coli[3][2]; /**< [button color number-1][select:0/action:1] */ } ATTRIBUTE_PACKED btn_colit_t; -/** +/** * Button Information * * NOTE: I've had to change the structure from the disk layout to get @@ -381,7 +390,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 ); @@ -390,19 +399,23 @@ 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-preload-local-dir", 1, NULL, + N_("Preload Directory"), + N_("Preload matroska files from the same family in the same directory (not good for broken files)."), 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."), 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" ); @@ -479,7 +492,7 @@ static void MkvTree( demux_t & demuxer, int i_level, char *psz_format, ... ) 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 ); + __msg_GenericVa( VLC_OBJECT(&demuxer), MSG_QUEUE_NORMAL, VLC_MSG_DBG, "mkv", psz_foo2, args ); free( psz_foo2 ); va_end( args ); } @@ -492,9 +505,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 ); @@ -517,6 +537,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 ); @@ -548,6 +569,8 @@ static vlc_fourcc_t __GetFOURCC( uint8_t *p ) *****************************************************************************/ typedef struct { +// ~mkv_track_t(); + vlc_bool_t b_default; vlc_bool_t b_enabled; unsigned int i_number; @@ -559,12 +582,16 @@ typedef struct uint64_t i_default_duration; float f_timecodescale; + mtime_t i_last_dts; /* video */ es_format_t fmt; float f_fps; es_out_id_t *p_es; + /* audio */ + unsigned int i_original_rate; + vlc_bool_t b_inited; /* data to be send first */ int i_data_init; @@ -581,7 +608,8 @@ typedef struct char *psz_codec_download_url; /* encryption/compression */ - int i_compression_type; + int i_compression_type; + KaxContentCompSettings *p_compression_data; } mkv_track_t; @@ -610,15 +638,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 ); @@ -629,12 +679,12 @@ public: 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; @@ -751,14 +801,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; @@ -791,7 +842,9 @@ protected: // callbacks when browsing inside CodecPrivate 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 ); @@ -849,7 +902,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; }; @@ -887,7 +949,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, @@ -911,14 +973,14 @@ public: std::vector codecs; - bool operator<( const chapter_item_c & item ) const + static bool CompareTimecode( const chapter_item_c * itemA, const chapter_item_c * itemB ) { - 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) ); + return ( itemA->i_user_start_time < itemB->i_user_start_time || (itemA->i_user_start_time == itemB->i_user_start_time && itemA->i_user_end_time < itemB->i_user_end_time) ); } 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 +993,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 +1011,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,28 +1030,25 @@ 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() { for( size_t i_track = 0; i_track < tracks.size(); i_track++ ) { - if( tracks[i_track]->fmt.psz_description ) + if ( tracks[i_track]->p_compression_data ) { - free( tracks[i_track]->fmt.psz_description ); + delete tracks[i_track]->p_compression_data; } + es_format_Clean( &tracks[i_track]->fmt ); + if( tracks[i_track]->p_extra_data ) + free( tracks[i_track]->p_extra_data ); 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]; } - + if( psz_writing_application ) { free( psz_writing_application ); @@ -1004,10 +1069,14 @@ public: { free( psz_date_utc ); } - if ( index ) - free( index ); + if ( p_indexes ) + free( p_indexes ); delete ep; + delete segment; + 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 +1084,18 @@ public: delete (*index); index++; } + std::vector::iterator indext = translations.begin(); + while ( indext != translations.end() ) + { + delete (*indext); + indext++; + } + std::vector::iterator indexf = families.begin(); + while ( indexf != families.end() ) + { + delete (*indexf); + indexf++; + } } KaxSegment *segment; @@ -1036,15 +1117,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,8 +1142,8 @@ public: std::vector stored_editions; int i_default_edition; - std::vector translations; - std::vector families; + std::vector translations; + std::vector families; demux_sys_t & sys; EbmlParser *ep; @@ -1080,7 +1163,11 @@ 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 ); +#if LIBMATROSKA_VERSION >= 0x000800 + int BlockGet( KaxBlock * &, KaxSimpleBlock * &, int64_t *, int64_t *, int64_t *); +#else + int BlockGet( KaxBlock * &, int64_t *, int64_t *, int64_t *); +#endif bool Select( mtime_t i_start_time ); void UnSelect( ); @@ -1100,9 +1187,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 +1257,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 @@ -1240,6 +1327,11 @@ 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; @@ -1276,7 +1368,8 @@ public: void PreloadFamily( const matroska_segment_c & of_segment ); void PreloadLinked( matroska_segment_c *p_segment ); bool PreparePlayback( virtual_segment_c *p_new_segment ); - matroska_stream_c *AnalyseAllSegmentsFound( EbmlStream *p_estream ); + matroska_stream_c *AnalyseAllSegmentsFound( demux_t *p_demux, EbmlStream *p_estream, bool b_initial = false ); + void JumpTo( virtual_segment_c & p_segment, chapter_item_c * p_chapter ); void StartUiThread(); void StopUiThread(); @@ -1287,7 +1380,7 @@ public: input_thread_t *p_input; pci_t pci_packet; bool b_pci_packet_set; - uint8_t alpha[4]; + uint8_t palette[4][4]; vlc_mutex_t lock_demuxer; /* event */ @@ -1311,7 +1404,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 @@ -1339,7 +1435,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 ) @@ -1350,7 +1446,7 @@ static int Open( vlc_object_t * p_this ) return VLC_EGENERIC; } - p_stream = p_sys->AnalyseAllSegmentsFound( p_io_stream ); + p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_io_stream, true ); if( p_stream == NULL ) { msg_Err( p_demux, "cannot find KaxSegment" ); @@ -1375,72 +1471,90 @@ static int Open( vlc_object_t * p_this ) p_stream->p_in->setFilePointer( p_segment->cluster->GetElementPosition() ); } - /* get the files from the same dir from the same family (based on p_demux->psz_path) */ - if (p_demux->psz_path[0] != '\0' && !strcmp(p_demux->psz_access, "")) + if (config_GetInt( p_demux, "mkv-preload-local-dir" )) { - // 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) + /* get the files from the same dir from the same family (based on p_demux->psz_path) */ + if (p_demux->psz_path[0] != '\0' && !strcmp(p_demux->psz_access, "")) { - s_path = s_path.substr(0,s_path.length()-1); - } - else - { - if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0) + // 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) { - s_path = s_path.substr(0,s_path.find_last_of(DIRECTORY_SEPARATOR)); + s_path = s_path.substr(0,s_path.length()-1); + } + else + { + if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0) + { + s_path = s_path.substr(0,s_path.find_last_of(DIRECTORY_SEPARATOR)); + } } - } - struct dirent *p_file_item; - DIR *p_src_dir = opendir(s_path.c_str()); + struct dirent *p_file_item; + DIR *p_src_dir = opendir(s_path.c_str()); - if (p_src_dir != NULL) - { - while ((p_file_item = (dirent *) readdir(p_src_dir))) + if (p_src_dir != NULL) { - if (strlen(p_file_item->d_name) > 4) + while ((p_file_item = (dirent *) readdir(p_src_dir))) { - s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name; + if (strlen(p_file_item->d_name) > 4) + { + s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name; - if (!s_filename.compare(p_demux->psz_path)) - continue; // don't reuse the original opened file +#ifdef WIN32 + if (!strcasecmp(s_filename.c_str(), p_demux->psz_path)) +#else + if (!s_filename.compare(p_demux->psz_path)) +#endif + continue; // don't reuse the original opened file #if defined(__GNUC__) && (__GNUC__ < 3) - if (!s_filename.compare("mkv", s_filename.length() - 3, 3) || - !s_filename.compare("mka", s_filename.length() - 3, 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")) + 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); - - 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 ); + // 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 ) + { + 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_demux, 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 + { + msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() ); + } } } } + closedir( p_src_dir ); } - closedir( p_src_dir ); } + + p_sys->PreloadFamily( *p_segment ); } - p_sys->PreloadFamily( *p_segment ); p_sys->PreloadLinked( p_segment ); + if ( !p_sys->PreparePlayback( NULL ) ) { msg_Err( p_demux, "cannot use the segment" ); @@ -1478,13 +1592,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) int i_skp; size_t i_idx; - vlc_meta_t **pp_meta; + vlc_meta_t *p_meta; switch( i_query ) { case DEMUX_GET_META: - pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** ); - *pp_meta = vlc_meta_Duplicate( p_sys->meta ); + p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* ); + vlc_meta_Merge( p_meta, p_sys->meta ); return VLC_SUCCESS; case DEMUX_GET_LENGTH: @@ -1523,7 +1637,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; @@ -1535,7 +1649,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; @@ -1544,9 +1658,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; @@ -1560,39 +1674,54 @@ 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 ) +#if LIBMATROSKA_VERSION >= 0x000800 +int matroska_segment_c::BlockGet( KaxBlock * & pp_block, KaxSimpleBlock * & pp_simpleblock, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ) +#else +int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ) +#endif { - *pp_block = NULL; - *pi_ref1 = -1; - *pi_ref2 = -1; +#if LIBMATROSKA_VERSION >= 0x000800 + pp_simpleblock = NULL; +#endif + pp_block = NULL; + *pi_ref1 = 0; + *pi_ref2 = 0; for( ;; ) { - EbmlElement *el; + EbmlElement *el = NULL; int i_level; if ( ep == NULL ) return VLC_EGENERIC; - el = ep->Get(); - i_level = ep->GetLevel(); - - if( el == NULL && *pp_block != NULL ) +#if LIBMATROSKA_VERSION >= 0x000800 + if( pp_simpleblock != NULL || ((el = ep->Get()) == NULL && pp_block != NULL) ) +#else + if( (el = ep->Get()) == NULL && pp_block != NULL ) +#endif { /* 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; +#if LIBMATROSKA_VERSION >= 0x000800 + if ( pp_simpleblock != NULL ) + idx.i_time = pp_simpleblock->GlobalTimecode() / (mtime_t)1000; + else +#endif + idx.i_time = (*pp_block).GlobalTimecode() / (mtime_t)1000; + idx.b_key = *pi_ref1 == 0 ? VLC_TRUE : VLC_FALSE; } #undef idx return VLC_SUCCESS; } + i_level = ep->GetLevel(); + if( el == NULL ) { - if( ep->GetLevel() > 1 ) + if( i_level > 1 ) { ep->Up(); continue; @@ -1608,10 +1737,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 ); } @@ -1648,16 +1778,26 @@ 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(); } +#if LIBMATROSKA_VERSION >= 0x000800 + else if( MKV_IS_ID( el, KaxSimpleBlock ) ) + { + pp_simpleblock = (KaxSimpleBlock*)el; + + pp_simpleblock->ReadData( es.I_O() ); + pp_simpleblock->SetParent( *cluster ); + } +#endif 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(); } @@ -1673,13 +1813,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 + else if( *pi_ref2 == 0 ) { - *pi_ref2 = int64( ref ); + *pi_ref2 = int64( ref ) * cluster->GlobalTimecodeScale(); } } else if( MKV_IS_ID( el, KaxClusterSilentTrackNumber ) ) @@ -1704,17 +1844,22 @@ int matroska_segment_c::BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t } } -static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, int i_mem) +static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, int i_mem, size_t offset) { block_t *p_block; - if( !(p_block = block_New( p_demux, i_mem ) ) ) return NULL; - memcpy( p_block->p_buffer, p_mem, i_mem ); + if( !(p_block = block_New( p_demux, i_mem + offset ) ) ) return NULL; + memcpy( p_block->p_buffer + offset, p_mem, i_mem ); //p_block->i_rate = p_input->stream.control.i_rate; return p_block; } +#if LIBMATROSKA_VERSION >= 0x000800 +static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock, + mtime_t i_pts, mtime_t i_duration, bool f_mandatory ) +#else static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, - mtime_t i_duration ) + mtime_t i_duration, bool f_mandatory ) +#endif { demux_sys_t *p_sys = p_demux->p_sys; matroska_segment_c *p_segment = p_sys->p_current_segment->Segment(); @@ -1726,7 +1871,12 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, #define tk p_segment->tracks[i_track] for( i_track = 0; i_track < p_segment->tracks.size(); i_track++ ) { +#if LIBMATROSKA_VERSION >= 0x000800 + if( (block != NULL && tk->i_number == block->TrackNum()) || + (simpleblock != NULL && tk->i_number == simpleblock->TrackNum())) +#else if( tk->i_number == block->TrackNum() ) +#endif { break; } @@ -1737,17 +1887,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 ); @@ -1765,18 +1915,37 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, 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 ); + p_init = MemToBlock( p_demux, tk->p_data_init, tk->i_data_init, 0 ); if( p_init ) es_out_Send( p_demux->out, tk->p_es, p_init ); } tk->b_inited = VLC_TRUE; +#if LIBMATROSKA_VERSION >= 0x000800 + for( i = 0; + (block != NULL && i < block->NumberFrames()) || (simpleblock != NULL && i < simpleblock->NumberFrames()); + i++ ) +#else for( i = 0; i < block->NumberFrames(); i++ ) +#endif { block_t *p_block; - DataBuffer &data = block->GetBuffer(i); + DataBuffer *data; +#if LIBMATROSKA_VERSION >= 0x000800 + if ( simpleblock != NULL ) + { + data = &simpleblock->GetBuffer(i); + // condition when the DTS is correct (keyframe or B frame == NOT P frame) + f_mandatory = simpleblock->IsDiscardable() || simpleblock->IsKeyframe(); + } + else +#endif + data = &block->GetBuffer(i); - p_block = MemToBlock( p_demux, data.Buffer(), data.Size() ); + if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER && tk->p_compression_data != NULL ) + p_block = MemToBlock( p_demux, data->Buffer(), data->Size(), tk->p_compression_data->GetSize() ); + else + p_block = MemToBlock( p_demux, data->Buffer(), data->Size(), 0 ); if( p_block == NULL ) { @@ -1784,45 +1953,63 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, } #if defined(HAVE_ZLIB_H) - if( tk->i_compression_type ) + if( tk->i_compression_type == MATROSKA_COMPRESSION_ZLIB ) { p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block ); } + else #endif + if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER ) + { + memcpy( p_block->p_buffer, tk->p_compression_data->GetBuffer(), tk->p_compression_data->GetSize() ); + } - // TODO implement correct timestamping when B frames are used + 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; + } + // 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 ) - { - if ( !strcmp( tk->psz_codec, "B_VOBBTN" ) ) + if( !strcmp( tk->psz_codec, "V_MS/VFW/FOURCC" ) ) { - // 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; + // in VFW we have no idea about B frames + p_block->i_pts = 0; + p_block->i_dts = i_pts; } - - else if ( strcmp( tk->psz_codec, "S_VOBSUB" ) ) + else { - p_block->i_length = i_duration * 1000; + p_block->i_pts = i_pts; + if ( f_mandatory ) + p_block->i_dts = p_block->i_pts; + else + p_block->i_dts = min( i_pts, tk->i_last_dts + (tk->i_default_duration >> 10)); + p_sys->i_pts = p_block->i_dts; } } + tk->i_last_dts = p_block->i_dts; + +#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" ) ) + { + p_block->i_length = i_duration * 1000; + } es_out_Send( p_demux->out, tk->p_es, p_block ); @@ -1833,7 +2020,7 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, #undef tk } -matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream ) +matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlStream *p_estream, bool b_initial ) { int i_upper_lvl = 0; size_t i; @@ -1844,13 +2031,40 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream ) p_l0 = p_estream->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFL); if (p_l0 == NULL) { + msg_Err( p_demux, "No EBML header found" ); return NULL; } - p_l0->SkipData(*p_estream, EbmlHead_Context); + + // verify we can read this Segment, we only support Matroska version 1 for now + p_l0->Read(*p_estream, EbmlHead::ClassInfos.Context, i_upper_lvl, p_l0, true); + + EDocType doc_type = GetChild(*static_cast(p_l0)); + if (std::string(doc_type) != "matroska") + { + msg_Err( p_demux, "Not a Matroska file : DocType = %s ", std::string(doc_type).c_str()); + return NULL; + } + + EDocTypeReadVersion doc_read_version = GetChild(*static_cast(p_l0)); +#if LIBMATROSKA_VERSION >= 0x000800 + if (uint64(doc_read_version) > 2) + { + msg_Err( p_demux, "This matroska file is needs version "I64Fd" and this VLC only supports version 1 & 2", uint64(doc_read_version)); + return NULL; + } +#else + if (uint64(doc_read_version) != 1) + { + msg_Err( p_demux, "This matroska file is needs version "I64Fd" and this VLC only supports version 1", uint64(doc_read_version)); + return NULL; + } +#endif + 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; @@ -1864,7 +2078,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream ) { EbmlParser *ep; matroska_segment_c *p_segment1 = new matroska_segment_c( *this, *p_estream ); - b_keep_segment = false; + b_keep_segment = b_initial; ep = new EbmlParser(p_estream, p_l0, &demuxer ); p_segment1->ep = ep; @@ -1889,20 +2103,21 @@ 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 ) ) { KaxSegmentFamily *p_fam = new KaxSegmentFamily( *static_cast(l) ); - p_segment1->families.push_back( *p_fam ); + p_segment1->families.push_back( p_fam ); } } break; @@ -1916,9 +2131,13 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream ) else delete p_segment1; } - - p_l0->SkipData(*p_estream, EbmlHead_Context); - p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL); + if (p_l0->IsFiniteSize() ) + { + p_l0->SkipData(*p_estream, KaxMatroska_Context); + p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL); + } + else + p_l0 = p_l0->SkipData(*p_estream, KaxSegment_Context); } if ( !b_keep_stream ) @@ -1935,14 +2154,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() ); + 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; } @@ -1984,7 +2203,6 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) else if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG4/ISO/AVC" ) ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', 'v', 'c', '1' ); - tracks[i_track]->fmt.b_packetized = VLC_FALSE; tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); memcpy( tracks[i_track]->fmt.p_extra,tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); @@ -1997,16 +2215,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; @@ -2016,11 +2228,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" ) ) { @@ -2111,7 +2319,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) else if( !strncmp( tracks[i_track]->psz_codec, "A_AAC/MPEG2/", strlen( "A_AAC/MPEG2/" ) ) || !strncmp( tracks[i_track]->psz_codec, "A_AAC/MPEG4/", strlen( "A_AAC/MPEG4/" ) ) ) { - int i_profile, i_srate; + int i_profile, i_srate, sbr = 0; static unsigned int i_sample_rates[] = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, @@ -2133,6 +2341,11 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) { i_profile = 2; } + else if( !strcmp( &tracks[i_track]->psz_codec[12], "LC/SBR" ) ) + { + i_profile = 1; + sbr = 1; + } else { i_profile = 3; @@ -2140,17 +2353,35 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) for( i_srate = 0; i_srate < 13; i_srate++ ) { - if( i_sample_rates[i_srate] == tracks[i_track]->fmt.audio.i_rate ) + if( i_sample_rates[i_srate] == tracks[i_track]->i_original_rate ) { break; } } msg_Dbg( &sys.demuxer, "profile=%d srate=%d", i_profile, i_srate ); - tracks[i_track]->fmt.i_extra = 2; + tracks[i_track]->fmt.i_extra = sbr ? 5 : 2; tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->fmt.i_extra ); ((uint8_t*)tracks[i_track]->fmt.p_extra)[0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1); ((uint8_t*)tracks[i_track]->fmt.p_extra)[1] = ((i_srate & 0x1) << 7) | (tracks[i_track]->fmt.audio.i_channels << 3); + if (sbr != 0) + { + int syncExtensionType = 0x2B7; + int iDSRI; + for (iDSRI=0; iDSRI<13; iDSRI++) + if( i_sample_rates[iDSRI] == tracks[i_track]->fmt.audio.i_rate ) + break; + ((uint8_t*)tracks[i_track]->fmt.p_extra)[2] = (syncExtensionType >> 3) & 0xFF; + ((uint8_t*)tracks[i_track]->fmt.p_extra)[3] = ((syncExtensionType & 0x7) << 5) | 5; + ((uint8_t*)tracks[i_track]->fmt.p_extra)[4] = ((1 & 0x1) << 7) | (iDSRI << 3); + } + } + else if( !strcmp( tracks[i_track]->psz_codec, "A_AAC" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); + tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); + memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); } else if( !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/BIG" ) || !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/LIT" ) || @@ -2169,13 +2400,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" ) ) @@ -2190,6 +2421,12 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 's', 'a', ' ' ); tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" ); + if( tracks[i_track]->i_extra_data ) + { + tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); + memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); + } } else if( !strcmp( tracks[i_track]->psz_codec, "S_VOBSUB" ) ) { @@ -2216,7 +2453,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',' ' ); + tracks[i_track]->fmt.i_cat = NAV_ES; + continue; } else { @@ -2257,7 +2495,7 @@ 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 ); @@ -2289,7 +2527,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_object_release( p_input ); msg_Dbg( &demuxer, "Stopping the UI Hook" ); } @@ -2302,7 +2542,10 @@ int demux_sys_t::EventMouse( vlc_object_t *p_this, char const *psz_var, event_thread_t *p_ev = (event_thread_t *) p_data; vlc_mutex_lock( &p_ev->lock ); if( psz_var[6] == 'c' ) + { p_ev->b_clicked = VLC_TRUE; + msg_Dbg( p_this, "Event Mouse: clicked"); + } else if( psz_var[6] == 'm' ) p_ev->b_moved = VLC_TRUE; vlc_mutex_unlock( &p_ev->lock ); @@ -2317,6 +2560,7 @@ int demux_sys_t::EventKey( vlc_object_t *p_this, char const *psz_var, vlc_mutex_lock( &p_ev->lock ); p_ev->b_key = VLC_TRUE; vlc_mutex_unlock( &p_ev->lock ); + msg_Dbg( p_this, "Event Key"); return VLC_SUCCESS; } @@ -2353,6 +2597,8 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) struct vlc_t::hotkey *p_hotkeys = p_ev->p_vlc->p_hotkeys; int i, i_action = -1; + msg_Dbg( p_ev->p_demux, "Handle Key Event"); + vlc_mutex_lock( &p_ev->lock ); pci_t *pci = (pci_t *) &p_sys->pci_packet; @@ -2502,6 +2748,8 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) int32_t best,dist,d; int32_t mx,my,dx,dy; + msg_Dbg( p_ev->p_demux, "Handle Mouse Event: Mouse clicked x(%d)*y(%d)", (unsigned)valx.i_int, (unsigned)valy.i_int); + b_activated = VLC_TRUE; // get current button best = 0; @@ -2510,8 +2758,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; @@ -2557,10 +2807,18 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) } 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 ); @@ -2568,8 +2826,8 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) 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 ); @@ -2716,12 +2974,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) @@ -2729,24 +2988,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; @@ -2756,7 +3015,7 @@ 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; @@ -2882,9 +3141,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]; @@ -2938,9 +3197,9 @@ int16 chapter_item_c::GetTitleNumber( ) const int16 dvd_chapter_codec_c::GetTitleNumber() { - 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_SS ) { return int16( (p_data[2] << 8) + p_data[3] ); @@ -2984,7 +3243,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; } @@ -2994,10 +3253,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; @@ -3046,11 +3305,6 @@ static int Demux( demux_t *p_demux) int i_block_count = 0; int i_return = 0; - KaxBlock *block; - int64_t i_block_duration; - int64_t i_block_ref1; - int64_t i_block_ref2; - for( ;; ) { if ( p_sys->demuxer.b_die ) @@ -3082,8 +3336,18 @@ static int Demux( demux_t *p_demux) continue; } + KaxBlock *block; + int64_t i_block_duration = 0; + int64_t i_block_ref1; + int64_t i_block_ref2; + +#if LIBMATROSKA_VERSION >= 0x000800 + KaxSimpleBlock *simpleblock; - if( p_segment->BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) + if( p_segment->BlockGet( block, simpleblock, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) +#else + if( p_segment->BlockGet( block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) +#endif { if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered ) { @@ -3103,33 +3367,76 @@ static int Demux( demux_t *p_demux) break; } - msg_Warn( p_demux, "cannot get block EOF?" ); + else + { + 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_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; + } + } + +#if LIBMATROSKA_VERSION >= 0x000800 + if ( simpleblock != NULL ) + p_sys->i_pts = (p_sys->i_chapter_time + simpleblock->GlobalTimecode()) / (mtime_t) 1000; + else +#endif + p_sys->i_pts = (p_sys->i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; + + if( p_sys->i_pts >= p_sys->i_start_pts ) + { + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts ); + + if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) ) + { + i_return = 1; + delete block; + 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() ) + { + delete block; + break; + } p_segment->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 - break; p_segment = p_vsegment->Segment(); if ( !p_segment->Select( 0 ) ) { msg_Err( p_demux, "Failed to select new segment" ); + delete block; break; } - + delete block; continue; } - p_sys->i_pts = p_sys->i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000; - - 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 LIBMATROSKA_VERSION >= 0x000800 + BlockDecode( p_demux, block, simpleblock, p_sys->i_pts, i_block_duration, i_block_ref1 >= 0 || i_block_ref2 > 0 ); +#else + BlockDecode( p_demux, block, p_sys->i_pts, i_block_duration, i_block_ref1 >= 0 || i_block_ref2 > 0 ); +#endif delete block; i_block_count++; @@ -3152,9 +3459,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; } @@ -3203,6 +3511,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 ) @@ -3247,6 +3557,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 ) @@ -3317,7 +3657,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 ) { @@ -3392,7 +3732,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; @@ -3461,7 +3801,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 } @@ -3679,13 +4019,13 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { size_t i, j, k, n; + bool bSupported = true; mkv_track_t *tk; msg_Dbg( &sys.demuxer, "| | + Track Entry" ); tk = new mkv_track_t(); - tracks.push_back( tk ); /* Init the track */ memset( tk, 0, sizeof( mkv_track_t ) ); @@ -3714,6 +4054,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) tk->psz_codec_download_url = NULL; tk->i_compression_type = MATROSKA_COMPRESSION_NONE; + tk->p_compression_data = NULL; for( i = 0; i < m->ListSize(); i++ ) { @@ -3814,13 +4155,15 @@ 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 ) ) { KaxTrackLanguage &lang = *(KaxTrackLanguage*)l; + if ( tk->fmt.psz_language != NULL ) + free( tk->fmt.psz_language ); tk->fmt.psz_language = strdup( string( lang ).c_str() ); msg_Dbg( &sys.demuxer, "| | | + Track Language=`%s'", tk->fmt.psz_language ); @@ -3848,13 +4191,18 @@ 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 ) ) { EbmlMaster *cencs = static_cast(l); MkvTree( sys.demuxer, 3, "Content Encodings" ); + if ( cencs->ListSize() > 1 ) + { + msg_Err( &sys.demuxer, "Multiple Compression method not supported" ); + bSupported = false; + } for( j = 0; j < cencs->ListSize(); j++ ) { EbmlElement *l2 = (*cencs)[j]; @@ -3891,11 +4239,18 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxContentCompAlgo &compalg = *(KaxContentCompAlgo*)l4; MkvTree( sys.demuxer, 6, "Compression Algorithm: %i", uint32(compalg) ); - if( uint32( compalg ) == 0 ) + tk->i_compression_type = uint32( compalg ); + if ( ( tk->i_compression_type != MATROSKA_COMPRESSION_ZLIB ) && + ( tk->i_compression_type != MATROSKA_COMPRESSION_HEADER ) ) { - tk->i_compression_type = MATROSKA_COMPRESSION_ZLIB; + msg_Err( &sys.demuxer, "Track Compression method %d not supported", tk->i_compression_type ); + bSupported = false; } } + else if( MKV_IS_ID( l4, KaxContentCompSettings ) ) + { + tk->p_compression_data = new KaxContentCompSettings( *(KaxContentCompSettings*)l4 ); + } else { MkvTree( sys.demuxer, 6, "Unknown (%s)", typeid(*l4).name() ); @@ -3921,7 +4276,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 ) @@ -3958,6 +4313,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]; @@ -3978,14 +4336,14 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)l; - tk->fmt.video.i_width = uint16( vwidth ); + tk->fmt.video.i_width += 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 ); + tk->fmt.video.i_height += uint16( vheight ); msg_Dbg( &sys.demuxer, "| | | | + height=%d", uint16( vheight ) ); } else if( MKV_IS_ID( l, KaxVideoDisplayWidth ) ) @@ -4002,6 +4360,36 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) tk->fmt.video.i_visible_height = uint16( vheight ); msg_Dbg( &sys.demuxer, "| | | | + display height=%d", uint16( vheight ) ); } + else if( MKV_IS_ID( l, KaxVideoPixelCropBottom ) ) + { + KaxVideoPixelCropBottom &cropval = *(KaxVideoPixelCropBottom*)l; + + tk->fmt.video.i_height -= uint16( cropval ); + msg_Dbg( &sys.demuxer, "| | | | + crop pixel bottom=%d", uint16( cropval ) ); + } + else if( MKV_IS_ID( l, KaxVideoPixelCropTop ) ) + { + KaxVideoPixelCropTop &cropval = *(KaxVideoPixelCropTop*)l; + + tk->fmt.video.i_height -= uint16( cropval ); + tk->fmt.video.i_y_offset += uint16( cropval ); + msg_Dbg( &sys.demuxer, "| | | | + crop pixel top=%d", uint16( cropval ) ); + } + else if( MKV_IS_ID( l, KaxVideoPixelCropRight ) ) + { + KaxVideoPixelCropRight &cropval = *(KaxVideoPixelCropRight*)l; + + tk->fmt.video.i_width -= uint16( cropval ); + msg_Dbg( &sys.demuxer, "| | | | + crop pixel right=%d", uint16( cropval ) ); + } + else if( MKV_IS_ID( l, KaxVideoPixelCropLeft ) ) + { + KaxVideoPixelCropLeft &cropval = *(KaxVideoPixelCropLeft*)l; + + tk->fmt.video.i_width -= uint16( cropval ); + tk->fmt.video.i_x_offset += uint16( cropval ); + msg_Dbg( &sys.demuxer, "| | | | + crop pixel left=%d", uint16( cropval ) ); + } else if( MKV_IS_ID( l, KaxVideoFrameRate ) ) { KaxVideoFrameRate &vfps = *(KaxVideoFrameRate*)l; @@ -4051,9 +4439,16 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxAudioSamplingFreq &afreq = *(KaxAudioSamplingFreq*)l; - tk->fmt.audio.i_rate = (int)float( afreq ); + tk->i_original_rate = tk->fmt.audio.i_rate = (int)float( afreq ); msg_Dbg( &sys.demuxer, "| | | | + afreq=%d", tk->fmt.audio.i_rate ); } + else if( MKV_IS_ID( l, KaxAudioOutputSamplingFreq ) ) + { + KaxAudioOutputSamplingFreq &afreq = *(KaxAudioOutputSamplingFreq*)l; + + tk->fmt.audio.i_rate = (int)float( afreq ); + msg_Dbg( &sys.demuxer, "| | | | + aoutfreq=%d", tk->fmt.audio.i_rate ); + } else if( MKV_IS_ID( l, KaxAudioChannels ) ) { KaxAudioChannels &achan = *(KaxAudioChannels*)l; @@ -4080,6 +4475,16 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) typeid(*l).name() ); } } + + if ( bSupported ) + { + tracks.push_back( tk ); + } + else + { + msg_Err( &sys.demuxer, "Track Entry %d not supported", tk->i_number ); + delete tk; + } } /***************************************************************************** @@ -4133,21 +4538,24 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) if( MKV_IS_ID( l, KaxSegmentUID ) ) { - segment_uid = *(new KaxSegmentUID(*static_cast(l))); + if ( p_segment_uid == NULL ) + 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))); + if ( p_prev_segment_uid == NULL ) + 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))); + if ( p_next_segment_uid == NULL ) + 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 ) ) { @@ -4171,7 +4579,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 ); @@ -4180,7 +4588,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 ); @@ -4189,7 +4597,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 ); @@ -4198,7 +4606,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 ); } @@ -4206,11 +4614,11 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) { KaxSegmentFamily *uid = static_cast(l); - families.push_back(*uid); + families.push_back( new KaxSegmentFamily(*uid) ); msg_Dbg( &sys.demuxer, "| | + family=%d", *(uint32*)uid->GetBuffer() ); } -#if defined( HAVE_GMTIME_R ) && !defined( SYS_DARWIN ) +#if defined( HAVE_GMTIME_R ) && !defined( __APPLE__ ) else if( MKV_IS_ID( l, KaxDateUTC ) ) { KaxDateUTC &date = *(KaxDateUTC*)l; @@ -4233,7 +4641,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++ ) @@ -4242,19 +4650,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 @@ -4323,10 +4731,12 @@ 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 ) ); + char *psz_tmp_utf8 = ToUTF8( UTFstring( name ) ); + chapters.psz_name += psz_tmp_utf8; chapters.b_user_display = true; - msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", UTF8ToStr(UTFstring(name)) ); + msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", psz_tmp_utf8 ); + free( psz_tmp_utf8 ); } else if( MKV_IS_ID( l, KaxChapterLanguage ) ) { @@ -4460,7 +4870,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); @@ -4507,54 +4917,30 @@ void matroska_segment_c::InformationCreate( ) if( psz_title ) { - vlc_meta_Add( sys.meta, VLC_META_TITLE, psz_title ); + vlc_meta_SetTitle( sys.meta, psz_title ); } if( psz_date_utc ) { - vlc_meta_Add( sys.meta, VLC_META_DATE, psz_date_utc ); + vlc_meta_SetDate( sys.meta, psz_date_utc ); } if( psz_segment_filename ) { - vlc_meta_Add( sys.meta, _("Segment filename"), psz_segment_filename ); + fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" ); } if( psz_muxing_application ) { - vlc_meta_Add( sys.meta, _("Muxing application"), psz_muxing_application ); + fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" ); } if( psz_writing_application ) { - vlc_meta_Add( sys.meta, _("Writing application"), psz_writing_application ); + fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" ); } for( i_track = 0; i_track < tracks.size(); i_track++ ) { - mkv_track_t *tk = tracks[i_track]; - vlc_meta_t *mtk = vlc_meta_New(); - - 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( sys.meta, VLC_META_DESCRIPTION, tk->fmt.psz_description ); - } - if( 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( sys.meta, VLC_META_SETTING, tk->psz_codec_settings ); - } - if( 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( sys.meta, VLC_META_URL, tk->psz_codec_download_url ); - } +// mkv_track_t *tk = tracks[i_track]; +// vlc_meta_t *mtk = vlc_meta_New(); + fprintf( stderr, "***** WARNING: Unhandled child meta\n"); } if( i_tags_position >= 0 ) @@ -4576,7 +4962,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(); @@ -4587,39 +4973,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 ); @@ -4660,7 +5018,8 @@ int64_t chapter_item_c::RefreshChapters( bool b_ordered, int64_t i_prev_user_tim } else { - std::sort( sub_chapters.begin(), sub_chapters.end() ); + if ( sub_chapters.begin() != sub_chapters.end() ) + std::sort( sub_chapters.begin(), sub_chapters.end(), chapter_item_c::CompareTimecode ); i_user_start_time = i_start_time; if ( i_end_time != -1 ) i_user_end_time = i_end_time; @@ -4687,18 +5046,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++; } @@ -4741,7 +5111,7 @@ bool matroska_segment_c::PreloadFamily( const matroska_segment_c & of_segment ) { for (size_t j=0; jpsz_name == NULL ) { - sz_name = N_("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 ); } } @@ -4821,7 +5191,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; @@ -4873,17 +5243,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; @@ -4907,6 +5299,11 @@ bool matroska_segment_c::Preload( ) else if( MKV_IS_ID( el, KaxTracks ) ) { ParseTracks( static_cast( el ) ); + if ( tracks.size() == 0 ) + { + msg_Err( &sys.demuxer, "No tracks supported" ); + return false; + } } else if( MKV_IS_ID( el, KaxSeekHead ) ) { @@ -4922,7 +5319,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(); @@ -4957,7 +5354,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; @@ -5015,21 +5412,23 @@ 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 ( linked_segments[i]->p_segment_uid != NULL + && p_segment->p_segment_uid != NULL + && *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; } @@ -5068,22 +5467,27 @@ 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= 0x000800 + KaxSimpleBlock *simpleblock; +#endif int i_track_skipping; int64_t i_block_duration; int64_t i_block_ref1; @@ -5098,7 +5502,7 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) for( ; i_idx < i_index; i_idx++ ) { - if( index[i_idx].i_time + i_time_offset > i_date ) + if( p_indexes[i_idx].i_time + i_time_offset > i_date ) { break; } @@ -5109,8 +5513,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%%)", @@ -5141,12 +5545,17 @@ 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 LIBMATROSKA_VERSION >= 0x000800 + if( BlockGet( block, simpleblock, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) +#else + if( BlockGet( block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) +#endif { msg_Warn( &sys.demuxer, "cannot get block EOF?" ); return; } + ep->Down(); for( i_track = 0; i_track < tracks.size(); i_track++ ) { @@ -5156,25 +5565,29 @@ 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_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--; } if( !tracks[i_track]->b_search_keyframe ) { - BlockDecode( &sys.demuxer, block, sys.i_pts, 0 ); +#if LIBMATROSKA_VERSION >= 0x000800 + BlockDecode( &sys.demuxer, block, simpleblock, sys.i_pts, 0, i_block_ref1 >= 0 || i_block_ref2 > 0 ); +#else + BlockDecode( &sys.demuxer, block, sys.i_pts, 0, i_block_ref1 >= 0 || i_block_ref2 > 0 ); +#endif } } } @@ -5194,7 +5607,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 ); } } @@ -5256,13 +5669,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; @@ -5319,7 +5732,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; @@ -5354,21 +5767,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" ); @@ -5383,15 +5799,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" ); @@ -5409,56 +5825,111 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si if ( i_size != 8 ) return false; - virtual_segment_c *p_segment; - chapter_item_c *p_chapter; + virtual_segment_c *p_segment = NULL; + chapter_item_c *p_chapter = NULL; bool f_result = false; uint16 i_command = ( p_command[0] << 8 ) + p_command[1]; // 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; } @@ -5491,18 +5962,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; } @@ -5510,60 +5972,154 @@ 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; @@ -5584,7 +6140,7 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si { p_chapter = sys.BrowseCodecPrivate( 1, MatchVTSNumber, &i_curr_title, sizeof(i_curr_title), p_segment ); - if ( p_chapter != NULL ) + 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) ); @@ -5594,16 +6150,7 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchChapterNumber, &i_ptt, sizeof(i_ptt) ); if ( p_chapter != 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; } } @@ -5636,10 +6183,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; @@ -5654,10 +6201,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; @@ -5668,6 +6215,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" @@ -5688,32 +6241,54 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si bool dvd_command_interpretor_c::MatchIsDomain( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) { - return ( data.m_private_data.GetBuffer()[0] == MATROSKA_DVD_LEVEL_SS ); + 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.m_private_data.GetSize() < 4 ) + if ( i_cookie_size != 2 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 ) return false; - if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_SS || data.m_private_data.GetBuffer()[1] != 0x80 ) + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_SS || data.p_private_data->GetBuffer()[1] != 0x80 ) return false; - uint16 i_gtitle = (data.m_private_data.GetBuffer()[2] << 8 ) + data.m_private_data.GetBuffer()[3]; + 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); @@ -5721,13 +6296,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); @@ -5735,27 +6310,27 @@ 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.m_private_data.GetSize() < 2 ) + if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 2 ) return false; - if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_PTT ) + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PTT ) return false; - uint8 i_chapter = data.m_private_data.GetBuffer()[1]; + uint8 i_chapter = data.p_private_data->GetBuffer()[1]; uint8 i_ptt = *(uint8*)p_cookie; return (i_chapter == i_ptt); @@ -5763,14 +6338,14 @@ bool dvd_command_interpretor_c::MatchChapterNumber( const chapter_codec_cmds_c & 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); } @@ -5778,13 +6353,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++; } @@ -5794,13 +6369,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++; }