X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmkv.cpp;h=ba83742214e13d017be140c4a9734403bb8a2f3a;hb=482c287c23ceabc5d2efc360629127f799789aaa;hp=c7225a3c46dfb95802e0ea314dfec51b656274a3;hpb=5a08315d8bcc8bd40dad65add6b445bca9c5a0b6;p=vlc diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index c7225a3c46..ba83742214 100644 --- a/modules/demux/mkv.cpp +++ b/modules/demux/mkv.cpp @@ -56,6 +56,7 @@ #include "ebml/EbmlStream.h" #include "ebml/EbmlContexts.h" #include "ebml/EbmlVoid.h" +#include "ebml/EbmlVersion.h" #include "ebml/StdIOCallback.h" #include "matroska/KaxAttachments.h" @@ -79,9 +80,12 @@ #include "matroska/KaxTrackVideo.h" #include "matroska/KaxTrackEntryData.h" #include "matroska/KaxContentEncoding.h" +#include "matroska/KaxVersion.h" #include "ebml/StdIOCallback.h" +#include "vlc_keys.h" + extern "C" { #include "mp4/libmp4.h" } @@ -92,6 +96,279 @@ extern "C" { #define MATROSKA_COMPRESSION_NONE 0 #define MATROSKA_COMPRESSION_ZLIB 1 +#define MKVD_TIMECODESCALE 1000000 + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////// +#ifdef VSLHC1 +#define DVDNAV_COMPILE +#include +#else /* VSLHC */ + +#undef ATTRIBUTE_PACKED +#undef PRAGMA_PACK_BEGIN +#undef PRAGMA_PACK_END + +#if defined(__GNUC__) +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +#define ATTRIBUTE_PACKED __attribute__ ((packed)) +#define PRAGMA_PACK 0 +#endif +#endif + +#if !defined(ATTRIBUTE_PACKED) +#define ATTRIBUTE_PACKED +#define PRAGMA_PACK 1 +#endif + +#if PRAGMA_PACK +#pragma pack(1) +#endif + +/************************************* +* taken from libdvdnav / libdvdread +**************************************/ + +/** + * DVD Time Information. + */ +typedef struct { + uint8_t hour; + uint8_t minute; + uint8_t second; + uint8_t frame_u; /* The two high bits are the frame rate. */ +} ATTRIBUTE_PACKED dvd_time_t; + +/** + * User Operations. + */ +typedef struct { +#ifdef WORDS_BIGENDIAN + unsigned char zero : 7; /* 25-31 */ + unsigned char video_pres_mode_change : 1; /* 24 */ + + unsigned char karaoke_audio_pres_mode_change : 1; /* 23 */ + unsigned char angle_change : 1; + unsigned char subpic_stream_change : 1; + unsigned char audio_stream_change : 1; + unsigned char pause_on : 1; + unsigned char still_off : 1; + unsigned char button_select_or_activate : 1; + unsigned char resume : 1; /* 16 */ + + unsigned char chapter_menu_call : 1; /* 15 */ + unsigned char angle_menu_call : 1; + unsigned char audio_menu_call : 1; + unsigned char subpic_menu_call : 1; + unsigned char root_menu_call : 1; + unsigned char title_menu_call : 1; + unsigned char backward_scan : 1; + unsigned char forward_scan : 1; /* 8 */ + + unsigned char next_pg_search : 1; /* 7 */ + unsigned char prev_or_top_pg_search : 1; + unsigned char time_or_chapter_search : 1; + unsigned char go_up : 1; + unsigned char stop : 1; + unsigned char title_play : 1; + unsigned char chapter_search_or_play : 1; + unsigned char title_or_time_play : 1; /* 0 */ +#else + unsigned char video_pres_mode_change : 1; /* 24 */ + unsigned char zero : 7; /* 25-31 */ + + unsigned char resume : 1; /* 16 */ + unsigned char button_select_or_activate : 1; + unsigned char still_off : 1; + unsigned char pause_on : 1; + unsigned char audio_stream_change : 1; + unsigned char subpic_stream_change : 1; + unsigned char angle_change : 1; + unsigned char karaoke_audio_pres_mode_change : 1; /* 23 */ + + unsigned char forward_scan : 1; /* 8 */ + unsigned char backward_scan : 1; + unsigned char title_menu_call : 1; + unsigned char root_menu_call : 1; + unsigned char subpic_menu_call : 1; + unsigned char audio_menu_call : 1; + unsigned char angle_menu_call : 1; + unsigned char chapter_menu_call : 1; /* 15 */ + + unsigned char title_or_time_play : 1; /* 0 */ + unsigned char chapter_search_or_play : 1; + unsigned char title_play : 1; + unsigned char stop : 1; + unsigned char go_up : 1; + unsigned char time_or_chapter_search : 1; + unsigned char prev_or_top_pg_search : 1; + unsigned char next_pg_search : 1; /* 7 */ +#endif +} ATTRIBUTE_PACKED user_ops_t; + +/** + * Type to store per-command data. + */ +typedef struct { + uint8_t bytes[8]; +} ATTRIBUTE_PACKED vm_cmd_t; +#define COMMAND_DATA_SIZE 8 + +/** + * PCI General Information + */ +typedef struct { + uint32_t nv_pck_lbn; /**< sector address of this nav pack */ + uint16_t vobu_cat; /**< 'category' of vobu */ + uint16_t zero1; /**< reserved */ + user_ops_t vobu_uop_ctl; /**< UOP of vobu */ + uint32_t vobu_s_ptm; /**< start presentation time of vobu */ + uint32_t vobu_e_ptm; /**< end presentation time of vobu */ + uint32_t vobu_se_e_ptm; /**< end ptm of sequence end in vobu */ + dvd_time_t e_eltm; /**< Cell elapsed time */ + char vobu_isrc[32]; +} ATTRIBUTE_PACKED pci_gi_t; + +/** + * Non Seamless Angle Information + */ +typedef struct { + uint32_t nsml_agl_dsta[9]; /**< address of destination vobu in AGL_C#n */ +} ATTRIBUTE_PACKED nsml_agli_t; + +/** + * Highlight General Information + * + * For btngrX_dsp_ty the bits have the following meaning: + * 000b: normal 4/3 only buttons + * XX1b: wide (16/9) buttons + * X1Xb: letterbox buttons + * 1XXb: pan&scan buttons + */ +typedef struct { + uint16_t hli_ss; /**< status, only low 2 bits 0: no buttons, 1: different 2: equal 3: eual except for button cmds */ + uint32_t hli_s_ptm; /**< start ptm of hli */ + uint32_t hli_e_ptm; /**< end ptm of hli */ + uint32_t btn_se_e_ptm; /**< end ptm of button select */ +#ifdef WORDS_BIGENDIAN + unsigned char zero1 : 2; /**< reserved */ + unsigned char btngr_ns : 2; /**< number of button groups 1, 2 or 3 with 36/18/12 buttons */ + unsigned char zero2 : 1; /**< reserved */ + unsigned char btngr1_dsp_ty : 3; /**< display type of subpic stream for button group 1 */ + unsigned char zero3 : 1; /**< reserved */ + unsigned char btngr2_dsp_ty : 3; /**< display type of subpic stream for button group 2 */ + unsigned char zero4 : 1; /**< reserved */ + unsigned char btngr3_dsp_ty : 3; /**< display type of subpic stream for button group 3 */ +#else + unsigned char btngr1_dsp_ty : 3; + unsigned char zero2 : 1; + unsigned char btngr_ns : 2; + unsigned char zero1 : 2; + unsigned char btngr3_dsp_ty : 3; + unsigned char zero4 : 1; + unsigned char btngr2_dsp_ty : 3; + unsigned char zero3 : 1; +#endif + uint8_t btn_ofn; /**< button offset number range 0-255 */ + uint8_t btn_ns; /**< number of valid buttons <= 36/18/12 (low 6 bits) */ + uint8_t nsl_btn_ns; /**< number of buttons selectable by U_BTNNi (low 6 bits) nsl_btn_ns <= btn_ns */ + uint8_t zero5; /**< reserved */ + uint8_t fosl_btnn; /**< forcedly selected button (low 6 bits) */ + uint8_t foac_btnn; /**< forcedly activated button (low 6 bits) */ +} ATTRIBUTE_PACKED hl_gi_t; + + +/** + * 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 + */ +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 + * the packing to work with Sun's Forte C compiler. + * The 4 and 7 bytes are 'rotated' was: ABC DEF GHIJ is: ABCG DEFH IJ + */ +typedef struct { +#ifdef WORDS_BIGENDIAN + uint32 btn_coln : 2; /**< button color number */ + uint32 x_start : 10; /**< x start offset within the overlay */ + uint32 zero1 : 2; /**< reserved */ + uint32 x_end : 10; /**< x end offset within the overlay */ + + uint32 zero3 : 2; /**< reserved */ + uint32 up : 6; /**< button index when pressing up */ + + uint32 auto_action_mode : 2; /**< 0: no, 1: activated if selected */ + uint32 y_start : 10; /**< y start offset within the overlay */ + uint32 zero2 : 2; /**< reserved */ + uint32 y_end : 10; /**< y end offset within the overlay */ + + uint32 zero4 : 2; /**< reserved */ + uint32 down : 6; /**< button index when pressing down */ + unsigned char zero5 : 2; /**< reserved */ + unsigned char left : 6; /**< button index when pressing left */ + unsigned char zero6 : 2; /**< reserved */ + unsigned char right : 6; /**< button index when pressing right */ +#else + uint32 x_end : 10; + uint32 zero1 : 2; + uint32 x_start : 10; + uint32 btn_coln : 2; + + uint32 up : 6; + uint32 zero3 : 2; + + uint32 y_end : 10; + uint32 zero2 : 2; + uint32 y_start : 10; + uint32 auto_action_mode : 2; + + uint32 down : 6; + uint32 zero4 : 2; + unsigned char left : 6; + unsigned char zero5 : 2; + unsigned char right : 6; + unsigned char zero6 : 2; +#endif + vm_cmd_t cmd; +} ATTRIBUTE_PACKED btni_t; + +/** + * Highlight Information + */ +typedef struct { + hl_gi_t hl_gi; + btn_colit_t btn_colit; + btni_t btnit[36]; +} ATTRIBUTE_PACKED hli_t; + +/** + * PCI packet + */ +typedef struct { + pci_gi_t pci_gi; + nsml_agli_t nsml_agli; + hli_t hli; + uint8_t zero1[189]; +} ATTRIBUTE_PACKED pci_t; + + +#if PRAGMA_PACK +#pragma pack() +#endif + +#endif /* VSLHC */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + /** * What's between a directory and a filename? */ @@ -118,10 +395,22 @@ vlc_module_begin(); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_DEMUX ); - add_bool( "mkv-seek-percent", 1, NULL, + add_bool( "mkv-use-ordered-chapters", 1, NULL, + N_("Ordered chapters"), + 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 ); + + add_bool( "mkv-seek-percent", 0, NULL, N_("Seek based on percent not time"), N_("Seek based on percent not time"), VLC_TRUE ); + add_bool( "mkv-use-dummy", 0, NULL, + N_("Dummy Elements"), + N_("Read and discard unknown EBML elements (not good for broken files)"), VLC_TRUE ); + add_shortcut( "mka" ); add_shortcut( "mkv" ); vlc_module_end(); @@ -182,12 +471,12 @@ block_t *block_zlib_decompress( vlc_object_t *p_this, block_t *p_in_block ) { /** * Helper function to print the mkv parse tree */ -static void MkvTree( demux_t *p_this, int i_level, char *psz_format, ... ) +static void MkvTree( demux_t & demuxer, int i_level, char *psz_format, ... ) { va_list args; if( i_level > 9 ) { - msg_Err( p_this, "too deep tree" ); + msg_Err( &demuxer, "too deep tree" ); return; } va_start( args, psz_format ); @@ -197,7 +486,7 @@ static void MkvTree( demux_t *p_this, 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(p_this), VLC_MSG_DBG, "mkv", psz_foo2, args ); + __msg_GenericVa( VLC_OBJECT(&demuxer), VLC_MSG_DBG, "mkv", psz_foo2, args ); free( psz_foo2 ); va_end( args ); } @@ -227,11 +516,12 @@ class vlc_stream_io_callback: public IOCallback class EbmlParser { public: - EbmlParser( EbmlStream *es, EbmlElement *el_start ); - ~EbmlParser( void ); + EbmlParser( EbmlStream *es, EbmlElement *el_start, demux_t *p_demux ); + virtual ~EbmlParser( void ); void Up( void ); void Down( void ); + void Reset( demux_t *p_demux ); EbmlElement *Get( void ); void Keep( void ); @@ -241,11 +531,13 @@ class EbmlParser EbmlStream *m_es; int mi_level; EbmlElement *m_el[10]; + int64_t mi_remain_size[10]; EbmlElement *m_got; int mi_user_level; vlc_bool_t mb_keep; + vlc_bool_t mb_dummy; }; @@ -263,12 +555,12 @@ static vlc_fourcc_t __GetFOURCC( uint8_t *p ) *****************************************************************************/ typedef struct { - vlc_bool_t b_default; - vlc_bool_t b_enabled; - int i_number; + vlc_bool_t b_default; + vlc_bool_t b_enabled; + unsigned int i_number; - int i_extra_data; - uint8_t *p_extra_data; + int i_extra_data; + uint8_t *p_extra_data; char *psz_codec; @@ -287,6 +579,7 @@ typedef struct /* hack : it's for seek */ vlc_bool_t b_search_keyframe; + vlc_bool_t b_silent; /* informative */ char *psz_codec_name; @@ -310,119 +603,443 @@ typedef struct vlc_bool_t b_key; } mkv_index_t; -class chapter_item_t +class demux_sys_t; + +const binary MATROSKA_DVD_LEVEL_SS = 0x30; +const binary MATROSKA_DVD_LEVEL_LU = 0x2A; +const binary MATROSKA_DVD_LEVEL_TT = 0x28; +const binary MATROSKA_DVD_LEVEL_PGC = 0x20; +const binary MATROSKA_DVD_LEVEL_PG = 0x18; +const binary MATROSKA_DVD_LEVEL_PTT = 0x10; +const binary MATROSKA_DVD_LEVEL_CN = 0x08; + +class chapter_codec_cmds_c +{ +public: + chapter_codec_cmds_c( demux_sys_t & demuxer, int codec_id = -1) + :i_codec_id( codec_id ) + ,sys( demuxer ) + {} + + virtual ~chapter_codec_cmds_c() {} + + void SetPrivate( const KaxChapterProcessPrivate & private_data ) + { + m_private_data = *( new KaxChapterProcessPrivate( private_data ) ); + } + + void AddCommand( const KaxChapterProcessCommand & command ); + + /// \return wether the codec has seeked in the files or not + virtual bool Enter() { return false; } + virtual bool Leave() { return false; } + virtual std::string GetCodecName( bool f_for_title = false ) const { return ""; } + + KaxChapterProcessPrivate m_private_data; + +protected: + std::vector enter_cmds; + std::vector during_cmds; + std::vector leave_cmds; + + int i_codec_id; + demux_sys_t & sys; +}; + +class dvd_command_interpretor_c +{ +public: + dvd_command_interpretor_c( demux_sys_t & demuxer ) + :sys( demuxer ) + { + memset( p_PRMs, 0, sizeof(p_PRMs) ); + p_PRMs[ 0x80 + 1 ] = 15; + p_PRMs[ 0x80 + 2 ] = 62; + p_PRMs[ 0x80 + 3 ] = 1; + p_PRMs[ 0x80 + 4 ] = 1; + p_PRMs[ 0x80 + 7 ] = 1; + p_PRMs[ 0x80 + 8 ] = 1; + p_PRMs[ 0x80 + 16 ] = 0xFFFFu; + p_PRMs[ 0x80 + 18 ] = 0xFFFFu; + } + + bool Interpret( const binary * p_command, size_t i_size = 8 ); + + uint16 GetPRM( size_t index ) const + { + if ( index < 256 ) + return p_PRMs[ index ]; + else return 0; + } + + uint16 GetGPRM( size_t index ) const + { + if ( index >= 0 && index < 16 ) + return p_PRMs[ index ]; + else return 0; + } + + uint16 GetSPRM( size_t index ) const + { + // 21,22,23 reserved for future use + if ( index >= 0x80 && index < 0x95 ) + return p_PRMs[ index ]; + else return 0; + } + + bool SetPRM( size_t index, uint16 value ) + { + if ( index >= 0 && index < 16 ) + { + p_PRMs[ index ] = value; + return true; + } + return false; + } + + bool SetGPRM( size_t index, uint16 value ) + { + if ( index >= 0 && index < 16 ) + { + p_PRMs[ index ] = value; + return true; + } + return false; + } + + bool SetSPRM( size_t index, uint16 value ) + { + if ( index > 0x80 && index <= 0x8D && index != 0x8C ) + { + p_PRMs[ index ] = value; + return true; + } + return false; + } + +protected: + std::string GetRegTypeName( bool b_value, uint16 value ) const + { + std::string result; + char s_value[6], s_reg_value[6]; + sprintf( s_value, "%.5d", value ); + + if ( b_value ) + { + result = "value ("; + result += s_value; + result += ")"; + } + else if ( value < 0x80 ) + { + sprintf( s_reg_value, "%.5d", GetPRM( value ) ); + result = "GPreg["; + result += s_value; + result += "] ("; + result += s_reg_value; + result += ")"; + } + else + { + sprintf( s_reg_value, "%.5d", GetPRM( value ) ); + result = "SPreg["; + result += s_value; + result += "] ("; + result += s_reg_value; + result += ")"; + } + return result; + } + + uint16 p_PRMs[256]; + demux_sys_t & sys; + + // 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_NOP = 0x0000; + static const uint16 CMD_DVD_GOTO_LINE = 0x0001; + static const uint16 CMD_DVD_BREAK = 0x0002; + // Links + static const uint16 CMD_DVD_NOP2 = 0x2001; + static const uint16 CMD_DVD_LINKPGCN = 0x2004; + static const uint16 CMD_DVD_LINKPGN = 0x2006; + static const uint16 CMD_DVD_LINKCN = 0x2007; + static const uint16 CMD_DVD_JUMP_TT = 0x3002; + static const uint16 CMD_DVD_JUMPVTS_TT = 0x3003; + static const uint16 CMD_DVD_JUMP_SS = 0x3006; + static const uint16 CMD_DVD_CALLSS_VTSM1 = 0x3008; + // + static const uint16 CMD_DVD_SET_HL_BTNN2 = 0x4600; + static const uint16 CMD_DVD_SET_HL_BTNN_LINKPGCN1 = 0x4604; + static const uint16 CMD_DVD_SET_AUDIO = 0x5100; + static const uint16 CMD_DVD_SET_GPRMMD = 0x5300; + static const uint16 CMD_DVD_SET_HL_BTNN1 = 0x5600; + static const uint16 CMD_DVD_SET_HL_BTNN_LINKPGCN2 = 0x5604; + static const uint16 CMD_DVD_SET_HL_BTNN_LINKCN = 0x5607; + // Operations + static const uint16 CMD_DVD_MOV_SPREG_PREG = 0x6100; + static const uint16 CMD_DVD_GPREG_MOV_VALUE = 0x7100; + static const uint16 CMD_DVD_SUB_GPREG = 0x7400; + static const uint16 CMD_DVD_MULT_GPREG = 0x7500; + static const uint16 CMD_DVD_GPREG_DIV_VALUE = 0x7600; + static const uint16 CMD_DVD_GPREG_AND_VALUE = 0x7900; + + // callbacks when browsing inside CodecPrivate + static bool MatchTitleNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchPgcType ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchPgcNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); + static bool MatchCellNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); +}; + +class dvd_chapter_codec_c : public chapter_codec_cmds_c +{ +public: + dvd_chapter_codec_c( demux_sys_t & sys ) + :chapter_codec_cmds_c( sys, 1 ) + {} + + bool Enter(); + bool Leave(); + std::string GetCodecName( bool f_for_title = false ) const; +}; + +class matroska_script_interpretor_c +{ +public: + matroska_script_interpretor_c( demux_sys_t & demuxer ) + :sys( demuxer ) + {} + + bool Interpret( const binary * p_command, size_t i_size ); + + // DVD command IDs + static const std::string CMD_MS_GOTO_AND_PLAY; + +protected: + demux_sys_t & sys; +}; + +const std::string matroska_script_interpretor_c::CMD_MS_GOTO_AND_PLAY = "GotoAndPlay"; + + +class matroska_script_codec_c : public chapter_codec_cmds_c +{ +public: + matroska_script_codec_c( demux_sys_t & sys ) + :chapter_codec_cmds_c( sys, 0 ) + ,interpretor( sys ) + {} + + bool Enter(); + bool Leave(); + +protected: + matroska_script_interpretor_c interpretor; +}; + +class chapter_translation_c +{ +public: + KaxChapterTranslateID translated; + unsigned int codec_id; + std::vector editions; +}; + +class chapter_item_c { public: - chapter_item_t() + chapter_item_c() :i_start_time(0) ,i_end_time(-1) ,i_user_start_time(-1) ,i_user_end_time(-1) ,i_seekpoint_num(-1) ,b_display_seekpoint(true) + ,b_user_display(false) ,psz_parent(NULL) + ,b_is_leaving(false) {} - - int64_t RefreshChapters( bool b_ordered, int64_t i_prev_user_time, input_title_t & title ); - const chapter_item_t * FindTimecode( mtime_t i_timecode ) const; + + virtual ~chapter_item_c() + { + std::vector::iterator index = codecs.begin(); + while ( index != codecs.end() ) + { + delete (*index); + index++; + } + std::vector::iterator index_ = sub_chapters.begin(); + while ( index_ != sub_chapters.end() ) + { + delete (*index_); + index_++; + } + } + + 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 ); + 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, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, + size_t i_cookie_size ); + std::string GetCodecName( bool f_for_title = false ) const; + bool ParentOf( const chapter_item_c & item ) const; int64_t i_start_time, i_end_time; int64_t i_user_start_time, i_user_end_time; /* the time in the stream when an edition is ordered */ - std::vector sub_chapters; + std::vector sub_chapters; int i_seekpoint_num; int64_t i_uid; bool b_display_seekpoint; + bool b_user_display; std::string psz_name; - chapter_item_t *psz_parent; + chapter_item_c *psz_parent; + bool b_is_leaving; - bool operator<( const chapter_item_t & item ) const + std::vector codecs; + + bool operator<( const chapter_item_c & item ) const { return ( i_user_start_time < item.i_user_start_time || (i_user_start_time == item.i_user_start_time && i_user_end_time < item.i_user_end_time) ); } -protected: - bool Enter(); - bool Leave(); + bool Enter( bool b_do_subchapters ); + bool Leave( bool b_do_subchapters ); + bool EnterAndLeave( chapter_item_c *p_item ); }; -class chapter_edition_t +class chapter_edition_c : public chapter_item_c { public: - chapter_edition_t() - :i_uid(-1) - ,b_ordered(false) + chapter_edition_c() + :b_ordered(false) {} - void RefreshChapters( input_title_t & title ); - double Duration() const; - const chapter_item_t * FindTimecode( mtime_t i_timecode ) const; + void RefreshChapters( ); + mtime_t Duration() const; + std::string GetMainName() const; - std::vector chapters; - int64_t i_uid; bool b_ordered; }; -class demux_sys_t +class matroska_segment_c { public: - demux_sys_t() - :in(NULL) - ,es(NULL) - ,ep(NULL) - ,i_timescale(0) - ,f_duration(0.0) - ,i_track(0) - ,track(NULL) - ,i_cues_position(0) - ,i_chapters_position(0) - ,i_tags_position(0) - ,segment(NULL) + matroska_segment_c( demux_sys_t & demuxer, EbmlStream & estream ) + :segment(NULL) + ,es(estream) + ,i_timescale(MKVD_TIMECODESCALE) + ,i_duration(-1) + ,i_start_time(0) + ,i_cues_position(-1) + ,i_chapters_position(-1) + ,i_tags_position(-1) ,cluster(NULL) - ,i_pts(0) - ,i_start_pts(0) - ,i_chapter_time(0) - ,b_cues(false) + ,i_start_pos(0) + ,b_cues(VLC_FALSE) ,i_index(0) - ,i_index_max(0) - ,index(NULL) + ,i_index_max(1024) ,psz_muxing_application(NULL) ,psz_writing_application(NULL) ,psz_segment_filename(NULL) ,psz_title(NULL) ,psz_date_utc(NULL) - ,meta(NULL) - ,title(NULL) - ,i_current_edition(0) - ,psz_current_chapter(NULL) - {} + ,i_default_edition(0) + ,sys(demuxer) + ,ep(NULL) + ,b_preloaded(false) + { + index = (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 ) + { + free( tracks[i_track]->fmt.psz_description ); + } + 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 ); + } + if( psz_muxing_application ) + { + free( psz_muxing_application ); + } + if( psz_segment_filename ) + { + free( psz_segment_filename ); + } + if( psz_title ) + { + free( psz_title ); + } + if( psz_date_utc ) + { + free( psz_date_utc ); + } + if ( index ) + free( index ); + + delete ep; - vlc_stream_io_callback *in; - EbmlStream *es; - EbmlParser *ep; + std::vector::iterator index = stored_editions.begin(); + while ( index != stored_editions.end() ) + { + delete (*index); + index++; + } + } + + KaxSegment *segment; + EbmlStream & es; /* time scale */ uint64_t i_timescale; /* duration of the segment */ - float f_duration; + mtime_t i_duration; + mtime_t i_start_time; /* all tracks */ - int i_track; - mkv_track_t *track; + std::vector tracks; /* from seekhead */ int64_t i_cues_position; int64_t i_chapters_position; int64_t i_tags_position; - /* current data */ - KaxSegment *segment; KaxCluster *cluster; + int64_t i_start_pos; KaxSegmentUID segment_uid; - - mtime_t i_pts; - mtime_t i_start_pts; - mtime_t i_chapter_time; + KaxPrevUID prev_segment_uid; + KaxNextUID next_segment_uid; vlc_bool_t b_cues; int i_index; @@ -436,171 +1053,330 @@ public: char *psz_title; char *psz_date_utc; - vlc_meta_t *meta; - - input_title_t *title; + /* !!!!! GCC 3.3 bug on Darwin !!!!! */ + /* when you remove this variable the compiler issues an atomicity error */ + /* this variable only works when using std::vector */ + std::vector stored_editions; + int i_default_edition; - std::vector families; - std::vector family_members; + std::vector translations; + std::vector families; - std::vector editions; - int i_current_edition; - const chapter_item_t *psz_current_chapter; + demux_sys_t & sys; + EbmlParser *ep; + bool b_preloaded; + + bool Preload( ); + bool PreloadFamily( const matroska_segment_c & segment ); + void ParseInfo( KaxInfo *info ); + void ParseChapters( KaxChapters *chapters ); + void ParseSeekHead( KaxSeekHead *seekhead ); + void ParseTracks( KaxTracks *tracks ); + void ParseChapterAtom( int i_level, KaxChapterAtom *ca, chapter_item_c & chapters ); + void ParseTrackEntry( KaxTrackEntry *m ); + void ParseCluster( ); + void IndexAppendCluster( KaxCluster *cluster ); + void LoadCues( ); + 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 ); + bool Select( mtime_t i_start_time ); + void UnSelect( ); + + static bool CompareSegmentUIDs( const matroska_segment_c * item_a, const matroska_segment_c * item_b ); }; -static int Demux ( demux_t * ); -static int Control( demux_t *, int, va_list ); -static void Seek ( demux_t *, mtime_t i_date, double f_percent, const chapter_item_t *psz_chapter ); - -#define MKVD_TIMECODESCALE 1000000 - -#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId ) - -static void IndexAppendCluster ( demux_t *p_demux, KaxCluster *cluster ); -static char *UTF8ToStr ( const UTFstring &u ); -static void LoadCues ( demux_t * ); -static void InformationCreate ( demux_t * ); - -static void ParseInfo( demux_t *, EbmlElement *info ); -static void ParseTracks( demux_t *, EbmlElement *tracks ); -static void ParseSeekHead( demux_t *, EbmlElement *seekhead ); -static void ParseChapters( demux_t *, EbmlElement *chapters ); - -/***************************************************************************** - * Open: initializes matroska demux structures - *****************************************************************************/ -static int Open( vlc_object_t * p_this ) +// class holding hard-linked segment together in the playback order +class virtual_segment_c { - demux_t *p_demux = (demux_t*)p_this; - demux_sys_t *p_sys; - uint8_t *p_peek; - std::string s_path, s_filename; - int i_upper_lvl; - size_t i; - - int i_track; - - EbmlElement *el = NULL, *el1 = NULL; +public: + virtual_segment_c( matroska_segment_c *p_segment ) + :p_editions(NULL) + ,i_sys_title(0) + ,i_current_segment(0) + ,i_current_edition(-1) + ,psz_current_chapter(NULL) + { + linked_segments.push_back( p_segment ); - /* peek the begining */ - if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC; + AppendUID( p_segment->segment_uid ); + AppendUID( p_segment->prev_segment_uid ); + AppendUID( p_segment->next_segment_uid ); + } - /* is a valid file */ - if( p_peek[0] != 0x1a || p_peek[1] != 0x45 || - p_peek[2] != 0xdf || p_peek[3] != 0xa3 ) return VLC_EGENERIC; + void Sort(); + size_t AddSegment( matroska_segment_c *p_segment ); + void PreloadLinked( ); + mtime_t Duration( ) const; + void LoadCues( ); + void Seek( demux_t & demuxer, mtime_t i_date, mtime_t i_time_offset, chapter_item_c *psz_chapter ); - /* Set the demux function */ - p_demux->pf_demux = Demux; - p_demux->pf_control = Control; - p_demux->p_sys = p_sys = new demux_sys_t; - - p_sys->in = new vlc_stream_io_callback( p_demux->s ); - p_sys->es = new EbmlStream( *p_sys->in ); - p_sys->f_duration = -1; - p_sys->i_timescale = MKVD_TIMECODESCALE; - p_sys->i_track = 0; - p_sys->track = (mkv_track_t*)malloc( sizeof( mkv_track_t ) ); - p_sys->i_pts = 0; - p_sys->i_cues_position = -1; - p_sys->i_chapters_position = -1; - p_sys->i_tags_position = -1; - - p_sys->b_cues = VLC_FALSE; - p_sys->i_index = 0; - p_sys->i_index_max = 1024; - p_sys->index = (mkv_index_t*)malloc( sizeof( mkv_index_t ) * - p_sys->i_index_max ); - - p_sys->psz_muxing_application = NULL; - p_sys->psz_writing_application = NULL; - p_sys->psz_segment_filename = NULL; - p_sys->psz_title = NULL; - p_sys->psz_date_utc = NULL;; - p_sys->meta = NULL; - p_sys->title = NULL; - - if( p_sys->es == NULL ) - { - msg_Err( p_demux, "failed to create EbmlStream" ); - delete p_sys->in; - delete p_sys; - return VLC_EGENERIC; - } - /* Find the EbmlHead element */ - el = p_sys->es->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFL); - if( el == NULL ) + inline chapter_edition_c *Edition() { - msg_Err( p_demux, "cannot find EbmlHead" ); - goto error; + if ( i_current_edition >= 0 && size_t(i_current_edition) < p_editions->size() ) + return (*p_editions)[i_current_edition]; + return NULL; } - msg_Dbg( p_demux, "EbmlHead" ); - /* skip it */ - el->SkipData( *p_sys->es, el->Generic().Context ); - delete el; - /* Find a segment */ - el = p_sys->es->FindNextID( KaxSegment::ClassInfos, 0xFFFFFFFFL); - if( el == NULL ) + matroska_segment_c * Segment() const { - msg_Err( p_demux, "cannot find KaxSegment" ); - goto error; + if ( linked_segments.size() == 0 || i_current_segment >= linked_segments.size() ) + return NULL; + return linked_segments[i_current_segment]; } - MkvTree( p_demux, 0, "Segment" ); - p_sys->segment = (KaxSegment*)el; - p_sys->cluster = NULL; - p_sys->ep = new EbmlParser( p_sys->es, el ); + inline chapter_item_c *CurrentChapter() { + return psz_current_chapter; + } - while( ( el1 = p_sys->ep->Get() ) != NULL ) + bool SelectNext() { - if( MKV_IS_ID( el1, KaxInfo ) ) + if ( i_current_segment < linked_segments.size()-1 ) { - ParseInfo( p_demux, el1 ); + i_current_segment++; + return true; } - else if( MKV_IS_ID( el1, KaxTracks ) ) - { - ParseTracks( p_demux, el1 ); - } - else if( MKV_IS_ID( el1, KaxSeekHead ) ) - { - ParseSeekHead( p_demux, el1 ); - } - else if( MKV_IS_ID( el1, KaxCues ) ) + return false; + } + + bool FindUID( KaxSegmentUID & uid ) const + { + for ( size_t i=0; icluster = (KaxCluster*)el1; + bool UpdateCurrentToChapter( demux_t & demux ); + void PrepareChapters( ); - p_sys->ep->Down(); - /* stop parsing the stream */ - break; - } - else if( MKV_IS_ID( el1, KaxAttachments ) ) - { - msg_Dbg( p_demux, "| + Attachments FIXME TODO (but probably never supported)" ); - } - else if( MKV_IS_ID( el1, KaxChapters ) ) - { - msg_Dbg( p_demux, "| + Chapters" ); - ParseChapters( p_demux, el1 ); - } - else if( MKV_IS_ID( el1, KaxTag ) ) - { - msg_Dbg( p_demux, "| + Tags FIXME TODO" ); - } - else - { - msg_Dbg( p_demux, "| + Unknown (%s)", typeid(*el1).name() ); - } + chapter_item_c *BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, + size_t i_cookie_size ); + chapter_item_c *FindChapter( int64_t i_find_uid ); + + std::vector *p_editions; + int i_sys_title; + +protected: + std::vector linked_segments; + std::vector linked_uids; + size_t i_current_segment; + + int i_current_edition; + chapter_item_c *psz_current_chapter; + + void AppendUID( const EbmlBinary & UID ); +}; + +class matroska_stream_c +{ +public: + matroska_stream_c( demux_sys_t & demuxer ) + :p_in(NULL) + ,p_es(NULL) + ,sys(demuxer) + {} + + virtual ~matroska_stream_c() + { + delete p_in; + delete p_es; + } + + IOCallback *p_in; + EbmlStream *p_es; + + std::vector segments; + + demux_sys_t & sys; +}; + +typedef struct +{ + VLC_COMMON_MEMBERS + + demux_t *p_demux; + vlc_mutex_t lock; + + vlc_bool_t b_moved; + vlc_bool_t b_clicked; + vlc_bool_t b_key; + +} event_thread_t; + +class demux_sys_t +{ +public: + demux_sys_t( demux_t & demux ) + :demuxer(demux) + ,i_pts(0) + ,i_start_pts(0) + ,i_chapter_time(0) + ,meta(NULL) + ,i_current_title(0) + ,p_current_segment(NULL) + ,dvd_interpretor( *this ) + ,f_duration(-1.0) + ,b_ui_hooked(false) + ,p_input(NULL) + ,i_curr_button(0) + ,p_ev(NULL) + { + vlc_mutex_init( &demuxer, &lock_demuxer ); + } + + virtual ~demux_sys_t() + { + StopUiThread(); + size_t i; + for ( i=0; i titles; // matroska editions + size_t i_current_title; + + std::vector streams; + std::vector opened_segments; + std::vector used_segments; + virtual_segment_c *p_current_segment; + + dvd_command_interpretor_c dvd_interpretor; + + /* duration of the stream */ + float f_duration; + + matroska_segment_c *FindSegment( const EbmlBinary & uid ) const; + chapter_item_c *BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, + size_t i_cookie_size, + virtual_segment_c * & p_segment_found ); + chapter_item_c *FindChapter( int64_t i_find_uid, virtual_segment_c * & p_segment_found ); + + 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 ); + + void StartUiThread(); + void StopUiThread(); + bool b_ui_hooked; + inline void SwapButtons(); + + /* for spu variables */ + input_thread_t *p_input; + pci_t pci_packet; + int16 i_curr_button; + uint8_t alpha[4]; + vlc_mutex_t lock_demuxer; + + /* event */ + event_thread_t *p_ev; + static int EventThread( vlc_object_t *p_this ); + static int EventMouse( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *p_data ); + static int EventKey( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *p_data ); + + + +protected: + virtual_segment_c *VirtualFromSegments( matroska_segment_c *p_segment ) const; + bool IsUsedSegment( matroska_segment_c &p_segment ) const; +}; + +static int Demux ( demux_t * ); +static int Control( demux_t *, int, va_list ); +static void Seek ( demux_t *, mtime_t i_date, double f_percent, chapter_item_c *psz_chapter ); + +#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId ) + +static char *UTF8ToStr ( const UTFstring &u ); + +/***************************************************************************** + * Open: initializes matroska demux structures + *****************************************************************************/ +static int Open( vlc_object_t * p_this ) +{ + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; + matroska_stream_c *p_stream; + matroska_segment_c *p_segment; + uint8_t *p_peek; + std::string s_path, s_filename; + vlc_stream_io_callback *p_io_callback; + EbmlStream *p_io_stream; + + /* peek the begining */ + if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC; + + /* is a valid file */ + if( p_peek[0] != 0x1a || p_peek[1] != 0x45 || + p_peek[2] != 0xdf || p_peek[3] != 0xa3 ) return VLC_EGENERIC; + + /* Set the demux function */ + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; + p_demux->p_sys = p_sys = new demux_sys_t( *p_demux ); + + p_io_callback = new vlc_stream_io_callback( p_demux->s ); + p_io_stream = new EbmlStream( *p_io_callback ); + + if( p_io_stream == NULL ) + { + msg_Err( p_demux, "failed to create EbmlStream" ); + delete p_io_callback; + delete p_sys; + return VLC_EGENERIC; + } + + p_stream = p_sys->AnalyseAllSegmentsFound( p_io_stream ); + if( p_stream == NULL ) + { + msg_Err( p_demux, "cannot find KaxSegment" ); + goto error; + } + p_sys->streams.push_back( p_stream ); + + p_stream->p_in = p_io_callback; + p_stream->p_es = p_io_stream; + + for (size_t i=0; isegments.size(); i++) + { + p_stream->segments[i]->Preload(); + } + + p_segment = p_stream->segments[0]; + if( p_segment->cluster != NULL ) + { + msg_Warn( p_demux, "cannot find any cluster, damaged file ?" ); + + // reset the stream reading to the first cluster of the segment used + 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) */ - /* _todo_ handle multi-segment files */ - if (p_demux->psz_path[0] != '\0' && (!strcmp(p_demux->psz_access, "") || !strcmp(p_demux->psz_access, ""))) + if (p_demux->psz_path[0] != '\0' && !strcmp(p_demux->psz_access, "")) { // assume it's a regular file // get the directory path @@ -629,7 +1405,7 @@ static int Open( vlc_object_t * p_this ) s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name; if (!s_filename.compare(p_demux->psz_path)) - continue; + continue; // don't reuse the original opened file #if defined(__GNUC__) && (__GNUC__ < 3) if (!s_filename.compare("mkv", s_filename.length() - 3, 3) || @@ -640,96 +1416,21 @@ static int Open( vlc_object_t * p_this ) #endif { // test wether this file belongs to the our family - bool b_keep_file_opened = false; StdIOCallback *p_file_io = new StdIOCallback(s_filename.c_str(), MODE_READ); - EbmlStream *p_stream = new EbmlStream(*p_file_io); - EbmlElement *p_l0, *p_l1, *p_l2; - - // verify the EBML Header - p_l0 = p_stream->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFL); - if (p_l0 == NULL) - { - delete p_stream; - delete p_file_io; - continue; - } + EbmlStream *p_estream = new EbmlStream(*p_file_io); - p_l0->SkipData(*p_stream, EbmlHead_Context); - delete p_l0; - - // find all segments in this file - p_l0 = p_stream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL); - if (p_l0 == NULL) + p_stream = p_sys->AnalyseAllSegmentsFound( p_estream ); + if ( p_stream == NULL ) { - delete p_stream; + msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() ); + delete p_estream; delete p_file_io; - continue; - } - - i_upper_lvl = 0; - - while (p_l0 != 0) - { - if (EbmlId(*p_l0) == KaxSegment::ClassInfos.GlobalId) - { - EbmlParser *ep; - KaxSegmentUID *p_uid = NULL; - - ep = new EbmlParser(p_stream, p_l0); - bool b_this_segment_matches = false; - while ((p_l1 = ep->Get())) - { - if (MKV_IS_ID(p_l1, KaxInfo)) - { - // find the families of this segment - KaxInfo *p_info = static_cast(p_l1); - - p_info->Read(*p_stream, KaxInfo::ClassInfos.Context, i_upper_lvl, p_l2, true); - for( i = 0; i < p_info->ListSize() && !b_this_segment_matches; i++ ) - { - EbmlElement *l = (*p_info)[i]; - - if( MKV_IS_ID( l, KaxSegmentUID ) ) - { - p_uid = static_cast(l); - if (p_sys->segment_uid == *p_uid) - break; - } - else if( MKV_IS_ID( l, KaxSegmentFamily ) ) - { - KaxSegmentFamily *p_fam = static_cast(l); - std::vector::iterator iter; - for( iter = p_sys->families.begin(); - iter != p_sys->families.end(); - iter++ ) - { - if( *iter == *p_fam ) - { - b_this_segment_matches = true; - break; - } - } - } - } - break; - } - } - - if (b_this_segment_matches) - { - b_keep_file_opened = true; - } - } - - p_l0->SkipData(*p_stream, EbmlHead_Context); - delete p_l0; - p_l0 = p_stream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL); } - - if (!b_keep_file_opened) + else { - delete p_stream; - delete p_file_io; + p_stream->p_in = p_file_io; + p_stream->p_es = p_estream; + p_sys->streams.push_back( p_stream ); } } } @@ -738,508 +1439,147 @@ static int Open( vlc_object_t * p_this ) } } - - if( p_sys->cluster == NULL ) + p_sys->PreloadFamily( *p_segment ); + p_sys->PreloadLinked( p_segment ); + if ( !p_sys->PreparePlayback( NULL ) ) { - msg_Err( p_demux, "cannot find any cluster, damaged file ?" ); + msg_Err( p_demux, "cannot use the segment" ); goto error; } + + return VLC_SUCCESS; - /* *** Load the cue if found *** */ - if( p_sys->i_cues_position >= 0 ) - { - vlc_bool_t b_seekable; +error: + delete p_sys; + return VLC_EGENERIC; +} - stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable ); - if( b_seekable ) - { - LoadCues( p_demux ); - } - } +/***************************************************************************** + * Close: frees unused data + *****************************************************************************/ +static void Close( vlc_object_t *p_this ) +{ + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys = p_demux->p_sys; - if( !p_sys->b_cues || p_sys->i_index <= 0 ) - { - msg_Warn( p_demux, "no cues/empty cues found->seek won't be precise" ); + delete p_sys; +} - IndexAppendCluster( p_demux, p_sys->cluster ); +/***************************************************************************** + * Control: + *****************************************************************************/ +static int Control( demux_t *p_demux, int i_query, va_list args ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + int64_t *pi64; + double *pf, f; + int i_skp; + size_t i_idx; - p_sys->b_cues = VLC_FALSE; - } + vlc_meta_t **pp_meta; - /* add all es */ - msg_Dbg( p_demux, "found %d es", p_sys->i_track ); - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) + switch( i_query ) { -#define tk p_sys->track[i_track] - if( tk.fmt.i_cat == UNKNOWN_ES ) - { - msg_Warn( p_demux, "invalid track[%d, n=%d]", i_track, tk.i_number ); - tk.p_es = NULL; - continue; - } + case DEMUX_GET_META: + pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** ); + *pp_meta = vlc_meta_Duplicate( p_sys->meta ); + return VLC_SUCCESS; - if( !strcmp( tk.psz_codec, "V_MS/VFW/FOURCC" ) ) - { - if( tk.i_extra_data < (int)sizeof( BITMAPINFOHEADER ) ) + case DEMUX_GET_LENGTH: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( p_sys->f_duration > 0.0 ) { - msg_Err( p_demux, "missing/invalid BITMAPINFOHEADER" ); - tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + *pi64 = (int64_t)(p_sys->f_duration * 1000); + return VLC_SUCCESS; } - else + return VLC_EGENERIC; + + case DEMUX_GET_POSITION: + pf = (double*)va_arg( args, double * ); + if ( p_sys->f_duration > 0.0 ) + *pf = (double)(p_sys->i_pts >= p_sys->i_start_pts ? p_sys->i_pts : p_sys->i_start_pts ) / (1000.0 * p_sys->f_duration); + return VLC_SUCCESS; + + case DEMUX_SET_POSITION: + f = (double)va_arg( args, double ); + Seek( p_demux, -1, f, NULL ); + return VLC_SUCCESS; + + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + *pi64 = p_sys->i_pts; + return VLC_SUCCESS; + + case DEMUX_GET_TITLE_INFO: + if( p_sys->titles.size() ) { - BITMAPINFOHEADER *p_bih = (BITMAPINFOHEADER*)tk.p_extra_data; + input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** ); + int *pi_int = (int*)va_arg( args, int* ); - tk.fmt.video.i_width = GetDWLE( &p_bih->biWidth ); - tk.fmt.video.i_height= GetDWLE( &p_bih->biHeight ); - tk.fmt.i_codec = GetFOURCC( &p_bih->biCompression ); + *pi_int = p_sys->titles.size(); + *ppp_title = (input_title_t**)malloc( sizeof( input_title_t**) * p_sys->titles.size() ); - tk.fmt.i_extra = GetDWLE( &p_bih->biSize ) - sizeof( BITMAPINFOHEADER ); - if( tk.fmt.i_extra > 0 ) + for( size_t i = 0; i < p_sys->titles.size(); i++ ) { - tk.fmt.p_extra = malloc( tk.fmt.i_extra ); - memcpy( tk.fmt.p_extra, &p_bih[1], tk.fmt.i_extra ); + (*ppp_title)[i] = vlc_input_title_Duplicate( &p_sys->titles[i] ); } + + return VLC_SUCCESS; } - } - else if( !strcmp( tk.psz_codec, "V_MPEG1" ) || - !strcmp( tk.psz_codec, "V_MPEG2" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' ); - } - else if( !strncmp( tk.psz_codec, "V_MPEG4", 7 ) ) - { - if( !strcmp( tk.psz_codec, "V_MPEG4/MS/V3" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' ); - } - else if( !strcmp( tk.psz_codec, "V_MPEG4/ISO/AVC" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'a', 'v', 'c', '1' ); - tk.fmt.b_packetized = VLC_FALSE; - tk.fmt.i_extra = tk.i_extra_data; - tk.fmt.p_extra = malloc( tk.i_extra_data ); - memcpy( tk.fmt.p_extra,tk.p_extra_data, tk.i_extra_data ); - } - else + return VLC_EGENERIC; + + case DEMUX_SET_TITLE: + /* TODO handle editions as titles */ + i_idx = (int)va_arg( args, int ); + if( i_idx < p_sys->used_segments.size() ) { - tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); + p_sys->PreparePlayback( p_sys->used_segments[i_idx] ); + return VLC_SUCCESS; } - } - else if( !strcmp( tk.psz_codec, "V_QUICKTIME" ) ) - { - MP4_Box_t *p_box = (MP4_Box_t*)malloc( sizeof( MP4_Box_t ) ); - stream_t *p_mp4_stream = stream_MemoryNew( VLC_OBJECT(p_demux), - tk.p_extra_data, - tk.i_extra_data ); - MP4_ReadBoxCommon( p_mp4_stream, p_box ); - MP4_ReadBox_sample_vide( p_mp4_stream, p_box ); - tk.fmt.i_codec = p_box->i_type; - tk.fmt.video.i_width = p_box->data.p_sample_vide->i_width; - tk.fmt.video.i_height = p_box->data.p_sample_vide->i_height; - tk.fmt.i_extra = p_box->data.p_sample_vide->i_qt_image_description; - tk.fmt.p_extra = malloc( tk.fmt.i_extra ); - memcpy( tk.fmt.p_extra, p_box->data.p_sample_vide->p_qt_image_description, tk.fmt.i_extra ); - MP4_FreeBox_sample_vide( p_box ); - stream_MemoryDelete( p_mp4_stream, VLC_TRUE ); - } - else if( !strcmp( tk.psz_codec, "A_MS/ACM" ) ) - { - if( tk.i_extra_data < (int)sizeof( WAVEFORMATEX ) ) + return VLC_EGENERIC; + + case DEMUX_SET_SEEKPOINT: + 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) { - msg_Err( p_demux, "missing/invalid WAVEFORMATEX" ); - tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + 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; } - else - { - WAVEFORMATEX *p_wf = (WAVEFORMATEX*)tk.p_extra_data; + return VLC_EGENERIC; - wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &tk.fmt.i_codec, NULL ); + case DEMUX_SET_TIME: + case DEMUX_GET_FPS: + default: + return VLC_EGENERIC; + } +} - tk.fmt.audio.i_channels = GetWLE( &p_wf->nChannels ); - tk.fmt.audio.i_rate = GetDWLE( &p_wf->nSamplesPerSec ); - tk.fmt.i_bitrate = GetDWLE( &p_wf->nAvgBytesPerSec ) * 8; - tk.fmt.audio.i_blockalign = GetWLE( &p_wf->nBlockAlign );; - tk.fmt.audio.i_bitspersample = GetWLE( &p_wf->wBitsPerSample ); - - tk.fmt.i_extra = GetWLE( &p_wf->cbSize ); - if( tk.fmt.i_extra > 0 ) - { - tk.fmt.p_extra = malloc( tk.fmt.i_extra ); - memcpy( tk.fmt.p_extra, &p_wf[1], tk.fmt.i_extra ); - } - } - } - else if( !strcmp( tk.psz_codec, "A_MPEG/L3" ) || - !strcmp( tk.psz_codec, "A_MPEG/L2" ) || - !strcmp( tk.psz_codec, "A_MPEG/L1" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' ); - } - else if( !strcmp( tk.psz_codec, "A_AC3" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); - } - else if( !strcmp( tk.psz_codec, "A_DTS" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' ); - } - else if( !strcmp( tk.psz_codec, "A_FLAC" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 'f', 'l', 'a', 'c' ); - tk.fmt.i_extra = tk.i_extra_data; - tk.fmt.p_extra = malloc( tk.i_extra_data ); - memcpy( tk.fmt.p_extra,tk.p_extra_data, tk.i_extra_data ); - } - else if( !strcmp( tk.psz_codec, "A_VORBIS" ) ) - { - int i, i_offset = 1, i_size[3], i_extra; - uint8_t *p_extra; - - tk.fmt.i_codec = VLC_FOURCC( 'v', 'o', 'r', 'b' ); - - /* Split the 3 headers */ - if( tk.p_extra_data[0] != 0x02 ) - msg_Err( p_demux, "invalid vorbis header" ); - - for( i = 0; i < 2; i++ ) - { - i_size[i] = 0; - while( i_offset < tk.i_extra_data ) - { - i_size[i] += tk.p_extra_data[i_offset]; - if( tk.p_extra_data[i_offset++] != 0xff ) break; - } - } - - i_size[0] = __MIN(i_size[0], tk.i_extra_data - i_offset); - i_size[1] = __MIN(i_size[1], tk.i_extra_data -i_offset -i_size[0]); - i_size[2] = tk.i_extra_data - i_offset - i_size[0] - i_size[1]; - - tk.fmt.i_extra = 3 * 2 + i_size[0] + i_size[1] + i_size[2]; - tk.fmt.p_extra = malloc( tk.fmt.i_extra ); - p_extra = (uint8_t *)tk.fmt.p_extra; i_extra = 0; - for( i = 0; i < 3; i++ ) - { - *(p_extra++) = i_size[i] >> 8; - *(p_extra++) = i_size[i] & 0xFF; - memcpy( p_extra, tk.p_extra_data + i_offset + i_extra, - i_size[i] ); - p_extra += i_size[i]; - i_extra += i_size[i]; - } - } - else if( !strncmp( tk.psz_codec, "A_AAC/MPEG2/", strlen( "A_AAC/MPEG2/" ) ) || - !strncmp( tk.psz_codec, "A_AAC/MPEG4/", strlen( "A_AAC/MPEG4/" ) ) ) - { - int i_profile, i_srate; - static unsigned int i_sample_rates[] = - { - 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, - 16000, 12000, 11025, 8000, 7350, 0, 0, 0 - }; - - tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); - /* create data for faad (MP4DecSpecificDescrTag)*/ - - if( !strcmp( &tk.psz_codec[12], "MAIN" ) ) - { - i_profile = 0; - } - else if( !strcmp( &tk.psz_codec[12], "LC" ) ) - { - i_profile = 1; - } - else if( !strcmp( &tk.psz_codec[12], "SSR" ) ) - { - i_profile = 2; - } - else - { - i_profile = 3; - } - - for( i_srate = 0; i_srate < 13; i_srate++ ) - { - if( i_sample_rates[i_srate] == tk.fmt.audio.i_rate ) - { - break; - } - } - msg_Dbg( p_demux, "profile=%d srate=%d", i_profile, i_srate ); - - tk.fmt.i_extra = 2; - tk.fmt.p_extra = malloc( tk.fmt.i_extra ); - ((uint8_t*)tk.fmt.p_extra)[0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1); - ((uint8_t*)tk.fmt.p_extra)[1] = ((i_srate & 0x1) << 7) | (tk.fmt.audio.i_channels << 3); - } - else if( !strcmp( tk.psz_codec, "A_PCM/INT/BIG" ) || - !strcmp( tk.psz_codec, "A_PCM/INT/LIT" ) || - !strcmp( tk.psz_codec, "A_PCM/FLOAT/IEEE" ) ) - { - if( !strcmp( tk.psz_codec, "A_PCM/INT/BIG" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' ); - } - else - { - tk.fmt.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' ); - } - tk.fmt.audio.i_blockalign = ( tk.fmt.audio.i_bitspersample + 7 ) / 8 * tk.fmt.audio.i_channels; - } - else if( !strcmp( tk.psz_codec, "A_TTA1" ) ) - { - /* FIXME: support this codec */ - msg_Err( p_demux, "TTA not supported yet[%d, n=%d]", i_track, tk.i_number ); - tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); - } - else if( !strcmp( tk.psz_codec, "A_WAVPACK4" ) ) - { - /* FIXME: support this codec */ - msg_Err( p_demux, "Wavpack not supported yet[%d, n=%d]", i_track, tk.i_number ); - tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); - } - else if( !strcmp( tk.psz_codec, "S_TEXT/UTF8" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); - tk.fmt.subs.psz_encoding = strdup( "UTF-8" ); - } - else if( !strcmp( tk.psz_codec, "S_TEXT/SSA" ) || - !strcmp( tk.psz_codec, "S_TEXT/ASS" ) || - !strcmp( tk.psz_codec, "S_SSA" ) || - !strcmp( tk.psz_codec, "S_ASS" )) - { - tk.fmt.i_codec = VLC_FOURCC( 's', 's', 'a', ' ' ); - tk.fmt.subs.psz_encoding = strdup( "UTF-8" ); - } - else if( !strcmp( tk.psz_codec, "S_VOBSUB" ) ) - { - tk.fmt.i_codec = VLC_FOURCC( 's','p','u',' ' ); - if( tk.i_extra_data ) - { - char *p_start; - char *p_buf = (char *)malloc( tk.i_extra_data + 1); - memcpy( p_buf, tk.p_extra_data , tk.i_extra_data ); - p_buf[tk.i_extra_data] = '\0'; - - p_start = strstr( p_buf, "size:" ); - if( sscanf( p_start, "size: %dx%d", - &tk.fmt.subs.spu.i_original_frame_width, &tk.fmt.subs.spu.i_original_frame_height ) == 2 ) - { - msg_Dbg( p_demux, "original frame size vobsubs: %dx%d", tk.fmt.subs.spu.i_original_frame_width, tk.fmt.subs.spu.i_original_frame_height ); - } - else - { - msg_Warn( p_demux, "reading original frame size for vobsub failed" ); - } - free( p_buf ); - } - } - else if( !strcmp( tk.psz_codec, "B_VOBBTN" ) ) - { - /* FIXME: support this codec */ - msg_Err( p_demux, "Vob Buttons not supported yet[%d, n=%d]", i_track, tk.i_number ); - tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); - } - else - { - msg_Err( p_demux, "unknow codec id=`%s'", tk.psz_codec ); - tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); - } - if( tk.b_default ) - { - tk.fmt.i_priority = 1000; - } - - tk.p_es = es_out_Add( p_demux->out, &tk.fmt ); -#undef tk - } - - /* add information */ - InformationCreate( p_demux ); - - return VLC_SUCCESS; - -error: - delete p_sys->es; - delete p_sys->in; - delete p_sys; - return VLC_EGENERIC; -} - -/***************************************************************************** - * Close: frees unused data - *****************************************************************************/ -static void Close( vlc_object_t *p_this ) -{ - demux_t *p_demux = (demux_t*)p_this; - demux_sys_t *p_sys = p_demux->p_sys; - int i_track; - - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) - { -#define tk p_sys->track[i_track] - if( tk.fmt.psz_description ) - { - free( tk.fmt.psz_description ); - } - if( tk.psz_codec ) - { - free( tk.psz_codec ); - } - if( tk.fmt.psz_language ) - { - free( tk.fmt.psz_language ); - } -#undef tk - } - free( p_sys->track ); - - if( p_sys->psz_writing_application ) - { - free( p_sys->psz_writing_application ); - } - if( p_sys->psz_muxing_application ) - { - free( p_sys->psz_muxing_application ); - } - - delete p_sys->segment; - - delete p_sys->ep; - delete p_sys->es; - delete p_sys->in; - delete p_sys; -} - -/***************************************************************************** - * Control: - *****************************************************************************/ -static int Control( demux_t *p_demux, int i_query, va_list args ) -{ - demux_sys_t *p_sys = p_demux->p_sys; - int64_t *pi64; - double *pf, f; - int i_skp; - mtime_t *i_sk_time; - - vlc_meta_t **pp_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 ); - return VLC_SUCCESS; - - case DEMUX_GET_LENGTH: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->f_duration > 0.0 ) - { - *pi64 = (int64_t)(p_sys->f_duration * 1000); - return VLC_SUCCESS; - } - return VLC_EGENERIC; - - case DEMUX_GET_POSITION: - pf = (double*)va_arg( args, double * ); -/* if (p_sys->i_pts < p_sys->i_start_pts) - *pf = (double)p_sys->i_start_pts / (1000.0 * p_sys->f_duration); - else*/ - *pf = (double)p_sys->i_pts / (1000.0 * p_sys->f_duration); - return VLC_SUCCESS; - - case DEMUX_SET_POSITION: - f = (double)va_arg( args, double ); - Seek( p_demux, -1, f, NULL ); - return VLC_SUCCESS; - - case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); -/* if (p_sys->i_pts < p_sys->i_start_pts) - *pi64 = p_sys->i_start_pts; - else*/ - *pi64 = p_sys->i_pts; - return VLC_SUCCESS; - - case DEMUX_GET_TITLE_INFO: - if( p_sys->title && p_sys->title->i_seekpoint > 0 ) - { - input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** ); - int *pi_int = (int*)va_arg( args, int* ); - - *pi_int = 1; - *ppp_title = (input_title_t**)malloc( sizeof( input_title_t**) ); - - (*ppp_title)[0] = vlc_input_title_Duplicate( p_sys->title ); - - return VLC_SUCCESS; - } - return VLC_EGENERIC; - - case DEMUX_SET_TITLE: - /* TODO handle editions as titles & DVD titles as well */ - if( p_sys->title && p_sys->title->i_seekpoint > 0 ) - { - return VLC_SUCCESS; - } - return VLC_EGENERIC; - - case DEMUX_SET_SEEKPOINT: - /* FIXME do a better implementation */ - i_skp = (int)va_arg( args, int ); - - if( p_sys->title && i_skp < p_sys->title->i_seekpoint) - { - Seek( p_demux, (int64_t)p_sys->title->seekpoint[i_skp]->i_time_offset, -1, NULL); - p_demux->info.i_seekpoint |= INPUT_UPDATE_SEEKPOINT; - p_demux->info.i_seekpoint = i_skp; - return VLC_SUCCESS; - } - return VLC_EGENERIC; - - case DEMUX_GET_SEEKPOINT_TIME: - i_skp = (int)va_arg( args, int ); - i_sk_time = (mtime_t *)va_arg( args, mtime_t * ); - if( p_sys->title && i_skp < p_sys->title->i_seekpoint) - { - *i_sk_time = p_sys->title->seekpoint[i_skp]->i_time_offset; - return VLC_SUCCESS; - } - return VLC_EGENERIC; - - case DEMUX_SET_TIME: - case DEMUX_GET_FPS: - default: - return VLC_EGENERIC; - } -} - -static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ) -{ - demux_sys_t *p_sys = p_demux->p_sys; - - *pp_block = NULL; - *pi_ref1 = -1; - *pi_ref2 = -1; +int matroska_segment_c::BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ) +{ + *pp_block = NULL; + *pi_ref1 = -1; + *pi_ref2 = -1; for( ;; ) { EbmlElement *el; int i_level; - if( p_demux->b_die ) - { + if ( ep == NULL ) return VLC_EGENERIC; - } - el = p_sys->ep->Get(); - i_level = p_sys->ep->GetLevel(); + el = ep->Get(); + i_level = ep->GetLevel(); if( el == NULL && *pp_block != NULL ) { /* update the index */ -#define idx p_sys->index[p_sys->i_index - 1] - if( p_sys->i_index > 0 && idx.i_time == -1 ) +#define idx index[i_index - 1] + if( i_index > 0 && idx.i_time == -1 ) { idx.i_time = (*pp_block)->GlobalTimecode() / (mtime_t)1000; idx.b_key = *pi_ref1 == -1 ? VLC_TRUE : VLC_FALSE; @@ -1250,78 +1590,87 @@ static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, in if( el == NULL ) { - if( p_sys->ep->GetLevel() > 1 ) + if( ep->GetLevel() > 1 ) { - p_sys->ep->Up(); + ep->Up(); continue; } - msg_Warn( p_demux, "EOF" ); + msg_Warn( &sys.demuxer, "EOF" ); return VLC_EGENERIC; } /* do parsing */ - if( i_level == 1 ) + switch ( i_level ) { + case 1: if( MKV_IS_ID( el, KaxCluster ) ) { - p_sys->cluster = (KaxCluster*)el; + cluster = (KaxCluster*)el; /* add it to the index */ - if( p_sys->i_index == 0 || - ( p_sys->i_index > 0 && p_sys->index[p_sys->i_index - 1].i_position < (int64_t)p_sys->cluster->GetElementPosition() ) ) + if( i_index == 0 || + ( i_index > 0 && index[i_index - 1].i_position < (int64_t)cluster->GetElementPosition() ) ) + { + IndexAppendCluster( cluster ); + } + + // reset silent tracks + for (size_t i=0; icluster ); + tracks[i]->b_silent = VLC_FALSE; } - p_sys->ep->Down(); + ep->Down(); } else if( MKV_IS_ID( el, KaxCues ) ) { - msg_Warn( p_demux, "find KaxCues FIXME" ); + msg_Warn( &sys.demuxer, "find KaxCues FIXME" ); return VLC_EGENERIC; } else { - msg_Dbg( p_demux, "unknown (%s)", typeid( el ).name() ); + msg_Dbg( &sys.demuxer, "unknown (%s)", typeid( el ).name() ); } - } - else if( i_level == 2 ) - { + break; + case 2: if( MKV_IS_ID( el, KaxClusterTimecode ) ) { KaxClusterTimecode &ctc = *(KaxClusterTimecode*)el; - ctc.ReadData( p_sys->es->I_O(), SCOPE_ALL_DATA ); - p_sys->cluster->InitTimecode( uint64( ctc ), p_sys->i_timescale ); + ctc.ReadData( es.I_O(), SCOPE_ALL_DATA ); + cluster->InitTimecode( uint64( ctc ), i_timescale ); + } + else if( MKV_IS_ID( el, KaxClusterSilentTracks ) ) + { + ep->Down(); } else if( MKV_IS_ID( el, KaxBlockGroup ) ) { - p_sys->ep->Down(); + ep->Down(); } - } - else if( i_level == 3 ) - { + break; + case 3: if( MKV_IS_ID( el, KaxBlock ) ) { *pp_block = (KaxBlock*)el; - (*pp_block)->ReadData( p_sys->es->I_O() ); - (*pp_block)->SetParent( *p_sys->cluster ); + (*pp_block)->ReadData( es.I_O() ); + (*pp_block)->SetParent( *cluster ); - p_sys->ep->Keep(); + ep->Keep(); } else if( MKV_IS_ID( el, KaxBlockDuration ) ) { KaxBlockDuration &dur = *(KaxBlockDuration*)el; - dur.ReadData( p_sys->es->I_O() ); + dur.ReadData( es.I_O() ); *pi_duration = uint64( dur ); } else if( MKV_IS_ID( el, KaxReferenceBlock ) ) { KaxReferenceBlock &ref = *(KaxReferenceBlock*)el; - ref.ReadData( p_sys->es->I_O() ); + ref.ReadData( es.I_O() ); if( *pi_ref1 == -1 ) { *pi_ref1 = int64( ref ); @@ -1331,10 +1680,23 @@ static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, in *pi_ref2 = int64( ref ); } } - } - else - { - msg_Err( p_demux, "invalid level = %d", i_level ); + else if( MKV_IS_ID( el, KaxClusterSilentTrackNumber ) ) + { + KaxClusterSilentTrackNumber &track_num = *(KaxClusterSilentTrackNumber*)el; + track_num.ReadData( es.I_O() ); + // find the track + for (size_t i=0; ii_number == uint32(track_num)) + { + tracks[i]->b_silent = VLC_TRUE; + break; + } + } + } + break; + default: + msg_Err( &sys.demuxer, "invalid level = %d", i_level ); return VLC_EGENERIC; } } @@ -1352,53 +1714,59 @@ static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, int i_mem) static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, mtime_t i_duration ) { - demux_sys_t *p_sys = p_demux->p_sys; + demux_sys_t *p_sys = p_demux->p_sys; + matroska_segment_c *p_segment = p_sys->p_current_segment->Segment(); - int i_track; + size_t i_track; unsigned int i; vlc_bool_t b; -#define tk p_sys->track[i_track] - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) +#define tk p_segment->tracks[i_track] + for( i_track = 0; i_track < p_segment->tracks.size(); i_track++ ) { - if( tk.i_number == block->TrackNum() ) + if( tk->i_number == block->TrackNum() ) { break; } } - if( i_track >= p_sys->i_track ) + if( i_track >= p_segment->tracks.size() ) { msg_Err( p_demux, "invalid track number=%d", block->TrackNum() ); return; } - if( tk.p_es == NULL ) + if( tk->p_es == NULL ) { msg_Err( p_demux, "unknown track number=%d", block->TrackNum() ); return; } - if( i_pts < p_sys->i_start_pts && tk.fmt.i_cat == AUDIO_ES ) + if( i_pts < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES ) { return; /* discard audio packets that shouldn't be rendered */ } - es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk.p_es, &b ); - if( !b ) + if ( tk->fmt.i_cat != SPU_ES || strcmp( tk->psz_codec, "B_VOBBTN" ) ) { - tk.b_inited = VLC_FALSE; - return; + es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b ); + + if( !b ) + { + tk->b_inited = VLC_FALSE; + return; + } } + /* First send init data */ - if( !tk.b_inited && tk.i_data_init > 0 ) + if( !tk->b_inited && tk->i_data_init > 0 ) { block_t *p_init; - msg_Dbg( p_demux, "sending header (%d bytes)", tk.i_data_init ); - p_init = MemToBlock( p_demux, tk.p_data_init, tk.i_data_init ); - if( p_init ) es_out_Send( p_demux->out, tk.p_es, p_init ); + msg_Dbg( p_demux, "sending header (%d bytes)", tk->i_data_init ); + p_init = MemToBlock( p_demux, tk->p_data_init, tk->i_data_init ); + if( p_init ) es_out_Send( p_demux->out, tk->p_es, p_init ); } - tk.b_inited = VLC_TRUE; + tk->b_inited = VLC_TRUE; for( i = 0; i < block->NumberFrames(); i++ ) @@ -1414,14 +1782,14 @@ 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 ) { p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block ); } #endif // TODO implement correct timestamping when B frames are used - if( tk.fmt.i_cat != VIDEO_ES ) + if( tk->fmt.i_cat != VIDEO_ES ) { p_block->i_dts = p_block->i_pts = i_pts; } @@ -1431,11 +1799,29 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, p_block->i_pts = 0; } - if( tk.fmt.i_cat == SPU_ES && strcmp( tk.psz_codec, "S_VOBSUB" ) ) + if ( tk->fmt.i_cat == SPU_ES ) { - p_block->i_length = i_duration * 1000; + if ( !strcmp( tk->psz_codec, "B_VOBBTN" ) ) + { + // TODO handle the start/stop times of this packet + if ( p_sys->b_ui_hooked ) + { + vlc_mutex_lock( &p_sys->p_ev->lock ); + memcpy( &p_sys->pci_packet, &p_block->p_buffer[1], sizeof(pci_t) ); + p_sys->SwapButtons(); + vlc_mutex_unlock( &p_sys->p_ev->lock ); + block_Release( p_block ); + } + return; + } + + else if ( strcmp( tk->psz_codec, "S_VOBSUB" ) ) + { + p_block->i_length = i_duration * 1000; + } } - es_out_Send( p_demux->out, tk.p_es, p_block ); + + es_out_Send( p_demux->out, tk->p_es, p_block ); /* use time stamp only for first block */ i_pts = 0; @@ -1444,1745 +1830,3847 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, #undef tk } -static void UpdateCurrentToChapter( demux_t & demux ) +matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream ) { - demux_sys_t & sys = *demux.p_sys; - const chapter_item_t *psz_curr_chapter; + int i_upper_lvl = 0; + size_t i; + EbmlElement *p_l0, *p_l1, *p_l2; + bool b_keep_stream = false, b_keep_segment; + + // verify the EBML Header + p_l0 = p_estream->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFL); + if (p_l0 == NULL) + { + return NULL; + } + p_l0->SkipData(*p_estream, EbmlHead_Context); + delete p_l0; - /* update current chapter/seekpoint */ - if ( sys.editions.size()) + // find all segments in this file + p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL); + if (p_l0 == NULL) { - /* 1st, we need to know in which chapter we are */ - psz_curr_chapter = sys.editions[sys.i_current_edition].FindTimecode( sys.i_pts ); + return NULL; + } - /* we have moved to a new chapter */ - if (sys.psz_current_chapter != NULL && psz_curr_chapter != NULL && sys.psz_current_chapter != psz_curr_chapter) + matroska_stream_c *p_stream1 = new matroska_stream_c( *this ); + + while (p_l0 != 0) + { + if (EbmlId(*p_l0) == KaxSegment::ClassInfos.GlobalId) { - if (sys.psz_current_chapter->i_seekpoint_num != psz_curr_chapter->i_seekpoint_num && psz_curr_chapter->i_seekpoint_num > 0) + EbmlParser *ep; + matroska_segment_c *p_segment1 = new matroska_segment_c( *this, *p_estream ); + b_keep_segment = false; + + ep = new EbmlParser(p_estream, p_l0, &demuxer ); + p_segment1->ep = ep; + p_segment1->segment = (KaxSegment*)p_l0; + + while ((p_l1 = ep->Get())) { - demux.info.i_update |= INPUT_UPDATE_SEEKPOINT; - demux.info.i_seekpoint = psz_curr_chapter->i_seekpoint_num - 1; - } + if (MKV_IS_ID(p_l1, KaxInfo)) + { + // find the families of this segment + KaxInfo *p_info = static_cast(p_l1); + + p_info->Read(*p_estream, KaxInfo::ClassInfos.Context, i_upper_lvl, p_l2, true); + for( i = 0; i < p_info->ListSize(); i++ ) + { + EbmlElement *l = (*p_info)[i]; - if (sys.editions[sys.i_current_edition].b_ordered ) + if( MKV_IS_ID( l, KaxSegmentUID ) ) + { + KaxSegmentUID *p_uid = static_cast(l); + b_keep_segment = (FindSegment( *p_uid ) == NULL); + if ( !b_keep_segment ) + break; // this segment is already known + opened_segments.push_back( p_segment1 ); + p_segment1->segment_uid = *( new KaxSegmentUID(*p_uid) ); + } + else if( MKV_IS_ID( l, KaxPrevUID ) ) + { + p_segment1->prev_segment_uid = *( new KaxPrevUID( *static_cast(l) ) ); + } + else if( MKV_IS_ID( l, KaxNextUID ) ) + { + p_segment1->next_segment_uid = *( new KaxNextUID( *static_cast(l) ) ); + } + else if( MKV_IS_ID( l, KaxSegmentFamily ) ) + { + KaxSegmentFamily *p_fam = new KaxSegmentFamily( *static_cast(l) ); + p_segment1->families.push_back( *p_fam ); + } + } + break; + } + } + if ( b_keep_segment ) { - /* TODO check if we need to silently seek to a new location in the stream (switch to another chapter) */ - if (sys.psz_current_chapter->i_end_time != psz_curr_chapter->i_start_time) - Seek(&demux, sys.i_pts, -1, psz_curr_chapter); - /* count the last duration time found for each track in a table (-1 not found, -2 silent) */ - /* only seek after each duration >= end timecode of the current chapter */ + b_keep_stream = true; + p_stream1->segments.push_back( p_segment1 ); } - -// sys.i_user_time = psz_curr_chapter->i_user_start_time - psz_curr_chapter->i_start_time; -// sys.i_start_pts = psz_curr_chapter->i_user_start_time; + else + delete p_segment1; } - sys.psz_current_chapter = psz_curr_chapter; - } -} - -static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, const chapter_item_t *psz_chapter) -{ - demux_sys_t *p_sys = p_demux->p_sys; - mtime_t i_time_offset = 0; - - KaxBlock *block; - int64_t i_block_duration; - int64_t i_block_ref1; - int64_t i_block_ref2; - - int i_index = 0; - int i_track_skipping; - int i_track; - msg_Dbg( p_demux, "seek request to "I64Fd" (%f%%)", i_date, f_percent ); - if( i_date < 0 && f_percent < 0 ) - { - msg_Warn( p_demux, "cannot seek nowhere !" ); - return; + p_l0->SkipData(*p_estream, EbmlHead_Context); + p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL); } - if( f_percent > 1.0 ) + + if ( !b_keep_stream ) { - msg_Warn( p_demux, "cannot seek so far !" ); - return; + delete p_stream1; + p_stream1 = NULL; } - delete p_sys->ep; - p_sys->ep = new EbmlParser( p_sys->es, p_sys->segment ); - p_sys->cluster = NULL; + return p_stream1; +} - /* seek without index or without date */ - if( f_percent >= 0 && (config_GetInt( p_demux, "mkv-seek-percent" ) || !p_sys->b_cues || i_date < 0 )) +bool matroska_segment_c::Select( mtime_t i_start_time ) +{ + size_t i_track; + + /* add all es */ + msg_Dbg( &sys.demuxer, "found %d es", tracks.size() ); + sys.StopUiThread(); + for( i_track = 0; i_track < tracks.size(); i_track++ ) { - if (p_sys->f_duration >= 0) + if( tracks[i_track]->fmt.i_cat == UNKNOWN_ES ) { - i_date = int64_t( f_percent * p_sys->f_duration * 1000.0 ); + msg_Warn( &sys.demuxer, "invalid track[%d, n=%d]", i_track, tracks[i_track]->i_number ); + tracks[i_track]->p_es = NULL; + continue; } - else - { - int64_t i_pos = int64_t( f_percent * stream_Size( p_demux->s ) ); - msg_Dbg( p_demux, "inacurate way of seeking" ); - for( i_index = 0; i_index < p_sys->i_index; i_index++ ) + if( !strcmp( tracks[i_track]->psz_codec, "V_MS/VFW/FOURCC" ) ) + { + if( tracks[i_track]->i_extra_data < (int)sizeof( BITMAPINFOHEADER ) ) + { + msg_Err( &sys.demuxer, "missing/invalid BITMAPINFOHEADER" ); + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + } + else { - if( p_sys->index[i_index].i_position >= i_pos) + BITMAPINFOHEADER *p_bih = (BITMAPINFOHEADER*)tracks[i_track]->p_extra_data; + + tracks[i_track]->fmt.video.i_width = GetDWLE( &p_bih->biWidth ); + tracks[i_track]->fmt.video.i_height= GetDWLE( &p_bih->biHeight ); + tracks[i_track]->fmt.i_codec = GetFOURCC( &p_bih->biCompression ); + + tracks[i_track]->fmt.i_extra = GetDWLE( &p_bih->biSize ) - sizeof( BITMAPINFOHEADER ); + if( tracks[i_track]->fmt.i_extra > 0 ) { - break; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->fmt.i_extra ); + memcpy( tracks[i_track]->fmt.p_extra, &p_bih[1], tracks[i_track]->fmt.i_extra ); } } - if( i_index == p_sys->i_index ) + } + else if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG1" ) || + !strcmp( tracks[i_track]->psz_codec, "V_MPEG2" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' ); + } + else if( !strncmp( tracks[i_track]->psz_codec, "V_MPEG4", 7 ) ) + { + if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG4/MS/V3" ) ) { - i_index--; + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' ); } - - i_date = p_sys->index[i_index].i_time; - -#if 0 - if( p_sys->index[i_index].i_position < i_pos ) + else if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG4/ISO/AVC" ) ) { - EbmlElement *el; - - msg_Warn( p_demux, "searching for cluster, could take some time" ); + 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 ); + } + else + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); + } + } + 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; + tracks[i_track]->fmt.video.i_width = p_box->data.p_sample_vide->i_width; + tracks[i_track]->fmt.video.i_height = p_box->data.p_sample_vide->i_height; + tracks[i_track]->fmt.i_extra = p_box->data.p_sample_vide->i_qt_image_description; + 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" ) ) + { + if( tracks[i_track]->i_extra_data < (int)sizeof( WAVEFORMATEX ) ) + { + msg_Err( &sys.demuxer, "missing/invalid WAVEFORMATEX" ); + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + } + else + { + WAVEFORMATEX *p_wf = (WAVEFORMATEX*)tracks[i_track]->p_extra_data; - /* search a cluster */ - while( ( el = p_sys->ep->Get() ) != NULL ) - { - if( MKV_IS_ID( el, KaxCluster ) ) - { - KaxCluster *cluster = (KaxCluster*)el; + wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &tracks[i_track]->fmt.i_codec, NULL ); - /* add it to the index */ - IndexAppendCluster( p_demux, cluster ); + tracks[i_track]->fmt.audio.i_channels = GetWLE( &p_wf->nChannels ); + tracks[i_track]->fmt.audio.i_rate = GetDWLE( &p_wf->nSamplesPerSec ); + tracks[i_track]->fmt.i_bitrate = GetDWLE( &p_wf->nAvgBytesPerSec ) * 8; + tracks[i_track]->fmt.audio.i_blockalign = GetWLE( &p_wf->nBlockAlign );; + tracks[i_track]->fmt.audio.i_bitspersample = GetWLE( &p_wf->wBitsPerSample ); - if( (int64_t)cluster->GetElementPosition() >= i_pos ) - { - p_sys->cluster = cluster; - p_sys->ep->Down(); - break; - } - } + tracks[i_track]->fmt.i_extra = GetWLE( &p_wf->cbSize ); + if( tracks[i_track]->fmt.i_extra > 0 ) + { + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->fmt.i_extra ); + memcpy( tracks[i_track]->fmt.p_extra, &p_wf[1], tracks[i_track]->fmt.i_extra ); } } -#endif } - } - - // find the actual time for an ordered edition - if ( psz_chapter == NULL ) - { - if ( p_sys->editions.size() && p_sys->editions[p_sys->i_current_edition].b_ordered ) + else if( !strcmp( tracks[i_track]->psz_codec, "A_MPEG/L3" ) || + !strcmp( tracks[i_track]->psz_codec, "A_MPEG/L2" ) || + !strcmp( tracks[i_track]->psz_codec, "A_MPEG/L1" ) ) { - /* 1st, we need to know in which chapter we are */ - psz_chapter = p_sys->editions[p_sys->i_current_edition].FindTimecode( i_date ); + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' ); } - } - - if ( psz_chapter != NULL ) - { - p_sys->psz_current_chapter = psz_chapter; - p_sys->i_chapter_time = i_time_offset = psz_chapter->i_user_start_time - psz_chapter->i_start_time; - p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT; - p_demux->info.i_seekpoint = psz_chapter->i_seekpoint_num - 1; - } - - for( ; i_index < p_sys->i_index; i_index++ ) - { - if( p_sys->index[i_index].i_time + i_time_offset > i_date ) + else if( !strcmp( tracks[i_track]->psz_codec, "A_AC3" ) ) { - break; + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); } - } - - if( i_index > 0 ) - { - i_index--; - } + else if( !strcmp( tracks[i_track]->psz_codec, "A_DTS" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' ); + } + else if( !strcmp( tracks[i_track]->psz_codec, "A_FLAC" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'f', 'l', 'a', 'c' ); + 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_VORBIS" ) ) + { + int i, i_offset = 1, i_size[3], i_extra; + uint8_t *p_extra; - msg_Dbg( p_demux, "seek got "I64Fd" (%d%%)", - p_sys->index[i_index].i_time, - (int)( 100 * p_sys->index[i_index].i_position / - stream_Size( p_demux->s ) ) ); + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'v', 'o', 'r', 'b' ); - p_sys->in->setFilePointer( p_sys->index[i_index].i_position, - seek_beginning ); + /* Split the 3 headers */ + if( tracks[i_track]->p_extra_data[0] != 0x02 ) + msg_Err( &sys.demuxer, "invalid vorbis header" ); - p_sys->i_start_pts = i_date; + for( i = 0; i < 2; i++ ) + { + i_size[i] = 0; + while( i_offset < tracks[i_track]->i_extra_data ) + { + i_size[i] += tracks[i_track]->p_extra_data[i_offset]; + if( tracks[i_track]->p_extra_data[i_offset++] != 0xff ) break; + } + } - es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + i_size[0] = __MIN(i_size[0], tracks[i_track]->i_extra_data - i_offset); + i_size[1] = __MIN(i_size[1], tracks[i_track]->i_extra_data -i_offset -i_size[0]); + i_size[2] = tracks[i_track]->i_extra_data - i_offset - i_size[0] - i_size[1]; - /* now parse until key frame */ -#define tk p_sys->track[i_track] - i_track_skipping = 0; - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) - { - if( tk.fmt.i_cat == VIDEO_ES ) - { - tk.b_search_keyframe = VLC_TRUE; - i_track_skipping++; + tracks[i_track]->fmt.i_extra = 3 * 2 + i_size[0] + i_size[1] + i_size[2]; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->fmt.i_extra ); + p_extra = (uint8_t *)tracks[i_track]->fmt.p_extra; i_extra = 0; + for( i = 0; i < 3; i++ ) + { + *(p_extra++) = i_size[i] >> 8; + *(p_extra++) = i_size[i] & 0xFF; + memcpy( p_extra, tracks[i_track]->p_extra_data + i_offset + i_extra, + i_size[i] ); + p_extra += i_size[i]; + i_extra += i_size[i]; + } } - es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, tk.p_es, i_date ); - } + 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; + static unsigned int i_sample_rates[] = + { + 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, + 16000, 12000, 11025, 8000, 7350, 0, 0, 0 + }; + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); + /* create data for faad (MP4DecSpecificDescrTag)*/ - while( i_track_skipping > 0 ) - { - if( BlockGet( p_demux, &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) - { - msg_Warn( p_demux, "cannot get block EOF?" ); + if( !strcmp( &tracks[i_track]->psz_codec[12], "MAIN" ) ) + { + i_profile = 0; + } + else if( !strcmp( &tracks[i_track]->psz_codec[12], "LC" ) ) + { + i_profile = 1; + } + else if( !strcmp( &tracks[i_track]->psz_codec[12], "SSR" ) ) + { + i_profile = 2; + } + else + { + i_profile = 3; + } - return; - } + for( i_srate = 0; i_srate < 13; i_srate++ ) + { + if( i_sample_rates[i_srate] == tracks[i_track]->fmt.audio.i_rate ) + { + break; + } + } + msg_Dbg( &sys.demuxer, "profile=%d srate=%d", i_profile, i_srate ); - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) + tracks[i_track]->fmt.i_extra = 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); + } + else if( !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/BIG" ) || + !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/LIT" ) || + !strcmp( tracks[i_track]->psz_codec, "A_PCM/FLOAT/IEEE" ) ) { - if( tk.i_number == block->TrackNum() ) + if( !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/BIG" ) ) { - break; + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' ); + } + else + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' ); } + tracks[i_track]->fmt.audio.i_blockalign = ( tracks[i_track]->fmt.audio.i_bitspersample + 7 ) / 8 * tracks[i_track]->fmt.audio.i_channels; } - - p_sys->i_pts = p_sys->i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000; - - if( i_track < p_sys->i_track ) + 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 ); + 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 ); + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + } + else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/UTF8" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); + tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" ); + } + else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/SSA" ) || + !strcmp( tracks[i_track]->psz_codec, "S_TEXT/ASS" ) || + !strcmp( tracks[i_track]->psz_codec, "S_SSA" ) || + !strcmp( tracks[i_track]->psz_codec, "S_ASS" )) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 's', 'a', ' ' ); + tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" ); + } + else if( !strcmp( tracks[i_track]->psz_codec, "S_VOBSUB" ) ) { - if( tk.fmt.i_cat == VIDEO_ES ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's','p','u',' ' ); + if( tracks[i_track]->i_extra_data ) { - if( i_block_ref1 == -1 && tk.b_search_keyframe ) + char *p_start; + char *p_buf = (char *)malloc( tracks[i_track]->i_extra_data + 1); + memcpy( p_buf, tracks[i_track]->p_extra_data , tracks[i_track]->i_extra_data ); + p_buf[tracks[i_track]->i_extra_data] = '\0'; + + p_start = strstr( p_buf, "size:" ); + if( sscanf( p_start, "size: %dx%d", + &tracks[i_track]->fmt.subs.spu.i_original_frame_width, &tracks[i_track]->fmt.subs.spu.i_original_frame_height ) == 2 ) { - tk.b_search_keyframe = VLC_FALSE; - i_track_skipping--; + msg_Dbg( &sys.demuxer, "original frame size vobsubs: %dx%d", tracks[i_track]->fmt.subs.spu.i_original_frame_width, tracks[i_track]->fmt.subs.spu.i_original_frame_height ); } - if( !tk.b_search_keyframe ) + else { - BlockDecode( p_demux, block, p_sys->i_pts, 0 ); + msg_Warn( &sys.demuxer, "reading original frame size for vobsub failed" ); } + free( p_buf ); } } + else if( !strcmp( tracks[i_track]->psz_codec, "B_VOBBTN" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's','p','u',' ' ); + sys.StartUiThread(); + } + else + { + msg_Err( &sys.demuxer, "unknow codec id=`%s'", tracks[i_track]->psz_codec ); + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + } + if( tracks[i_track]->b_default ) + { + tracks[i_track]->fmt.i_priority = 1000; + } - delete block; + tracks[i_track]->p_es = es_out_Add( sys.demuxer.out, &tracks[i_track]->fmt ); + + es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, tracks[i_track]->p_es, i_start_time ); } -#undef tk + + sys.i_start_pts = i_start_time; + // reset the stream reading to the first cluster of the segment used + es.I_O().setFilePointer( i_start_pos ); + + delete ep; + ep = new EbmlParser( &es, segment, &sys.demuxer ); + + return true; } -/***************************************************************************** - * Demux: reads and demuxes data packets - ***************************************************************************** - * Returns -1 in case of error, 0 in case of EOF, 1 otherwise - *****************************************************************************/ -static int Demux( demux_t *p_demux) +void demux_sys_t::StartUiThread() { - demux_sys_t *p_sys = p_demux->p_sys; - int i_block_count = 0; + if ( !b_ui_hooked ) + { + msg_Dbg( &demuxer, "Starting the UI Hook" ); + b_ui_hooked = true; + /* FIXME hack hack hack hack FIXME */ + /* Get p_input and create variable */ + p_input = (input_thread_t *) vlc_object_find( &demuxer, VLC_OBJECT_INPUT, FIND_PARENT ); + var_Create( p_input, "x-start", VLC_VAR_INTEGER ); + var_Create( p_input, "y-start", VLC_VAR_INTEGER ); + 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, "highlight", VLC_VAR_BOOL ); + var_Create( p_input, "highlight-mutex", VLC_VAR_MUTEX ); + + /* Now create our event thread catcher */ + p_ev = (event_thread_t *) vlc_object_create( &demuxer, sizeof( event_thread_t ) ); + p_ev->p_demux = &demuxer; + p_ev->b_die = VLC_FALSE; + vlc_mutex_init( p_ev, &p_ev->lock ); + vlc_thread_create( p_ev, "mkv event thread handler", EventThread, + VLC_THREAD_PRIORITY_LOW, VLC_FALSE ); + } +} - KaxBlock *block; - int64_t i_block_duration; - int64_t i_block_ref1; - int64_t i_block_ref2; +void demux_sys_t::StopUiThread() +{ + if ( b_ui_hooked ) + { + p_ev->b_die = VLC_TRUE; - for( ;; ) + vlc_thread_join( p_ev ); + vlc_object_destroy( p_ev ); + + p_ev = NULL; + + var_Destroy( p_input, "highlight-mutex" ); + var_Destroy( p_input, "highlight" ); + var_Destroy( p_input, "x-start" ); + var_Destroy( p_input, "x-end" ); + var_Destroy( p_input, "y-start" ); + var_Destroy( p_input, "y-end" ); + var_Destroy( p_input, "color" ); + var_Destroy( p_input, "menu-contrast" ); + + msg_Dbg( &demuxer, "Stopping the UI Hook" ); + } + b_ui_hooked = false; +} + +int demux_sys_t::EventMouse( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + 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; + else if( psz_var[6] == 'm' ) + p_ev->b_moved = VLC_TRUE; + vlc_mutex_unlock( &p_ev->lock ); + + return VLC_SUCCESS; +} + +int demux_sys_t::EventKey( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + event_thread_t *p_ev = (event_thread_t *) p_data; + vlc_mutex_lock( &p_ev->lock ); + p_ev->b_key = VLC_TRUE; + vlc_mutex_unlock( &p_ev->lock ); + + return VLC_SUCCESS; +} + +int demux_sys_t::EventThread( vlc_object_t *p_this ) +{ + event_thread_t *p_ev = (event_thread_t*)p_this; + demux_sys_t *p_sys = p_ev->p_demux->p_sys; + vlc_object_t *p_vout = NULL; + + p_ev->b_moved = VLC_FALSE; + p_ev->b_clicked = VLC_FALSE; + p_ev->b_key = VLC_FALSE; + + /* catch all key event */ + var_AddCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev ); + + /* main loop */ + while( !p_ev->b_die ) { - if( p_sys->i_pts >= p_sys->i_start_pts ) - UpdateCurrentToChapter( *p_demux ); - - if ( p_sys->editions.size() && p_sys->editions[p_sys->i_current_edition].b_ordered && p_sys->psz_current_chapter == NULL ) + vlc_bool_t b_activated = VLC_FALSE; + + /* KEY part */ + if( p_ev->b_key ) { - /* nothing left to read in this ordered edition */ - return 0; + vlc_value_t valk; + struct vlc_t::hotkey *p_hotkeys = p_ev->p_vlc->p_hotkeys; + int i, i_action = -1; + + vlc_mutex_lock( &p_ev->lock ); + + pci_t *pci = (pci_t *) &p_sys->pci_packet; + + var_Get( p_ev->p_vlc, "key-pressed", &valk ); + for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) + { + if( p_hotkeys[i].i_key == valk.i_int ) + { + i_action = p_hotkeys[i].i_action; + } + } + + switch( i_action ) + { + case ACTIONID_NAV_LEFT: +// dvdnav_left_button_select( NULL, pci ); + break; + case ACTIONID_NAV_RIGHT: +// dvdnav_right_button_select( NULL, pci ); + break; + case ACTIONID_NAV_UP: +// dvdnav_upper_button_select( NULL, pci ); + break; + case ACTIONID_NAV_DOWN: +// dvdnav_lower_button_select( NULL, pci ); + break; + case ACTIONID_NAV_ACTIVATE: + b_activated = VLC_TRUE; +// dvdnav_button_activate( NULL, pci ); + break; + default: + break; + } + p_ev->b_key = VLC_FALSE; + vlc_mutex_unlock( &p_ev->lock ); } - if( BlockGet( p_demux, &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) + /* MOUSE part */ + if( p_vout && ( p_ev->b_moved || p_ev->b_clicked ) ) { - if ( p_sys->editions.size() && p_sys->editions[p_sys->i_current_edition].b_ordered ) + vlc_value_t valx, valy; + + vlc_mutex_lock( &p_ev->lock ); + pci_t *pci = (pci_t *) &p_sys->pci_packet; + var_Get( p_vout, "mouse-x", &valx ); + var_Get( p_vout, "mouse-y", &valy ); + + if( p_ev->b_clicked ) { - // check if there are more chapters to read - if ( p_sys->psz_current_chapter != NULL ) + int32_t button; + int32_t best,dist,d; + int32_t mx,my,dx,dy; + + b_activated = VLC_TRUE; + // get current button + best = 0; + dist = 0x08000000; /* >> than (720*720)+(567*567); */ + for(button = 1; button <= pci->hli.hl_gi.btn_ns; button++) { - p_sys->i_pts = p_sys->psz_current_chapter->i_user_end_time; - return 1; + 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)) + { + mx = (button_ptr->x_start + button_ptr->x_end)/2; + my = (button_ptr->y_start + button_ptr->y_end)/2; + dx = mx - valx.i_int; + dy = my - valy.i_int; + d = (dx*dx) + (dy*dy); + /* If the mouse is within the button and the mouse is closer + * to the center of this button then it is the best choice. */ + if(d < dist) { + dist = d; + best = button; + } + } } - return 0; + if ( best != 0) + { + btni_t button_ptr = pci->hli.btnit[best-1]; + + msg_Dbg( &p_sys->demuxer, "Clicked button %d", best ); + vlc_mutex_unlock( &p_ev->lock ); + vlc_mutex_lock( &p_sys->lock_demuxer ); + + // process the button action + p_sys->dvd_interpretor.SetSPRM( 0x88, best ); + p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 ); + + // select new button + if ( best != p_sys->i_curr_button ) + { + vlc_value_t val; + + if( var_Get( p_sys->p_input, "highlight-mutex", &val ) == VLC_SUCCESS ) + { + vlc_mutex_t *p_mutex = (vlc_mutex_t *) val.p_address; + uint32_t i_palette; + + if(button_ptr.btn_coln != 0) { + i_palette = pci->hli.btn_colit.btn_coli[button_ptr.btn_coln-1][1]; + } else { + i_palette = 0; + } + p_sys->alpha[0] = i_palette & 0x0f; + p_sys->alpha[1] = (i_palette>>4) & 0x0f; + p_sys->alpha[2] = (i_palette>>8) & 0x0f; + p_sys->alpha[3] = (i_palette>>12)& 0x0f; + + vlc_mutex_lock( p_mutex ); + val.i_int = button_ptr.x_start; var_Set( p_sys->p_input, "x-start", val ); + val.i_int = button_ptr.x_end; var_Set( p_sys->p_input, "x-end", val ); + val.i_int = button_ptr.y_start; var_Set( p_sys->p_input, "y-start", val ); + val.i_int = button_ptr.y_end; var_Set( p_sys->p_input, "y-end", val ); + + val.p_address = (void *)p_sys->alpha; + var_Set( p_sys->p_input, "menu-contrast", val ); + + val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val ); + vlc_mutex_unlock( p_mutex ); + + p_sys->i_curr_button = best; + } + } + vlc_mutex_unlock( &p_sys->lock_demuxer ); + vlc_mutex_lock( &p_ev->lock ); + } + } + else if( p_ev->b_moved ) + { +// dvdnav_mouse_select( NULL, pci, valx.i_int, valy.i_int ); } - msg_Warn( p_demux, "cannot get block EOF?" ); - return 0; + p_ev->b_moved = VLC_FALSE; + p_ev->b_clicked = VLC_FALSE; + vlc_mutex_unlock( &p_ev->lock ); } - p_sys->i_pts = p_sys->i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000; - - if( p_sys->i_pts >= p_sys->i_start_pts ) + /* VOUT part */ + if( p_vout && p_vout->b_die ) { - es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts ); + var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev ); + var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); + vlc_object_release( p_vout ); + p_vout = NULL; } - BlockDecode( p_demux, block, p_sys->i_pts, i_block_duration ); - - delete block; - i_block_count++; - - // TODO optimize when there is need to leave or when seeking has been called - if( i_block_count > 5 ) + else if( p_vout == NULL ) { - return 1; + p_vout = (vlc_object_t*) vlc_object_find( p_sys->p_input, VLC_OBJECT_VOUT, + FIND_CHILD ); + if( p_vout) + { + var_AddCallback( p_vout, "mouse-moved", EventMouse, p_ev ); + var_AddCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); + } } + + /* Wait a bit, 10ms */ + msleep( 10000 ); } -} + /* Release callback */ + if( p_vout ) + { + var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev ); + var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); + vlc_object_release( p_vout ); + } + var_DelCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev ); + vlc_mutex_destroy( &p_ev->lock ); -/***************************************************************************** - * Stream managment - *****************************************************************************/ -vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_ ) -{ - s = s_; - mb_eof = VLC_FALSE; + return VLC_SUCCESS; } -uint32 vlc_stream_io_callback::read( void *p_buffer, size_t i_size ) +void matroska_segment_c::UnSelect( ) { - if( i_size <= 0 || mb_eof ) - { - return 0; - } + size_t i_track; - return stream_Read( s, p_buffer, i_size ); -} -void vlc_stream_io_callback::setFilePointer(int64_t i_offset, seek_mode mode ) -{ - int64_t i_pos; + sys.StopUiThread(); - switch( mode ) + for( i_track = 0; i_track < tracks.size(); i_track++ ) { - case seek_beginning: - i_pos = i_offset; - break; - case seek_end: - i_pos = stream_Size( s ) - i_offset; - break; - default: - i_pos= stream_Tell( s ) + i_offset; - break; + if ( tracks[i_track]->p_es != NULL ) + { + es_out_Del( sys.demuxer.out, tracks[i_track]->p_es ); + tracks[i_track]->p_es = NULL; + } } + delete ep; + ep = NULL; +} - if( i_pos < 0 || i_pos >= stream_Size( s ) ) - { - mb_eof = VLC_TRUE; +void virtual_segment_c::PrepareChapters( ) +{ + if ( linked_segments.size() == 0 ) return; - } - mb_eof = VLC_FALSE; - if( stream_Seek( s, i_pos ) ) + // !!! should be called only once !!! + matroska_segment_c *p_segment; + size_t i, j; + + // copy editions from the first segment + p_segment = linked_segments[0]; + p_editions = &p_segment->stored_editions; + + for ( i=1 ; istored_editions.size(); j++) + (*p_editions)[j]->Append( *p_segment->stored_editions[j] ); } - return; -} -size_t vlc_stream_io_callback::write( const void *p_buffer, size_t i_size ) -{ - return 0; } -uint64 vlc_stream_io_callback::getFilePointer( void ) + +std::string chapter_edition_c::GetMainName() const { - return stream_Tell( s ); + if ( sub_chapters.size() ) + { + return sub_chapters[0]->GetCodecName( true ); + } + return ""; } -void vlc_stream_io_callback::close( void ) + +int chapter_item_c::PublishChapters( input_title_t & title, int & i_user_chapters, int i_level ) { - return; -} + // add support for meta-elements from codec like DVD Titles + if ( !b_display_seekpoint || psz_name == "" ) + { + psz_name = GetCodecName(); + if ( psz_name != "" ) + b_display_seekpoint = true; + } + if (b_display_seekpoint) + { + seekpoint_t *sk = vlc_seekpoint_New(); -/***************************************************************************** - * Ebml Stream parser - *****************************************************************************/ -EbmlParser::EbmlParser( EbmlStream *es, EbmlElement *el_start ) -{ - int i; + sk->i_level = i_level; + sk->i_time_offset = i_start_time; + sk->psz_name = strdup( psz_name.c_str() ); - m_es = es; - m_got = NULL; - m_el[0] = el_start; + // A start time of '0' is ok. A missing ChapterTime element is ok, too, because '0' is its default value. + title.i_seekpoint++; + title.seekpoint = (seekpoint_t**)realloc( title.seekpoint, title.i_seekpoint * sizeof( seekpoint_t* ) ); + title.seekpoint[title.i_seekpoint-1] = sk; - for( i = 1; i < 6; i++ ) + if ( b_user_display ) + i_user_chapters++; + } + + for ( size_t i=0; iPublishChapters( title, i_user_chapters, i_level+1 ); } - mi_level = 1; - mi_user_level = 1; - mb_keep = VLC_FALSE; + + i_seekpoint_num = i_user_chapters; + + return i_user_chapters; } -EbmlParser::~EbmlParser( void ) +bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux ) { - int i; + demux_sys_t & sys = *demux.p_sys; + chapter_item_c *psz_curr_chapter; - for( i = 1; i < mi_level; i++ ) + /* update current chapter/seekpoint */ + if ( p_editions->size() ) { - if( !mb_keep ) + /* 1st, we need to know in which chapter we are */ + psz_curr_chapter = (*p_editions)[i_current_edition]->FindTimecode( sys.i_pts ); + + /* we have moved to a new chapter */ + if (psz_curr_chapter != NULL && psz_current_chapter != psz_curr_chapter) { - delete m_el[i]; + if ( (*p_editions)[i_current_edition]->b_ordered ) + { + // Leave/Enter up to the link point + if ( !psz_curr_chapter->EnterAndLeave( psz_current_chapter ) ) + { + // only 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 + { + psz_current_chapter = psz_curr_chapter; + } + + return true; + } + else if (psz_curr_chapter == NULL) + { + // 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 ) ) + psz_current_chapter = NULL; + } } - mb_keep = VLC_FALSE; } + return false; } -void EbmlParser::Up( void ) +chapter_item_c *virtual_segment_c::BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, + size_t i_cookie_size ) { - if( mi_user_level == mi_level ) + // FIXME don't assume it is the first edition + std::vector::iterator index = p_editions->begin(); + if ( index != p_editions->end() ) { - fprintf( stderr," arrrrrrrrrrrrrg Up cannot escape itself\n" ); + chapter_item_c *p_result = (*index)->BrowseCodecPrivate( codec_id, match, p_cookie, i_cookie_size ); + if ( p_result != NULL ) + return p_result; } - - mi_user_level--; + return NULL; } -void EbmlParser::Down( void ) +chapter_item_c *virtual_segment_c::FindChapter( int64_t i_find_uid ) { - mi_user_level++; - mi_level++; + // FIXME don't assume it is the first edition + std::vector::iterator index = p_editions->begin(); + if ( index != p_editions->end() ) + { + chapter_item_c *p_result = (*index)->FindChapter( i_find_uid ); + if ( p_result != NULL ) + return p_result; + } + return NULL; } -void EbmlParser::Keep( void ) +chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, + size_t i_cookie_size ) { - mb_keep = VLC_TRUE; + // this chapter + std::vector::const_iterator index = codecs.begin(); + while ( index != codecs.end() ) + { + if ( match( **index ,p_cookie, i_cookie_size ) ) + return this; + index++; + } + + // sub-chapters + chapter_item_c *p_result = NULL; + std::vector::const_iterator index2 = sub_chapters.begin(); + while ( index2 != sub_chapters.end() ) + { + p_result = (*index2)->BrowseCodecPrivate( codec_id, match, p_cookie, i_cookie_size ); + if ( p_result != NULL ) + return p_result; + index2++; + } + + return p_result; } -int EbmlParser::GetLevel( void ) +void chapter_item_c::Append( const chapter_item_c & chapter ) { - return mi_user_level; + // we are appending content for the same chapter UID + size_t i; + chapter_item_c *p_chapter; + + for ( i=0; ii_uid ); + if ( p_chapter != NULL ) + { + p_chapter->Append( *chapter.sub_chapters[i] ); + } + else + { + sub_chapters.push_back( chapter.sub_chapters[i] ); + } + } + + i_user_start_time = min( i_user_start_time, chapter.i_user_start_time ); + i_user_end_time = max( i_user_end_time, chapter.i_user_end_time ); } -EbmlElement *EbmlParser::Get( void ) +chapter_item_c * chapter_item_c::FindChapter( int64_t i_find_uid ) { - int i_ulev = 0; + size_t i; + chapter_item_c *p_result = NULL; - if( mi_user_level != mi_level ) + if ( i_uid == i_find_uid ) + return this; + + for ( i=0; iFindChapter( i_find_uid ); + if ( p_result != NULL ) + break; } - if( m_got ) - { - EbmlElement *ret = m_got; - m_got = NULL; + return p_result; +} - return ret; - } +std::string chapter_item_c::GetCodecName( bool f_for_title ) const +{ + std::string result; - if( m_el[mi_level] ) + std::vector::const_iterator index = codecs.begin(); + while ( index != codecs.end() ) { - m_el[mi_level]->SkipData( *m_es, m_el[mi_level]->Generic().Context ); - if( !mb_keep ) - { - delete m_el[mi_level]; - } - mb_keep = VLC_FALSE; + result = (*index)->GetCodecName( f_for_title ); + if ( result != "" ) + break; + index++; } - m_el[mi_level] = m_es->FindNextElement( m_el[mi_level - 1]->Generic().Context, i_ulev, 0xFFFFFFFFL, true, 1 ); - if( i_ulev > 0 ) + return result; +} + +std::string dvd_chapter_codec_c::GetCodecName( bool f_for_title ) const +{ + std::string result; + if ( m_private_data.GetSize() >= 3) { - while( i_ulev > 0 ) + const binary* p_data = m_private_data.GetBuffer(); +/* if ( p_data[0] == MATROSKA_DVD_LEVEL_TT ) { - if( mi_level == 1 ) + uint16_t i_title = (p_data[1] << 8) + p_data[2]; + char psz_str[11]; + sprintf( psz_str, " %d ---", i_title ); + result = N_("--- DVD Title"); + result += psz_str; + } + else */ if ( p_data[0] == MATROSKA_DVD_LEVEL_LU ) + { + char psz_str[11]; + sprintf( psz_str, " (%c%c) ---", p_data[1], p_data[2] ); + result = N_("--- DVD Menu"); + result += psz_str; + } + else if ( p_data[0] == MATROSKA_DVD_LEVEL_SS && f_for_title ) + { + if ( p_data[1] == 0x00 ) + result = N_("First Played"); + else if ( p_data[1] == 0xC0 ) + result = N_("Video Manager"); + else if ( p_data[1] == 0x80 ) { - mi_level = 0; - return NULL; + uint16_t i_title = (p_data[2] << 8) + p_data[3]; + char psz_str[20]; + sprintf( psz_str, " %d -----", i_title ); + result = N_("----- Title"); + result += psz_str; } - - delete m_el[mi_level - 1]; - m_got = m_el[mi_level -1] = m_el[mi_level]; - m_el[mi_level] = NULL; - - mi_level--; - i_ulev--; } - return NULL; - } - else if( m_el[mi_level] == NULL ) - { - fprintf( stderr," m_el[mi_level] == NULL\n" ); } - return m_el[mi_level]; + return result; } - -/***************************************************************************** - * Tools - * * LoadCues : load the cues element and update index - * - * * LoadTags : load ... the tags element - * - * * InformationCreate : create all information, load tags if present - * - *****************************************************************************/ -static void LoadCues( demux_t *p_demux ) +static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_item_c *psz_chapter ) { - demux_sys_t *p_sys = p_demux->p_sys; - int64_t i_sav_position = p_sys->in->getFilePointer(); - EbmlParser *ep; - EbmlElement *el, *cues; + demux_sys_t *p_sys = p_demux->p_sys; + virtual_segment_c *p_vsegment = p_sys->p_current_segment; + matroska_segment_c *p_segment = p_vsegment->Segment(); + mtime_t i_time_offset = 0; - msg_Dbg( p_demux, "loading cues" ); - p_sys->in->setFilePointer( p_sys->i_cues_position, seek_beginning ); - cues = p_sys->es->FindNextID( KaxCues::ClassInfos, 0xFFFFFFFFL); + int i_index; - if( cues == NULL ) + msg_Dbg( p_demux, "seek request to "I64Fd" (%f%%)", i_date, f_percent ); + if( i_date < 0 && f_percent < 0 ) + { + msg_Warn( p_demux, "cannot seek nowhere !" ); + return; + } + if( f_percent > 1.0 ) { - msg_Err( p_demux, "cannot load cues (broken seekhead or file)" ); - p_sys->in->setFilePointer( i_sav_position, seek_beginning ); + msg_Warn( p_demux, "cannot seek so far !" ); return; } - ep = new EbmlParser( p_sys->es, cues ); - while( ( el = ep->Get() ) != NULL ) + /* seek without index or without date */ + if( f_percent >= 0 && (config_GetInt( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 )) { - if( MKV_IS_ID( el, KaxCuePoint ) ) + if (p_sys->f_duration >= 0) { -#define idx p_sys->index[p_sys->i_index] - - idx.i_track = -1; - idx.i_block_number= -1; - idx.i_position = -1; - idx.i_time = 0; - idx.b_key = VLC_TRUE; + i_date = int64_t( f_percent * p_sys->f_duration * 1000.0 ); + } + else + { + int64_t i_pos = int64_t( f_percent * stream_Size( p_demux->s ) ); - ep->Down(); - while( ( el = ep->Get() ) != NULL ) + msg_Dbg( p_demux, "inacurate way of seeking" ); + for( i_index = 0; i_index < p_segment->i_index; i_index++ ) { - if( MKV_IS_ID( el, KaxCueTime ) ) + if( p_segment->index[i_index].i_position >= i_pos) { - KaxCueTime &ctime = *(KaxCueTime*)el; + break; + } + } + if( i_index == p_segment->i_index ) + { + i_index--; + } - ctime.ReadData( p_sys->es->I_O() ); + i_date = p_segment->index[i_index].i_time; - idx.i_time = uint64( ctime ) * p_sys->i_timescale / (mtime_t)1000; - } - else if( MKV_IS_ID( el, KaxCueTrackPositions ) ) +#if 0 + if( p_segment->index[i_index].i_position < i_pos ) + { + EbmlElement *el; + + msg_Warn( p_demux, "searching for cluster, could take some time" ); + + /* search a cluster */ + while( ( el = p_sys->ep->Get() ) != NULL ) { - ep->Down(); - while( ( el = ep->Get() ) != NULL ) + if( MKV_IS_ID( el, KaxCluster ) ) { - if( MKV_IS_ID( el, KaxCueTrack ) ) - { - KaxCueTrack &ctrack = *(KaxCueTrack*)el; - - ctrack.ReadData( p_sys->es->I_O() ); - idx.i_track = uint16( ctrack ); - } - else if( MKV_IS_ID( el, KaxCueClusterPosition ) ) - { - KaxCueClusterPosition &ccpos = *(KaxCueClusterPosition*)el; + KaxCluster *cluster = (KaxCluster*)el; - ccpos.ReadData( p_sys->es->I_O() ); - idx.i_position = p_sys->segment->GetGlobalPosition( uint64( ccpos ) ); - } - else if( MKV_IS_ID( el, KaxCueBlockNumber ) ) - { - KaxCueBlockNumber &cbnum = *(KaxCueBlockNumber*)el; + /* add it to the index */ + p_segment->IndexAppendCluster( cluster ); - cbnum.ReadData( p_sys->es->I_O() ); - idx.i_block_number = uint32( cbnum ); - } - else + if( (int64_t)cluster->GetElementPosition() >= i_pos ) { - msg_Dbg( p_demux, " * Unknown (%s)", typeid(*el).name() ); + p_sys->cluster = cluster; + p_sys->ep->Down(); + break; } } - ep->Up(); - } - else - { - msg_Dbg( p_demux, " * Unknown (%s)", typeid(*el).name() ); } } - ep->Up(); - -#if 0 - msg_Dbg( p_demux, " * added time="I64Fd" pos="I64Fd - " track=%d bnum=%d", idx.i_time, idx.i_position, - idx.i_track, idx.i_block_number ); #endif - - p_sys->i_index++; - if( p_sys->i_index >= p_sys->i_index_max ) - { - p_sys->i_index_max += 1024; - p_sys->index = (mkv_index_t*)realloc( p_sys->index, sizeof( mkv_index_t ) * p_sys->i_index_max ); - } -#undef idx - } - else - { - msg_Dbg( p_demux, " * Unknown (%s)", typeid(*el).name() ); } } - delete ep; - delete cues; - p_sys->b_cues = VLC_TRUE; - - msg_Dbg( p_demux, "loading cues done." ); - p_sys->in->setFilePointer( i_sav_position, seek_beginning ); + p_vsegment->Seek( *p_demux, i_date, i_time_offset, psz_chapter ); } -static void LoadTags( demux_t *p_demux ) +/***************************************************************************** + * Demux: reads and demuxes data packets + ***************************************************************************** + * Returns -1 in case of error, 0 in case of EOF, 1 otherwise + *****************************************************************************/ +static int Demux( demux_t *p_demux) { - demux_sys_t *p_sys = p_demux->p_sys; - int64_t i_sav_position = p_sys->in->getFilePointer(); - EbmlParser *ep; - EbmlElement *el, *tags; + demux_sys_t *p_sys = p_demux->p_sys; + virtual_segment_c *p_vsegment = p_sys->p_current_segment; + matroska_segment_c *p_segment = p_vsegment->Segment(); + if ( p_segment == NULL ) return 0; + int i_block_count = 0; + int i_return = 0; - msg_Dbg( p_demux, "loading tags" ); - p_sys->in->setFilePointer( p_sys->i_tags_position, seek_beginning ); - tags = p_sys->es->FindNextID( KaxTags::ClassInfos, 0xFFFFFFFFL); + KaxBlock *block; + int64_t i_block_duration; + int64_t i_block_ref1; + int64_t i_block_ref2; - if( tags == NULL ) - { - msg_Err( p_demux, "cannot load tags (broken seekhead or file)" ); - p_sys->in->setFilePointer( i_sav_position, seek_beginning ); - return; - } + vlc_mutex_lock( &p_sys->lock_demuxer ); - msg_Dbg( p_demux, "Tags" ); - ep = new EbmlParser( p_sys->es, tags ); - while( ( el = ep->Get() ) != NULL ) + for( ;; ) { - if( MKV_IS_ID( el, KaxTag ) ) + if ( p_sys->demuxer.b_die ) + break; + + if( p_sys->i_pts >= p_sys->i_start_pts ) + if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) ) + { + i_return = 1; + break; + } + + if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL ) { - msg_Dbg( p_demux, "+ Tag" ); - ep->Down(); - while( ( el = ep->Get() ) != NULL ) + /* nothing left to read in this ordered edition */ + if ( !p_vsegment->SelectNext() ) + break; + p_segment->UnSelect( ); + + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + + /* switch to the next segment */ + p_segment = p_vsegment->Segment(); + if ( !p_segment->Select( 0 ) ) { - if( MKV_IS_ID( el, KaxTagTargets ) ) - { - msg_Dbg( p_demux, "| + Targets" ); - ep->Down(); - while( ( el = ep->Get() ) != NULL ) - { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() ); - } - ep->Up(); - } - else if( MKV_IS_ID( el, KaxTagGeneral ) ) - { - msg_Dbg( p_demux, "| + General" ); - ep->Down(); - while( ( el = ep->Get() ) != NULL ) - { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() ); - } - ep->Up(); - } - else if( MKV_IS_ID( el, KaxTagGenres ) ) - { - msg_Dbg( p_demux, "| + Genres" ); - ep->Down(); - while( ( el = ep->Get() ) != NULL ) - { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() ); - } - ep->Up(); - } - else if( MKV_IS_ID( el, KaxTagAudioSpecific ) ) - { - msg_Dbg( p_demux, "| + Audio Specific" ); - ep->Down(); - while( ( el = ep->Get() ) != NULL ) - { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() ); - } - ep->Up(); - } - else if( MKV_IS_ID( el, KaxTagImageSpecific ) ) - { - msg_Dbg( p_demux, "| + Images Specific" ); - ep->Down(); - while( ( el = ep->Get() ) != NULL ) - { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() ); - } - ep->Up(); - } - else if( MKV_IS_ID( el, KaxTagMultiComment ) ) - { - msg_Dbg( p_demux, "| + Multi Comment" ); - } - else if( MKV_IS_ID( el, KaxTagMultiCommercial ) ) - { - msg_Dbg( p_demux, "| + Multi Commercial" ); - } - else if( MKV_IS_ID( el, KaxTagMultiDate ) ) - { - msg_Dbg( p_demux, "| + Multi Date" ); - } - else if( MKV_IS_ID( el, KaxTagMultiEntity ) ) - { - msg_Dbg( p_demux, "| + Multi Entity" ); - } - else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) ) - { - msg_Dbg( p_demux, "| + Multi Identifier" ); - } - else if( MKV_IS_ID( el, KaxTagMultiLegal ) ) - { - msg_Dbg( p_demux, "| + Multi Legal" ); - } - else if( MKV_IS_ID( el, KaxTagMultiTitle ) ) - { - msg_Dbg( p_demux, "| + Multi Title" ); - } - else + msg_Err( p_demux, "Failed to select new segment" ); + break; + } + continue; + } + + + if( p_segment->BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) + { + if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered ) + { + const chapter_item_c *p_chap = p_vsegment->CurrentChapter(); + // check if there are more chapters to read + if ( p_chap != NULL ) { - msg_Dbg( p_demux, "| + Unknown (%s)", typeid( *el ).name() ); + /* TODO handle successive chapters with the same user_start_time/user_end_time + if ( p_chap->i_user_start_time == p_chap->i_user_start_time ) + p_vsegment->SelectNext(); + */ + p_sys->i_pts = p_chap->i_user_end_time; + p_sys->i_pts++; // trick to avoid staying on segments with no duration and no content + + i_return = 1; } + + break; } - ep->Up(); + 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; } - else + + p_sys->i_pts = p_sys->i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000; + + if( p_sys->i_pts >= p_sys->i_start_pts ) { - msg_Dbg( p_demux, "+ Unknown (%s)", typeid( *el ).name() ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts ); } - } - delete ep; - delete tags; - msg_Dbg( p_demux, "loading tags done." ); - p_sys->in->setFilePointer( i_sav_position, seek_beginning ); -} + BlockDecode( p_demux, block, p_sys->i_pts, i_block_duration ); -/***************************************************************************** + delete block; + i_block_count++; + + // TODO optimize when there is need to leave or when seeking has been called + if( i_block_count > 5 ) + { + i_return = 1; + break; + } + } + + vlc_mutex_unlock( &p_sys->lock_demuxer ); + + return i_return; +} + + + +/***************************************************************************** + * Stream managment + *****************************************************************************/ +vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_ ) +{ + s = s_; + mb_eof = VLC_FALSE; +} + +uint32 vlc_stream_io_callback::read( void *p_buffer, size_t i_size ) +{ + if( i_size <= 0 || mb_eof ) + { + return 0; + } + + return stream_Read( s, p_buffer, i_size ); +} +void vlc_stream_io_callback::setFilePointer(int64_t i_offset, seek_mode mode ) +{ + int64_t i_pos; + + switch( mode ) + { + case seek_beginning: + i_pos = i_offset; + break; + case seek_end: + i_pos = stream_Size( s ) - i_offset; + break; + default: + i_pos= stream_Tell( s ) + i_offset; + break; + } + + if( i_pos < 0 || i_pos >= stream_Size( s ) ) + { + mb_eof = VLC_TRUE; + return; + } + + mb_eof = VLC_FALSE; + if( stream_Seek( s, i_pos ) ) + { + mb_eof = VLC_TRUE; + } + return; +} +size_t vlc_stream_io_callback::write( const void *p_buffer, size_t i_size ) +{ + return 0; +} +uint64 vlc_stream_io_callback::getFilePointer( void ) +{ + return stream_Tell( s ); +} +void vlc_stream_io_callback::close( void ) +{ + return; +} + + +/***************************************************************************** + * Ebml Stream parser + *****************************************************************************/ +EbmlParser::EbmlParser( EbmlStream *es, EbmlElement *el_start, demux_t *p_demux ) +{ + int i; + + m_es = es; + m_got = NULL; + m_el[0] = el_start; + mi_remain_size[0] = el_start->GetSize(); + + for( i = 1; i < 6; i++ ) + { + m_el[i] = NULL; + } + mi_level = 1; + mi_user_level = 1; + mb_keep = VLC_FALSE; + mb_dummy = config_GetInt( p_demux, "mkv-use-dummy" ); +} + +EbmlParser::~EbmlParser( void ) +{ + int i; + + for( i = 1; i < mi_level; i++ ) + { + if( !mb_keep ) + { + delete m_el[i]; + } + mb_keep = VLC_FALSE; + } +} + +void EbmlParser::Up( void ) +{ + if( mi_user_level == mi_level ) + { + fprintf( stderr," arrrrrrrrrrrrrg Up cannot escape itself\n" ); + } + + mi_user_level--; +} + +void EbmlParser::Down( void ) +{ + mi_user_level++; + mi_level++; +} + +void EbmlParser::Keep( void ) +{ + mb_keep = VLC_TRUE; +} + +int EbmlParser::GetLevel( void ) +{ + return mi_user_level; +} + +void EbmlParser::Reset( demux_t *p_demux ) +{ + while ( mi_level > 0) + { + delete m_el[mi_level]; + m_el[mi_level] = NULL; + mi_level--; + } + mi_user_level = mi_level = 1; +#if LIBEBML_VERSION >= 0x000704 + // a little faster and cleaner + m_es->I_O().setFilePointer( static_cast(m_el[0])->GetGlobalPosition(0) ); +#else + m_es->I_O().setFilePointer( m_el[0]->GetElementPosition() + m_el[0]->ElementSize(true) - m_el[0]->GetSize() ); +#endif + mb_dummy = config_GetInt( p_demux, "mkv-use-dummy" ); +} + +EbmlElement *EbmlParser::Get( void ) +{ + int i_ulev = 0; + + if( mi_user_level != mi_level ) + { + return NULL; + } + if( m_got ) + { + EbmlElement *ret = m_got; + m_got = NULL; + + return ret; + } + + if( m_el[mi_level] ) + { + m_el[mi_level]->SkipData( *m_es, m_el[mi_level]->Generic().Context ); + if( !mb_keep ) + { + delete m_el[mi_level]; + } + mb_keep = VLC_FALSE; + } + + m_el[mi_level] = m_es->FindNextElement( m_el[mi_level - 1]->Generic().Context, i_ulev, 0xFFFFFFFFL, mb_dummy, 1 ); +// mi_remain_size[mi_level] = m_el[mi_level]->GetSize(); + if( i_ulev > 0 ) + { + while( i_ulev > 0 ) + { + if( mi_level == 1 ) + { + mi_level = 0; + return NULL; + } + + delete m_el[mi_level - 1]; + m_got = m_el[mi_level -1] = m_el[mi_level]; + m_el[mi_level] = NULL; + + mi_level--; + i_ulev--; + } + return NULL; + } + else if( m_el[mi_level] == NULL ) + { + fprintf( stderr," m_el[mi_level] == NULL\n" ); + } + + return m_el[mi_level]; +} + + +/***************************************************************************** + * Tools + * * LoadCues : load the cues element and update index + * + * * LoadTags : load ... the tags element + * + * * InformationCreate : create all information, load tags if present + * + *****************************************************************************/ +void matroska_segment_c::LoadCues( ) +{ + int64_t i_sav_position = es.I_O().getFilePointer(); + EbmlParser *ep; + EbmlElement *el, *cues; + + /* *** Load the cue if found *** */ + if( i_cues_position < 0 ) + { + msg_Warn( &sys.demuxer, "no cues/empty cues found->seek won't be precise" ); + +// IndexAppendCluster( cluster ); + } + + vlc_bool_t b_seekable; + + stream_Control( sys.demuxer.s, STREAM_CAN_FASTSEEK, &b_seekable ); + if( !b_seekable ) + return; + + msg_Dbg( &sys.demuxer, "loading cues" ); + es.I_O().setFilePointer( i_cues_position, seek_beginning ); + cues = es.FindNextID( KaxCues::ClassInfos, 0xFFFFFFFFL); + + if( cues == NULL ) + { + msg_Err( &sys.demuxer, "cannot load cues (broken seekhead or file)" ); + es.I_O().setFilePointer( i_sav_position, seek_beginning ); + return; + } + + ep = new EbmlParser( &es, cues, &sys.demuxer ); + while( ( el = ep->Get() ) != NULL ) + { + if( MKV_IS_ID( el, KaxCuePoint ) ) + { +#define idx index[i_index] + + idx.i_track = -1; + idx.i_block_number= -1; + idx.i_position = -1; + idx.i_time = 0; + idx.b_key = VLC_TRUE; + + ep->Down(); + while( ( el = ep->Get() ) != NULL ) + { + if( MKV_IS_ID( el, KaxCueTime ) ) + { + KaxCueTime &ctime = *(KaxCueTime*)el; + + ctime.ReadData( es.I_O() ); + + idx.i_time = uint64( ctime ) * i_timescale / (mtime_t)1000; + } + else if( MKV_IS_ID( el, KaxCueTrackPositions ) ) + { + ep->Down(); + while( ( el = ep->Get() ) != NULL ) + { + if( MKV_IS_ID( el, KaxCueTrack ) ) + { + KaxCueTrack &ctrack = *(KaxCueTrack*)el; + + ctrack.ReadData( es.I_O() ); + idx.i_track = uint16( ctrack ); + } + else if( MKV_IS_ID( el, KaxCueClusterPosition ) ) + { + KaxCueClusterPosition &ccpos = *(KaxCueClusterPosition*)el; + + ccpos.ReadData( es.I_O() ); + idx.i_position = segment->GetGlobalPosition( uint64( ccpos ) ); + } + else if( MKV_IS_ID( el, KaxCueBlockNumber ) ) + { + KaxCueBlockNumber &cbnum = *(KaxCueBlockNumber*)el; + + cbnum.ReadData( es.I_O() ); + idx.i_block_number = uint32( cbnum ); + } + else + { + msg_Dbg( &sys.demuxer, " * Unknown (%s)", typeid(*el).name() ); + } + } + ep->Up(); + } + else + { + msg_Dbg( &sys.demuxer, " * Unknown (%s)", typeid(*el).name() ); + } + } + ep->Up(); + +#if 0 + msg_Dbg( &sys.demuxer, " * added time="I64Fd" pos="I64Fd + " track=%d bnum=%d", idx.i_time, idx.i_position, + idx.i_track, idx.i_block_number ); +#endif + + i_index++; + if( i_index >= i_index_max ) + { + i_index_max += 1024; + index = (mkv_index_t*)realloc( index, sizeof( mkv_index_t ) * i_index_max ); + } +#undef idx + } + else + { + msg_Dbg( &sys.demuxer, " * Unknown (%s)", typeid(*el).name() ); + } + } + delete ep; + delete cues; + + b_cues = VLC_TRUE; + + msg_Dbg( &sys.demuxer, "loading cues done." ); + es.I_O().setFilePointer( i_sav_position, seek_beginning ); +} + +void matroska_segment_c::LoadTags( ) +{ + int64_t i_sav_position = es.I_O().getFilePointer(); + EbmlParser *ep; + EbmlElement *el, *tags; + + msg_Dbg( &sys.demuxer, "loading tags" ); + es.I_O().setFilePointer( i_tags_position, seek_beginning ); + tags = es.FindNextID( KaxTags::ClassInfos, 0xFFFFFFFFL); + + if( tags == NULL ) + { + msg_Err( &sys.demuxer, "cannot load tags (broken seekhead or file)" ); + es.I_O().setFilePointer( i_sav_position, seek_beginning ); + return; + } + + msg_Dbg( &sys.demuxer, "Tags" ); + ep = new EbmlParser( &es, tags, &sys.demuxer ); + while( ( el = ep->Get() ) != NULL ) + { + if( MKV_IS_ID( el, KaxTag ) ) + { + msg_Dbg( &sys.demuxer, "+ Tag" ); + ep->Down(); + while( ( el = ep->Get() ) != NULL ) + { + if( MKV_IS_ID( el, KaxTagTargets ) ) + { + msg_Dbg( &sys.demuxer, "| + Targets" ); + ep->Down(); + while( ( el = ep->Get() ) != NULL ) + { + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); + } + ep->Up(); + } + else if( MKV_IS_ID( el, KaxTagGeneral ) ) + { + msg_Dbg( &sys.demuxer, "| + General" ); + ep->Down(); + while( ( el = ep->Get() ) != NULL ) + { + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); + } + ep->Up(); + } + else if( MKV_IS_ID( el, KaxTagGenres ) ) + { + msg_Dbg( &sys.demuxer, "| + Genres" ); + ep->Down(); + while( ( el = ep->Get() ) != NULL ) + { + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); + } + ep->Up(); + } + else if( MKV_IS_ID( el, KaxTagAudioSpecific ) ) + { + msg_Dbg( &sys.demuxer, "| + Audio Specific" ); + ep->Down(); + while( ( el = ep->Get() ) != NULL ) + { + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); + } + ep->Up(); + } + else if( MKV_IS_ID( el, KaxTagImageSpecific ) ) + { + msg_Dbg( &sys.demuxer, "| + Images Specific" ); + ep->Down(); + while( ( el = ep->Get() ) != NULL ) + { + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); + } + ep->Up(); + } + else if( MKV_IS_ID( el, KaxTagMultiComment ) ) + { + msg_Dbg( &sys.demuxer, "| + Multi Comment" ); + } + else if( MKV_IS_ID( el, KaxTagMultiCommercial ) ) + { + msg_Dbg( &sys.demuxer, "| + Multi Commercial" ); + } + else if( MKV_IS_ID( el, KaxTagMultiDate ) ) + { + msg_Dbg( &sys.demuxer, "| + Multi Date" ); + } + else if( MKV_IS_ID( el, KaxTagMultiEntity ) ) + { + msg_Dbg( &sys.demuxer, "| + Multi Entity" ); + } + else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) ) + { + msg_Dbg( &sys.demuxer, "| + Multi Identifier" ); + } + else if( MKV_IS_ID( el, KaxTagMultiLegal ) ) + { + msg_Dbg( &sys.demuxer, "| + Multi Legal" ); + } + else if( MKV_IS_ID( el, KaxTagMultiTitle ) ) + { + msg_Dbg( &sys.demuxer, "| + Multi Title" ); + } + else + { + msg_Dbg( &sys.demuxer, "| + Unknown (%s)", typeid( *el ).name() ); + } + } + ep->Up(); + } + else + { + msg_Dbg( &sys.demuxer, "+ Unknown (%s)", typeid( *el ).name() ); + } + } + delete ep; + delete tags; + + msg_Dbg( &sys.demuxer, "loading tags done." ); + es.I_O().setFilePointer( i_sav_position, seek_beginning ); +} + +/***************************************************************************** + * ParseSeekHead: + *****************************************************************************/ +void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) +{ + EbmlElement *el; + size_t i, j; + int i_upper_level = 0; + + msg_Dbg( &sys.demuxer, "| + Seek head" ); + + /* Master elements */ + seekhead->Read( es, seekhead->Generic().Context, i_upper_level, el, true ); + + for( i = 0; i < seekhead->ListSize(); i++ ) + { + EbmlElement *l = (*seekhead)[i]; + + if( MKV_IS_ID( l, KaxSeek ) ) + { + EbmlMaster *sk = static_cast(l); + EbmlId id = EbmlVoid::ClassInfos.GlobalId; + int64_t i_pos = -1; + + for( j = 0; j < sk->ListSize(); j++ ) + { + EbmlElement *l = (*sk)[j]; + + if( MKV_IS_ID( l, KaxSeekID ) ) + { + KaxSeekID &sid = *(KaxSeekID*)l; + id = EbmlId( sid.GetBuffer(), sid.GetSize() ); + } + else if( MKV_IS_ID( l, KaxSeekPosition ) ) + { + KaxSeekPosition &spos = *(KaxSeekPosition*)l; + i_pos = uint64( spos ); + } + else + { + msg_Dbg( &sys.demuxer, "| | | + Unknown (%s)", typeid(*l).name() ); + } + } + + if( i_pos >= 0 ) + { + if( id == KaxCues::ClassInfos.GlobalId ) + { + msg_Dbg( &sys.demuxer, "| | | = cues at "I64Fd, i_pos ); + i_cues_position = segment->GetGlobalPosition( i_pos ); + } + else if( id == KaxChapters::ClassInfos.GlobalId ) + { + msg_Dbg( &sys.demuxer, "| | | = chapters at "I64Fd, i_pos ); + i_chapters_position = segment->GetGlobalPosition( i_pos ); + } + else if( id == KaxTags::ClassInfos.GlobalId ) + { + msg_Dbg( &sys.demuxer, "| | | = tags at "I64Fd, i_pos ); + i_tags_position = segment->GetGlobalPosition( i_pos ); + } + } + } + else + { + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid(*l).name() ); + } + } +} + +/***************************************************************************** + * ParseTrackEntry: + *****************************************************************************/ +void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) +{ + size_t i, j, k, n; + + 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 ) ); + + es_format_Init( &tk->fmt, UNKNOWN_ES, 0 ); + tk->fmt.psz_language = strdup("English"); + tk->fmt.psz_description = NULL; + + tk->b_default = VLC_TRUE; + tk->b_enabled = VLC_TRUE; + tk->b_silent = VLC_FALSE; + tk->i_number = tracks.size() - 1; + tk->i_extra_data = 0; + tk->p_extra_data = NULL; + tk->psz_codec = NULL; + tk->i_default_duration = 0; + tk->f_timecodescale = 1.0; + + tk->b_inited = VLC_FALSE; + tk->i_data_init = 0; + tk->p_data_init = NULL; + + tk->psz_codec_name = NULL; + tk->psz_codec_settings = NULL; + tk->psz_codec_info_url = NULL; + tk->psz_codec_download_url = NULL; + + tk->i_compression_type = MATROSKA_COMPRESSION_NONE; + + for( i = 0; i < m->ListSize(); i++ ) + { + EbmlElement *l = (*m)[i]; + + if( MKV_IS_ID( l, KaxTrackNumber ) ) + { + KaxTrackNumber &tnum = *(KaxTrackNumber*)l; + + tk->i_number = uint32( tnum ); + msg_Dbg( &sys.demuxer, "| | | + Track Number=%u", uint32( tnum ) ); + } + else if( MKV_IS_ID( l, KaxTrackUID ) ) + { + KaxTrackUID &tuid = *(KaxTrackUID*)l; + + msg_Dbg( &sys.demuxer, "| | | + Track UID=%u", uint32( tuid ) ); + } + else if( MKV_IS_ID( l, KaxTrackType ) ) + { + char *psz_type; + KaxTrackType &ttype = *(KaxTrackType*)l; + + switch( uint8(ttype) ) + { + case track_audio: + psz_type = "audio"; + tk->fmt.i_cat = AUDIO_ES; + break; + case track_video: + psz_type = "video"; + tk->fmt.i_cat = VIDEO_ES; + break; + case track_subtitle: + psz_type = "subtitle"; + tk->fmt.i_cat = SPU_ES; + break; + case track_buttons: + psz_type = "buttons"; + tk->fmt.i_cat = SPU_ES; + break; + default: + psz_type = "unknown"; + tk->fmt.i_cat = UNKNOWN_ES; + break; + } + + msg_Dbg( &sys.demuxer, "| | | + Track Type=%s", psz_type ); + } +// else if( EbmlId( *l ) == KaxTrackFlagEnabled::ClassInfos.GlobalId ) +// { +// KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)l; + +// tk->b_enabled = uint32( fenb ); +// msg_Dbg( &sys.demuxer, "| | | + Track Enabled=%u", +// uint32( fenb ) ); +// } + else if( MKV_IS_ID( l, KaxTrackFlagDefault ) ) + { + KaxTrackFlagDefault &fdef = *(KaxTrackFlagDefault*)l; + + tk->b_default = uint32( fdef ); + msg_Dbg( &sys.demuxer, "| | | + Track Default=%u", uint32( fdef ) ); + } + else if( MKV_IS_ID( l, KaxTrackFlagLacing ) ) + { + KaxTrackFlagLacing &lac = *(KaxTrackFlagLacing*)l; + + msg_Dbg( &sys.demuxer, "| | | + Track Lacing=%d", uint32( lac ) ); + } + else if( MKV_IS_ID( l, KaxTrackMinCache ) ) + { + KaxTrackMinCache &cmin = *(KaxTrackMinCache*)l; + + msg_Dbg( &sys.demuxer, "| | | + Track MinCache=%d", uint32( cmin ) ); + } + else if( MKV_IS_ID( l, KaxTrackMaxCache ) ) + { + KaxTrackMaxCache &cmax = *(KaxTrackMaxCache*)l; + + msg_Dbg( &sys.demuxer, "| | | + Track MaxCache=%d", uint32( cmax ) ); + } + else if( MKV_IS_ID( l, KaxTrackDefaultDuration ) ) + { + KaxTrackDefaultDuration &defd = *(KaxTrackDefaultDuration*)l; + + tk->i_default_duration = uint64(defd); + msg_Dbg( &sys.demuxer, "| | | + Track Default Duration="I64Fd, uint64(defd) ); + } + else if( MKV_IS_ID( l, KaxTrackTimecodeScale ) ) + { + KaxTrackTimecodeScale &ttcs = *(KaxTrackTimecodeScale*)l; + + tk->f_timecodescale = float( ttcs ); + msg_Dbg( &sys.demuxer, "| | | + Track TimeCodeScale=%f", tk->f_timecodescale ); + } + else if( MKV_IS_ID( l, KaxTrackName ) ) + { + KaxTrackName &tname = *(KaxTrackName*)l; + + tk->fmt.psz_description = UTF8ToStr( UTFstring( tname ) ); + msg_Dbg( &sys.demuxer, "| | | + Track Name=%s", tk->fmt.psz_description ); + } + else if( MKV_IS_ID( l, KaxTrackLanguage ) ) + { + KaxTrackLanguage &lang = *(KaxTrackLanguage*)l; + + tk->fmt.psz_language = strdup( string( lang ).c_str() ); + msg_Dbg( &sys.demuxer, + "| | | + Track Language=`%s'", tk->fmt.psz_language ); + } + else if( MKV_IS_ID( l, KaxCodecID ) ) + { + KaxCodecID &codecid = *(KaxCodecID*)l; + + tk->psz_codec = strdup( string( codecid ).c_str() ); + msg_Dbg( &sys.demuxer, "| | | + Track CodecId=%s", string( codecid ).c_str() ); + } + else if( MKV_IS_ID( l, KaxCodecPrivate ) ) + { + KaxCodecPrivate &cpriv = *(KaxCodecPrivate*)l; + + tk->i_extra_data = cpriv.GetSize(); + if( tk->i_extra_data > 0 ) + { + tk->p_extra_data = (uint8_t*)malloc( tk->i_extra_data ); + memcpy( tk->p_extra_data, cpriv.GetBuffer(), tk->i_extra_data ); + } + msg_Dbg( &sys.demuxer, "| | | + Track CodecPrivate size="I64Fd, cpriv.GetSize() ); + } + else if( MKV_IS_ID( l, KaxCodecName ) ) + { + KaxCodecName &cname = *(KaxCodecName*)l; + + tk->psz_codec_name = UTF8ToStr( UTFstring( cname ) ); + msg_Dbg( &sys.demuxer, "| | | + Track Codec Name=%s", tk->psz_codec_name ); + } + else if( MKV_IS_ID( l, KaxContentEncodings ) ) + { + EbmlMaster *cencs = static_cast(l); + MkvTree( sys.demuxer, 3, "Content Encodings" ); + for( j = 0; j < cencs->ListSize(); j++ ) + { + EbmlElement *l2 = (*cencs)[j]; + if( MKV_IS_ID( l2, KaxContentEncoding ) ) + { + MkvTree( sys.demuxer, 4, "Content Encoding" ); + EbmlMaster *cenc = static_cast(l2); + for( k = 0; k < cenc->ListSize(); k++ ) + { + EbmlElement *l3 = (*cenc)[k]; + if( MKV_IS_ID( l3, KaxContentEncodingOrder ) ) + { + KaxContentEncodingOrder &encord = *(KaxContentEncodingOrder*)l3; + MkvTree( sys.demuxer, 5, "Order: %i", uint32( encord ) ); + } + else if( MKV_IS_ID( l3, KaxContentEncodingScope ) ) + { + KaxContentEncodingScope &encscope = *(KaxContentEncodingScope*)l3; + MkvTree( sys.demuxer, 5, "Scope: %i", uint32( encscope ) ); + } + else if( MKV_IS_ID( l3, KaxContentEncodingType ) ) + { + KaxContentEncodingType &enctype = *(KaxContentEncodingType*)l3; + MkvTree( sys.demuxer, 5, "Type: %i", uint32( enctype ) ); + } + else if( MKV_IS_ID( l3, KaxContentCompression ) ) + { + EbmlMaster *compr = static_cast(l3); + MkvTree( sys.demuxer, 5, "Content Compression" ); + for( n = 0; n < compr->ListSize(); n++ ) + { + EbmlElement *l4 = (*compr)[n]; + if( MKV_IS_ID( l4, KaxContentCompAlgo ) ) + { + KaxContentCompAlgo &compalg = *(KaxContentCompAlgo*)l4; + MkvTree( sys.demuxer, 6, "Compression Algorithm: %i", uint32(compalg) ); + if( uint32( compalg ) == 0 ) + { + tk->i_compression_type = MATROSKA_COMPRESSION_ZLIB; + } + } + else + { + MkvTree( sys.demuxer, 6, "Unknown (%s)", typeid(*l4).name() ); + } + } + } + + else + { + MkvTree( sys.demuxer, 5, "Unknown (%s)", typeid(*l3).name() ); + } + } + + } + else + { + MkvTree( sys.demuxer, 4, "Unknown (%s)", typeid(*l2).name() ); + } + } + + } +// else if( EbmlId( *l ) == KaxCodecSettings::ClassInfos.GlobalId ) +// { +// KaxCodecSettings &cset = *(KaxCodecSettings*)l; + +// tk->psz_codec_settings = UTF8ToStr( UTFstring( cset ) ); +// msg_Dbg( &sys.demuxer, "| | | + Track Codec Settings=%s", tk->psz_codec_settings ); +// } +// else if( EbmlId( *l ) == KaxCodecInfoURL::ClassInfos.GlobalId ) +// { +// KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)l; + +// tk->psz_codec_info_url = strdup( string( ciurl ).c_str() ); +// msg_Dbg( &sys.demuxer, "| | | + Track Codec Info URL=%s", tk->psz_codec_info_url ); +// } +// else if( EbmlId( *l ) == KaxCodecDownloadURL::ClassInfos.GlobalId ) +// { +// KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)l; + +// tk->psz_codec_download_url = strdup( string( cdurl ).c_str() ); +// msg_Dbg( &sys.demuxer, "| | | + Track Codec Info URL=%s", tk->psz_codec_download_url ); +// } +// else if( EbmlId( *l ) == KaxCodecDecodeAll::ClassInfos.GlobalId ) +// { +// KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)l; + +// msg_Dbg( &sys.demuxer, "| | | + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) ); +// } +// else if( EbmlId( *l ) == KaxTrackOverlay::ClassInfos.GlobalId ) +// { +// KaxTrackOverlay &tovr = *(KaxTrackOverlay*)l; + +// msg_Dbg( &sys.demuxer, "| | | + Track Overlay=%u <== UNUSED", uint32( tovr ) ); +// } + else if( MKV_IS_ID( l, KaxTrackVideo ) ) + { + EbmlMaster *tkv = static_cast(l); + unsigned int j; + + msg_Dbg( &sys.demuxer, "| | | + Track Video" ); + tk->f_fps = 0.0; + + for( j = 0; j < tkv->ListSize(); j++ ) + { + EbmlElement *l = (*tkv)[j]; +// if( EbmlId( *el4 ) == KaxVideoFlagInterlaced::ClassInfos.GlobalId ) +// { +// KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)el4; + +// msg_Dbg( &sys.demuxer, "| | | | + Track Video Interlaced=%u", uint8( fint ) ); +// } +// else if( EbmlId( *el4 ) == KaxVideoStereoMode::ClassInfos.GlobalId ) +// { +// KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)el4; + +// msg_Dbg( &sys.demuxer, "| | | | + Track Video Stereo Mode=%u", uint8( stereo ) ); +// } +// else + if( MKV_IS_ID( l, KaxVideoPixelWidth ) ) + { + KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)l; + + 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 ); + msg_Dbg( &sys.demuxer, "| | | | + height=%d", uint16( vheight ) ); + } + else if( MKV_IS_ID( l, KaxVideoDisplayWidth ) ) + { + KaxVideoDisplayWidth &vwidth = *(KaxVideoDisplayWidth*)l; + + tk->fmt.video.i_visible_width = uint16( vwidth ); + msg_Dbg( &sys.demuxer, "| | | | + display width=%d", uint16( vwidth ) ); + } + else if( MKV_IS_ID( l, KaxVideoDisplayHeight ) ) + { + KaxVideoDisplayWidth &vheight = *(KaxVideoDisplayWidth*)l; + + tk->fmt.video.i_visible_height = uint16( vheight ); + msg_Dbg( &sys.demuxer, "| | | | + display height=%d", uint16( vheight ) ); + } + else if( MKV_IS_ID( l, KaxVideoFrameRate ) ) + { + KaxVideoFrameRate &vfps = *(KaxVideoFrameRate*)l; + + tk->f_fps = float( vfps ); + msg_Dbg( &sys.demuxer, " | | | + fps=%f", float( vfps ) ); + } +// else if( EbmlId( *l ) == KaxVideoDisplayUnit::ClassInfos.GlobalId ) +// { +// KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l; + +// msg_Dbg( &sys.demuxer, "| | | | + Track Video Display Unit=%s", +// uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) ); +// } +// else if( EbmlId( *l ) == KaxVideoAspectRatio::ClassInfos.GlobalId ) +// { +// KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)l; + +// msg_Dbg( &sys.demuxer, " | | | + Track Video Aspect Ratio Type=%u", uint8( ratio ) ); +// } +// else if( EbmlId( *l ) == KaxVideoGamma::ClassInfos.GlobalId ) +// { +// KaxVideoGamma &gamma = *(KaxVideoGamma*)l; + +// msg_Dbg( &sys.demuxer, " | | | + fps=%f", float( gamma ) ); +// } + else + { + msg_Dbg( &sys.demuxer, "| | | | + Unknown (%s)", typeid(*l).name() ); + } + } + if ( tk->fmt.video.i_visible_height && tk->fmt.video.i_visible_width ) + tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * tk->fmt.video.i_visible_width / tk->fmt.video.i_visible_height; + } + else if( MKV_IS_ID( l, KaxTrackAudio ) ) + { + EbmlMaster *tka = static_cast(l); + unsigned int j; + + msg_Dbg( &sys.demuxer, "| | | + Track Audio" ); + + for( j = 0; j < tka->ListSize(); j++ ) + { + EbmlElement *l = (*tka)[j]; + + if( MKV_IS_ID( l, KaxAudioSamplingFreq ) ) + { + KaxAudioSamplingFreq &afreq = *(KaxAudioSamplingFreq*)l; + + 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, KaxAudioChannels ) ) + { + KaxAudioChannels &achan = *(KaxAudioChannels*)l; + + tk->fmt.audio.i_channels = uint8( achan ); + msg_Dbg( &sys.demuxer, "| | | | + achan=%u", uint8( achan ) ); + } + else if( MKV_IS_ID( l, KaxAudioBitDepth ) ) + { + KaxAudioBitDepth &abits = *(KaxAudioBitDepth*)l; + + tk->fmt.audio.i_bitspersample = uint8( abits ); + msg_Dbg( &sys.demuxer, "| | | | + abits=%u", uint8( abits ) ); + } + else + { + msg_Dbg( &sys.demuxer, "| | | | + Unknown (%s)", typeid(*l).name() ); + } + } + } + else + { + msg_Dbg( &sys.demuxer, "| | | + Unknown (%s)", + typeid(*l).name() ); + } + } +} + +/***************************************************************************** + * ParseTracks: + *****************************************************************************/ +void matroska_segment_c::ParseTracks( KaxTracks *tracks ) +{ + EbmlElement *el; + unsigned int i; + int i_upper_level = 0; + + msg_Dbg( &sys.demuxer, "| + Tracks" ); + + /* Master elements */ + tracks->Read( es, tracks->Generic().Context, i_upper_level, el, true ); + + for( i = 0; i < tracks->ListSize(); i++ ) + { + EbmlElement *l = (*tracks)[i]; + + if( MKV_IS_ID( l, KaxTrackEntry ) ) + { + ParseTrackEntry( static_cast(l) ); + } + else + { + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid(*l).name() ); + } + } +} + +/***************************************************************************** * ParseInfo: *****************************************************************************/ -static void ParseSeekHead( demux_t *p_demux, EbmlElement *seekhead ) +void matroska_segment_c::ParseInfo( KaxInfo *info ) { - demux_sys_t *p_sys = p_demux->p_sys; EbmlElement *el; EbmlMaster *m; - unsigned int i; + size_t i, j; int i_upper_level = 0; - msg_Dbg( p_demux, "| + Seek head" ); + msg_Dbg( &sys.demuxer, "| + Information" ); /* Master elements */ - m = static_cast(seekhead); - m->Read( *p_sys->es, seekhead->Generic().Context, i_upper_level, el, true ); + m = static_cast(info); + m->Read( es, info->Generic().Context, i_upper_level, el, true ); for( i = 0; i < m->ListSize(); i++ ) { EbmlElement *l = (*m)[i]; - if( MKV_IS_ID( l, KaxSeek ) ) + if( MKV_IS_ID( l, KaxSegmentUID ) ) { - EbmlMaster *sk = static_cast(l); - EbmlId id = EbmlVoid::ClassInfos.GlobalId; - int64_t i_pos = -1; + segment_uid = *(new KaxSegmentUID(*static_cast(l))); - unsigned int j; + msg_Dbg( &sys.demuxer, "| | + UID=%d", *(uint32*)segment_uid.GetBuffer() ); + } + else if( MKV_IS_ID( l, KaxPrevUID ) ) + { + prev_segment_uid = *(new KaxPrevUID(*static_cast(l))); - for( j = 0; j < sk->ListSize(); j++ ) + msg_Dbg( &sys.demuxer, "| | + PrevUID=%d", *(uint32*)prev_segment_uid.GetBuffer() ); + } + else if( MKV_IS_ID( l, KaxNextUID ) ) + { + next_segment_uid = *(new KaxNextUID(*static_cast(l))); + + msg_Dbg( &sys.demuxer, "| | + NextUID=%d", *(uint32*)next_segment_uid.GetBuffer() ); + } + else if( MKV_IS_ID( l, KaxTimecodeScale ) ) + { + KaxTimecodeScale &tcs = *(KaxTimecodeScale*)l; + + i_timescale = uint64(tcs); + + msg_Dbg( &sys.demuxer, "| | + TimecodeScale="I64Fd, + i_timescale ); + } + else if( MKV_IS_ID( l, KaxDuration ) ) + { + KaxDuration &dur = *(KaxDuration*)l; + + i_duration = mtime_t( double( dur ) ); + + msg_Dbg( &sys.demuxer, "| | + Duration="I64Fd, + i_duration ); + } + else if( MKV_IS_ID( l, KaxMuxingApp ) ) + { + KaxMuxingApp &mapp = *(KaxMuxingApp*)l; + + psz_muxing_application = UTF8ToStr( UTFstring( mapp ) ); + + msg_Dbg( &sys.demuxer, "| | + Muxing Application=%s", + psz_muxing_application ); + } + else if( MKV_IS_ID( l, KaxWritingApp ) ) + { + KaxWritingApp &wapp = *(KaxWritingApp*)l; + + psz_writing_application = UTF8ToStr( UTFstring( wapp ) ); + + msg_Dbg( &sys.demuxer, "| | + Writing Application=%s", + psz_writing_application ); + } + else if( MKV_IS_ID( l, KaxSegmentFilename ) ) + { + KaxSegmentFilename &sfn = *(KaxSegmentFilename*)l; + + psz_segment_filename = UTF8ToStr( UTFstring( sfn ) ); + + msg_Dbg( &sys.demuxer, "| | + Segment Filename=%s", + psz_segment_filename ); + } + else if( MKV_IS_ID( l, KaxTitle ) ) + { + KaxTitle &title = *(KaxTitle*)l; + + psz_title = UTF8ToStr( UTFstring( title ) ); + + msg_Dbg( &sys.demuxer, "| | + Title=%s", psz_title ); + } + else if( MKV_IS_ID( l, KaxSegmentFamily ) ) + { + KaxSegmentFamily *uid = static_cast(l); + + families.push_back(*uid); + + msg_Dbg( &sys.demuxer, "| | + family=%d", *(uint32*)uid->GetBuffer() ); + } +#if defined( HAVE_GMTIME_R ) && !defined( SYS_DARWIN ) + else if( MKV_IS_ID( l, KaxDateUTC ) ) + { + KaxDateUTC &date = *(KaxDateUTC*)l; + time_t i_date; + struct tm tmres; + char buffer[256]; + + i_date = date.GetEpochDate(); + memset( buffer, 0, 256 ); + if( gmtime_r( &i_date, &tmres ) && + asctime_r( &tmres, buffer ) ) { - EbmlElement *l = (*sk)[j]; + buffer[strlen( buffer)-1]= '\0'; + psz_date_utc = strdup( buffer ); + msg_Dbg( &sys.demuxer, "| | + Date=%s", psz_date_utc ); + } + } +#endif +#if LIBMATROSKA_VERSION >= 0x000704 + else if( MKV_IS_ID( l, KaxChapterTranslate ) ) + { + KaxChapterTranslate *p_trans = static_cast( l ); + chapter_translation_c translated; - if( MKV_IS_ID( l, KaxSeekID ) ) + p_trans->Read( es, p_trans->Generic().Context, i_upper_level, el, true ); + for( j = 0; j < p_trans->ListSize(); j++ ) + { + EbmlElement *l = (*p_trans)[j]; + + if( MKV_IS_ID( l, KaxChapterTranslateEditionUID ) ) { - KaxSeekID &sid = *(KaxSeekID*)l; - id = EbmlId( sid.GetBuffer(), sid.GetSize() ); + translated.editions.push_back( uint64( *static_cast( l ) ) ); } - else if( MKV_IS_ID( l, KaxSeekPosition ) ) + else if( MKV_IS_ID( l, KaxChapterTranslateCodec ) ) + { + translated.codec_id = uint32( *static_cast( l ) ); + } + else if( MKV_IS_ID( l, KaxChapterTranslateID ) ) + { + translated.translated = *( new KaxChapterTranslateID( *static_cast( l ) ) ); + } + } + + translations.push_back( translated ); + } +#endif + else + { + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid(*l).name() ); + } + } + + double f_dur = double(i_duration) * double(i_timescale) / 1000000.0; + i_duration = mtime_t(f_dur); +} + + +/***************************************************************************** + * ParseChapterAtom + *****************************************************************************/ +void matroska_segment_c::ParseChapterAtom( int i_level, KaxChapterAtom *ca, chapter_item_c & chapters ) +{ + size_t i, j; + + msg_Dbg( &sys.demuxer, "| | | + ChapterAtom (level=%d)", i_level ); + for( i = 0; i < ca->ListSize(); i++ ) + { + EbmlElement *l = (*ca)[i]; + + if( MKV_IS_ID( l, KaxChapterUID ) ) + { + chapters.i_uid = uint64_t(*(KaxChapterUID*)l); + msg_Dbg( &sys.demuxer, "| | | | + ChapterUID: %lld", chapters.i_uid ); + } + else if( MKV_IS_ID( l, KaxChapterFlagHidden ) ) + { + KaxChapterFlagHidden &flag =*(KaxChapterFlagHidden*)l; + chapters.b_display_seekpoint = uint8( flag ) == 0; + + msg_Dbg( &sys.demuxer, "| | | | + ChapterFlagHidden: %s", chapters.b_display_seekpoint ? "no":"yes" ); + } + else if( MKV_IS_ID( l, KaxChapterTimeStart ) ) + { + KaxChapterTimeStart &start =*(KaxChapterTimeStart*)l; + chapters.i_start_time = uint64( start ) / I64C(1000); + + msg_Dbg( &sys.demuxer, "| | | | + ChapterTimeStart: %lld", chapters.i_start_time ); + } + else if( MKV_IS_ID( l, KaxChapterTimeEnd ) ) + { + KaxChapterTimeEnd &end =*(KaxChapterTimeEnd*)l; + chapters.i_end_time = uint64( end ) / I64C(1000); + + msg_Dbg( &sys.demuxer, "| | | | + ChapterTimeEnd: %lld", chapters.i_end_time ); + } + else if( MKV_IS_ID( l, KaxChapterDisplay ) ) + { + EbmlMaster *cd = static_cast(l); + + msg_Dbg( &sys.demuxer, "| | | | + ChapterDisplay" ); + for( j = 0; j < cd->ListSize(); j++ ) + { + EbmlElement *l= (*cd)[j]; + + if( MKV_IS_ID( l, KaxChapterString ) ) + { + int k; + + KaxChapterString &name =*(KaxChapterString*)l; + for (k = 0; k < i_level; k++) + chapters.psz_name += '+'; + chapters.psz_name += ' '; + chapters.psz_name += UTF8ToStr( UTFstring( name ) ); + chapters.b_user_display = true; + + msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", UTF8ToStr(UTFstring(name)) ); + } + else if( MKV_IS_ID( l, KaxChapterLanguage ) ) + { + KaxChapterLanguage &lang =*(KaxChapterLanguage*)l; + const char *psz = string( lang ).c_str(); + + msg_Dbg( &sys.demuxer, "| | | | | + ChapterLanguage '%s'", psz ); + } + else if( MKV_IS_ID( l, KaxChapterCountry ) ) + { + KaxChapterCountry &ct =*(KaxChapterCountry*)l; + const char *psz = string( ct ).c_str(); + + msg_Dbg( &sys.demuxer, "| | | | | + ChapterCountry '%s'", psz ); + } + } + } + else if( MKV_IS_ID( l, KaxChapterProcess ) ) + { + msg_Dbg( &sys.demuxer, "| | | | + ChapterProcess" ); + + KaxChapterProcess *cp = static_cast(l); + chapter_codec_cmds_c *p_ccodec = NULL; + + for( j = 0; j < cp->ListSize(); j++ ) + { + EbmlElement *k= (*cp)[j]; + + if( MKV_IS_ID( k, KaxChapterProcessCodecID ) ) + { + KaxChapterProcessCodecID *p_codec_id = static_cast( k ); + if ( uint32(*p_codec_id) == 0 ) + p_ccodec = new matroska_script_codec_c( sys ); + else if ( uint32(*p_codec_id) == 1 ) + p_ccodec = new dvd_chapter_codec_c( sys ); + break; + } + } + + if ( p_ccodec != NULL ) + { + for( j = 0; j < cp->ListSize(); j++ ) + { + EbmlElement *k= (*cp)[j]; + + if( MKV_IS_ID( k, KaxChapterProcessPrivate ) ) + { + KaxChapterProcessPrivate * p_private = static_cast( k ); + p_ccodec->SetPrivate( *p_private ); + } + else if( MKV_IS_ID( k, KaxChapterProcessCommand ) ) + { + p_ccodec->AddCommand( *static_cast( k ) ); + } + } + chapters.codecs.push_back( p_ccodec ); + } + } + else if( MKV_IS_ID( l, KaxChapterAtom ) ) + { + chapter_item_c *new_sub_chapter = new chapter_item_c(); + ParseChapterAtom( i_level+1, static_cast(l), *new_sub_chapter ); + new_sub_chapter->psz_parent = &chapters; + chapters.sub_chapters.push_back( new_sub_chapter ); + } + } +} + +/***************************************************************************** + * ParseChapters: + *****************************************************************************/ +void matroska_segment_c::ParseChapters( KaxChapters *chapters ) +{ + EbmlElement *el; + size_t i; + int i_upper_level = 0; + mtime_t i_dur; + + /* Master elements */ + chapters->Read( es, chapters->Generic().Context, i_upper_level, el, true ); + + for( i = 0; i < chapters->ListSize(); i++ ) + { + EbmlElement *l = (*chapters)[i]; + + if( MKV_IS_ID( l, KaxEditionEntry ) ) + { + chapter_edition_c *p_edition = new chapter_edition_c(); + + EbmlMaster *E = static_cast(l ); + size_t j; + msg_Dbg( &sys.demuxer, "| | + EditionEntry" ); + for( j = 0; j < E->ListSize(); j++ ) + { + EbmlElement *l = (*E)[j]; + + if( MKV_IS_ID( l, KaxChapterAtom ) ) { - KaxSeekPosition &spos = *(KaxSeekPosition*)l; - i_pos = uint64( spos ); + chapter_item_c *new_sub_chapter = new chapter_item_c(); + ParseChapterAtom( 0, static_cast(l), *new_sub_chapter ); + p_edition->sub_chapters.push_back( new_sub_chapter ); } - else + else if( MKV_IS_ID( l, KaxEditionUID ) ) { - msg_Dbg( p_demux, "| | | + Unknown (%s)", typeid(*l).name() ); + p_edition->i_uid = uint64(*static_cast( l )); } - } - - if( i_pos >= 0 ) - { - if( id == KaxCues::ClassInfos.GlobalId ) + else if( MKV_IS_ID( l, KaxEditionFlagOrdered ) ) { - msg_Dbg( p_demux, "| | | = cues at "I64Fd, i_pos ); - p_sys->i_cues_position = p_sys->segment->GetGlobalPosition( i_pos ); + p_edition->b_ordered = config_GetInt( &sys.demuxer, "mkv-use-ordered-chapters" ) ? (uint8(*static_cast( l )) != 0) : 0; } - else if( id == KaxChapters::ClassInfos.GlobalId ) + else if( MKV_IS_ID( l, KaxEditionFlagDefault ) ) { - msg_Dbg( p_demux, "| | | = chapters at "I64Fd, i_pos ); - p_sys->i_chapters_position = p_sys->segment->GetGlobalPosition( i_pos ); + if (uint8(*static_cast( l )) != 0) + i_default_edition = stored_editions.size(); } - else if( id == KaxTags::ClassInfos.GlobalId ) + else { - msg_Dbg( p_demux, "| | | = tags at "I64Fd, i_pos ); - p_sys->i_tags_position = p_sys->segment->GetGlobalPosition( i_pos ); + msg_Dbg( &sys.demuxer, "| | | + Unknown (%s)", typeid(*l).name() ); } } + stored_editions.push_back( p_edition ); } else { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid(*l).name() ); + msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid(*l).name() ); } } + + for( i = 0; i < stored_editions.size(); i++ ) + { + stored_editions[i]->RefreshChapters( ); + } + + if ( 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); + if (i_dur > 0) + i_duration = i_dur; + } } -/***************************************************************************** - * ParseTracks: - *****************************************************************************/ -static void ParseTrackEntry( demux_t *p_demux, EbmlMaster *m ) +void matroska_segment_c::ParseCluster( ) { - demux_sys_t *p_sys = p_demux->p_sys; + EbmlElement *el; + EbmlMaster *m; unsigned int i; + int i_upper_level = 0; - mkv_track_t *tk; - - msg_Dbg( p_demux, "| | + Track Entry" ); + /* Master elements */ + m = static_cast( cluster ); + m->Read( es, cluster->Generic().Context, i_upper_level, el, true ); - p_sys->i_track++; - p_sys->track = (mkv_track_t*)realloc( p_sys->track, sizeof( mkv_track_t ) * (p_sys->i_track + 1 ) ); + for( i = 0; i < m->ListSize(); i++ ) + { + EbmlElement *l = (*m)[i]; - /* Init the track */ - tk = &p_sys->track[p_sys->i_track - 1]; + if( MKV_IS_ID( l, KaxClusterTimecode ) ) + { + KaxClusterTimecode &ctc = *(KaxClusterTimecode*)l; - memset( tk, 0, sizeof( mkv_track_t ) ); + cluster->InitTimecode( uint64( ctc ), i_timescale ); + break; + } + } - es_format_Init( &tk->fmt, UNKNOWN_ES, 0 ); - tk->fmt.psz_language = strdup("English"); - tk->fmt.psz_description = NULL; + i_start_time = cluster->GlobalTimecode() / 1000; +} - tk->b_default = VLC_TRUE; - tk->b_enabled = VLC_TRUE; - tk->i_number = p_sys->i_track - 1; - tk->i_extra_data = 0; - tk->p_extra_data = NULL; - tk->psz_codec = NULL; - tk->i_default_duration = 0; - tk->f_timecodescale = 1.0; +/***************************************************************************** + * InformationCreate: + *****************************************************************************/ +void matroska_segment_c::InformationCreate( ) +{ + size_t i_track; - tk->b_inited = VLC_FALSE; - tk->i_data_init = 0; - tk->p_data_init = NULL; + sys.meta = vlc_meta_New(); - tk->psz_codec_name = NULL; - tk->psz_codec_settings = NULL; - tk->psz_codec_info_url = NULL; - tk->psz_codec_download_url = NULL; - - tk->i_compression_type = MATROSKA_COMPRESSION_NONE; + if( psz_title ) + { + vlc_meta_Add( sys.meta, VLC_META_TITLE, psz_title ); + } + if( psz_date_utc ) + { + vlc_meta_Add( sys.meta, VLC_META_DATE, psz_date_utc ); + } + if( psz_segment_filename ) + { + vlc_meta_Add( sys.meta, _("Segment filename"), psz_segment_filename ); + } + if( psz_muxing_application ) + { + vlc_meta_Add( sys.meta, _("Muxing application"), psz_muxing_application ); + } + if( psz_writing_application ) + { + vlc_meta_Add( sys.meta, _("Writing application"), psz_writing_application ); + } - for( i = 0; i < m->ListSize(); i++ ) + for( i_track = 0; i_track < tracks.size(); i_track++ ) { - EbmlElement *l = (*m)[i]; + mkv_track_t *tk = tracks[i_track]; + vlc_meta_t *mtk = vlc_meta_New(); - if( MKV_IS_ID( l, KaxTrackNumber ) ) - { - KaxTrackNumber &tnum = *(KaxTrackNumber*)l; + 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; - tk->i_number = uint32( tnum ); - msg_Dbg( p_demux, "| | | + Track Number=%u", uint32( tnum ) ); + if( tk->fmt.psz_description ) + { + vlc_meta_Add( sys.meta, VLC_META_DESCRIPTION, tk->fmt.psz_description ); } - else if( MKV_IS_ID( l, KaxTrackUID ) ) + if( tk->psz_codec_name ) { - KaxTrackUID &tuid = *(KaxTrackUID*)l; - - msg_Dbg( p_demux, "| | | + Track UID=%u", uint32( tuid ) ); + vlc_meta_Add( sys.meta, VLC_META_CODEC_NAME, tk->psz_codec_name ); } - else if( MKV_IS_ID( l, KaxTrackType ) ) + if( tk->psz_codec_settings ) { - char *psz_type; - KaxTrackType &ttype = *(KaxTrackType*)l; + 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 ); + } + } - switch( uint8(ttype) ) - { - case track_audio: - psz_type = "audio"; - tk->fmt.i_cat = AUDIO_ES; - break; - case track_video: - psz_type = "video"; - tk->fmt.i_cat = VIDEO_ES; - break; - case track_subtitle: - psz_type = "subtitle"; - tk->fmt.i_cat = SPU_ES; - break; - default: - psz_type = "unknown"; - tk->fmt.i_cat = UNKNOWN_ES; - break; - } + if( i_tags_position >= 0 ) + { + vlc_bool_t b_seekable; - msg_Dbg( p_demux, "| | | + Track Type=%s", psz_type ); + stream_Control( sys.demuxer.s, STREAM_CAN_FASTSEEK, &b_seekable ); + if( b_seekable ) + { + LoadTags( ); } -// else if( EbmlId( *l ) == KaxTrackFlagEnabled::ClassInfos.GlobalId ) -// { -// KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)l; + } +} -// tk->b_enabled = uint32( fenb ); -// msg_Dbg( p_demux, "| | | + Track Enabled=%u", -// uint32( fenb ) ); -// } - else if( MKV_IS_ID( l, KaxTrackFlagDefault ) ) - { - KaxTrackFlagDefault &fdef = *(KaxTrackFlagDefault*)l; - tk->b_default = uint32( fdef ); - msg_Dbg( p_demux, "| | | + Track Default=%u", uint32( fdef ) ); +/***************************************************************************** + * Divers + *****************************************************************************/ + +void matroska_segment_c::IndexAppendCluster( KaxCluster *cluster ) +{ +#define idx index[i_index] + idx.i_track = -1; + idx.i_block_number= -1; + idx.i_position = cluster->GetElementPosition(); + idx.i_time = -1; + idx.b_key = VLC_TRUE; + + i_index++; + if( i_index >= i_index_max ) + { + i_index_max += 1024; + index = (mkv_index_t*)realloc( index, 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 if( MKV_IS_ID( l, KaxTrackFlagLacing ) ) + else { - KaxTrackFlagLacing &lac = *(KaxTrackFlagLacing*)l; - - msg_Dbg( p_demux, "| | | + Track Lacing=%d", uint32( lac ) ); + *p++ = '?'; } - else if( MKV_IS_ID( l, KaxTrackMinCache ) ) + src++; + i_src--; + } + *p++= '\0'; + + return dst; +} + +void chapter_edition_c::RefreshChapters( ) +{ + chapter_item_c::RefreshChapters( b_ordered, -1 ); + b_display_seekpoint = false; +} + +int64_t chapter_item_c::RefreshChapters( bool b_ordered, int64_t i_prev_user_time ) +{ + int64_t i_user_time = i_prev_user_time; + + // first the sub-chapters, and then ourself + std::vector::iterator index = sub_chapters.begin(); + while ( index != sub_chapters.end() ) + { + i_user_time = (*index)->RefreshChapters( b_ordered, i_user_time ); + index++; + } + + if ( b_ordered ) + { + // the ordered chapters always start at zero + if ( i_prev_user_time == -1 ) { - KaxTrackMinCache &cmin = *(KaxTrackMinCache*)l; + if ( i_user_time == -1 ) + i_user_time = 0; + i_prev_user_time = 0; + } - msg_Dbg( p_demux, "| | | + Track MinCache=%d", uint32( cmin ) ); + i_user_start_time = i_prev_user_time; + if ( i_end_time != -1 && i_user_time == i_prev_user_time ) + { + i_user_end_time = i_user_start_time - i_start_time + i_end_time; } - else if( MKV_IS_ID( l, KaxTrackMaxCache ) ) + else { - KaxTrackMaxCache &cmax = *(KaxTrackMaxCache*)l; - - msg_Dbg( p_demux, "| | | + Track MaxCache=%d", uint32( cmax ) ); + i_user_end_time = i_user_time; } - else if( MKV_IS_ID( l, KaxTrackDefaultDuration ) ) + } + else + { + std::sort( sub_chapters.begin(), sub_chapters.end() ); + i_user_start_time = i_start_time; + if ( i_end_time != -1 ) + i_user_end_time = i_end_time; + else if ( i_user_time != -1 ) + i_user_end_time = i_user_time; + else + i_user_end_time = i_user_start_time; + } + + return i_user_end_time; +} + +mtime_t chapter_edition_c::Duration() const +{ + mtime_t i_result = 0; + + if ( sub_chapters.size() ) + { + std::vector::const_iterator index = sub_chapters.end(); + index--; + i_result = (*index)->i_user_end_time; + } + + return i_result; +} + +chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode ) +{ + chapter_item_c *psz_result = NULL; + + 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 ) { - KaxTrackDefaultDuration &defd = *(KaxTrackDefaultDuration*)l; + psz_result = (*index)->FindTimecode( i_user_timecode ); + index++; + } + + if ( psz_result == NULL ) + psz_result = this; + } + + return psz_result; +} + +bool chapter_item_c::ParentOf( const chapter_item_c & item ) const +{ + if ( &item == this ) + return true; + + std::vector::const_iterator index = sub_chapters.begin(); + while ( index != sub_chapters.end() ) + { + if ( (*index)->ParentOf( item ) ) + return true; + index++; + } + + return false; +} + +void demux_sys_t::PreloadFamily( const matroska_segment_c & of_segment ) +{ + for (size_t i=0; iPreloadFamily( of_segment ); + } +} +bool matroska_segment_c::PreloadFamily( const matroska_segment_c & of_segment ) +{ + if ( b_preloaded ) + return false; - tk->i_default_duration = uint64(defd); - msg_Dbg( p_demux, "| | | + Track Default Duration="I64Fd, uint64(defd) ); - } - else if( MKV_IS_ID( l, KaxTrackTimecodeScale ) ) + for (size_t i=0; if_timecodescale = float( ttcs ); - msg_Dbg( p_demux, "| | | + Track TimeCodeScale=%f", tk->f_timecodescale ); + if ( families[i] == of_segment.families[j] ) + return Preload( ); } - else if( MKV_IS_ID( l, KaxTrackName ) ) - { - KaxTrackName &tname = *(KaxTrackName*)l; + } - tk->fmt.psz_description = UTF8ToStr( UTFstring( tname ) ); - msg_Dbg( p_demux, "| | | + Track Name=%s", tk->fmt.psz_description ); - } - else if( MKV_IS_ID( l, KaxTrackLanguage ) ) - { - KaxTrackLanguage &lang = *(KaxTrackLanguage*)l; + return false; +} - tk->fmt.psz_language = strdup( string( lang ).c_str() ); - msg_Dbg( p_demux, - "| | | + Track Language=`%s'", tk->fmt.psz_language ); - } - else if( MKV_IS_ID( l, KaxCodecID ) ) - { - KaxCodecID &codecid = *(KaxCodecID*)l; +// preload all the linked segments for all preloaded segments +void demux_sys_t::PreloadLinked( matroska_segment_c *p_segment ) +{ + size_t i_preloaded, i, j; + virtual_segment_c *p_seg; - tk->psz_codec = strdup( string( codecid ).c_str() ); - msg_Dbg( p_demux, "| | | + Track CodecId=%s", string( codecid ).c_str() ); - } - else if( MKV_IS_ID( l, KaxCodecPrivate ) ) - { - KaxCodecPrivate &cpriv = *(KaxCodecPrivate*)l; + p_current_segment = VirtualFromSegments( p_segment ); + + used_segments.push_back( p_current_segment ); - tk->i_extra_data = cpriv.GetSize(); - if( tk->i_extra_data > 0 ) + // create all the other virtual segments of the family + do { + i_preloaded = 0; + for ( i=0; i< opened_segments.size(); i++ ) + { + if ( opened_segments[i]->b_preloaded && !IsUsedSegment( *opened_segments[i] ) ) { - tk->p_extra_data = (uint8_t*)malloc( tk->i_extra_data ); - memcpy( tk->p_extra_data, cpriv.GetBuffer(), tk->i_extra_data ); + p_seg = VirtualFromSegments( opened_segments[i] ); + used_segments.push_back( p_seg ); + i_preloaded++; } - msg_Dbg( p_demux, "| | | + Track CodecPrivate size="I64Fd, cpriv.GetSize() ); } - else if( MKV_IS_ID( l, KaxCodecName ) ) - { - KaxCodecName &cname = *(KaxCodecName*)l; + } while ( i_preloaded ); // worst case: will stop when all segments are found as family related - tk->psz_codec_name = UTF8ToStr( UTFstring( cname ) ); - msg_Dbg( p_demux, "| | | + Track Codec Name=%s", tk->psz_codec_name ); - } - else if( MKV_IS_ID( l, KaxContentEncodings ) ) + // publish all editions of all usable segment + for ( i=0; i< used_segments.size(); i++ ) + { + p_seg = used_segments[i]; + if ( p_seg->p_editions != NULL ) { - EbmlMaster *cencs = static_cast(l); - MkvTree( p_demux, 3, "Content Encodings" ); - for( unsigned int i = 0; i < cencs->ListSize(); i++ ) - { - EbmlElement *l2 = (*cencs)[i]; - if( MKV_IS_ID( l2, KaxContentEncoding ) ) - { - MkvTree( p_demux, 4, "Content Encoding" ); - EbmlMaster *cenc = static_cast(l2); - for( unsigned int i = 0; i < cenc->ListSize(); i++ ) - { - EbmlElement *l3 = (*cenc)[i]; - if( MKV_IS_ID( l3, KaxContentEncodingOrder ) ) - { - KaxContentEncodingOrder &encord = *(KaxContentEncodingOrder*)l3; - MkvTree( p_demux, 5, "Order: %i", uint32( encord ) ); - } - else if( MKV_IS_ID( l3, KaxContentEncodingScope ) ) - { - KaxContentEncodingScope &encscope = *(KaxContentEncodingScope*)l3; - MkvTree( p_demux, 5, "Scope: %i", uint32( encscope ) ); - } - else if( MKV_IS_ID( l3, KaxContentEncodingType ) ) - { - KaxContentEncodingType &enctype = *(KaxContentEncodingType*)l3; - MkvTree( p_demux, 5, "Type: %i", uint32( enctype ) ); - } - else if( MKV_IS_ID( l3, KaxContentCompression ) ) - { - EbmlMaster *compr = static_cast(l3); - MkvTree( p_demux, 5, "Content Compression" ); - for( unsigned int i = 0; i < compr->ListSize(); i++ ) - { - EbmlElement *l4 = (*compr)[i]; - if( MKV_IS_ID( l4, KaxContentCompAlgo ) ) - { - KaxContentCompAlgo &compalg = *(KaxContentCompAlgo*)l4; - MkvTree( p_demux, 6, "Compression Algorithm: %i", uint32(compalg) ); - if( uint32( compalg ) == 0 ) - { - tk->i_compression_type = MATROSKA_COMPRESSION_ZLIB; - } - } - else - { - MkvTree( p_demux, 6, "Unknown (%s)", typeid(*l4).name() ); - } - } - } + std::string sz_name; + input_title_t *p_title = vlc_input_title_New(); + p_seg->i_sys_title = i; + int i_chapters; - else - { - MkvTree( p_demux, 5, "Unknown (%s)", typeid(*l3).name() ); - } - } - - } - else + // TODO use a name for each edition, let the TITLE deal with a codec name + for ( j=0; jp_editions->size(); j++ ) + { + if ( p_title->psz_name == NULL ) { - MkvTree( p_demux, 4, "Unknown (%s)", typeid(*l2).name() ); + sz_name = (*p_seg->p_editions)[j]->GetMainName(); + if ( sz_name != "" ) + p_title->psz_name = strdup( sz_name.c_str() ); } + + chapter_edition_c *p_edition = (*p_seg->p_editions)[j]; + + i_chapters = 0; + p_edition->PublishChapters( *p_title, i_chapters, 0 ); } - + + // create a name if there is none + if ( p_title->psz_name == NULL ) + { + sz_name = N_("Segment "); + char psz_str[6]; + sprintf( psz_str, "%d", i ); + sz_name += psz_str; + p_title->psz_name = strdup( sz_name.c_str() ); + } + + titles.push_back( *p_title ); } -// else if( EbmlId( *l ) == KaxCodecSettings::ClassInfos.GlobalId ) -// { -// KaxCodecSettings &cset = *(KaxCodecSettings*)l; + } -// tk->psz_codec_settings = UTF8ToStr( UTFstring( cset ) ); -// msg_Dbg( p_demux, "| | | + Track Codec Settings=%s", tk->psz_codec_settings ); -// } -// else if( EbmlId( *l ) == KaxCodecInfoURL::ClassInfos.GlobalId ) -// { -// KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)l; + // TODO decide which segment should be first used (VMG for DVD) +} -// tk->psz_codec_info_url = strdup( string( ciurl ).c_str() ); -// msg_Dbg( p_demux, "| | | + Track Codec Info URL=%s", tk->psz_codec_info_url ); -// } -// else if( EbmlId( *l ) == KaxCodecDownloadURL::ClassInfos.GlobalId ) -// { -// KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)l; +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 ) ) + return true; + } + return false; +} -// tk->psz_codec_download_url = strdup( string( cdurl ).c_str() ); -// msg_Dbg( p_demux, "| | | + Track Codec Info URL=%s", tk->psz_codec_download_url ); -// } -// else if( EbmlId( *l ) == KaxCodecDecodeAll::ClassInfos.GlobalId ) -// { -// KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)l; +virtual_segment_c *demux_sys_t::VirtualFromSegments( matroska_segment_c *p_segment ) const +{ + size_t i_preloaded, i; -// msg_Dbg( p_demux, "| | | + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) ); -// } -// else if( EbmlId( *l ) == KaxTrackOverlay::ClassInfos.GlobalId ) -// { -// KaxTrackOverlay &tovr = *(KaxTrackOverlay*)l; + virtual_segment_c *p_result = new virtual_segment_c( p_segment ); -// msg_Dbg( p_demux, "| | | + Track Overlay=%u <== UNUSED", uint32( tovr ) ); -// } - else if( MKV_IS_ID( l, KaxTrackVideo ) ) + // fill our current virtual segment with all hard linked segments + do { + i_preloaded = 0; + for ( i=0; i< opened_segments.size(); i++ ) { - EbmlMaster *tkv = static_cast(l); - unsigned int j; + i_preloaded += p_result->AddSegment( opened_segments[i] ); + } + } while ( i_preloaded ); // worst case: will stop when all segments are found as linked - msg_Dbg( p_demux, "| | | + Track Video" ); - tk->f_fps = 0.0; + p_result->Sort( ); - for( j = 0; j < tkv->ListSize(); j++ ) - { - EbmlElement *l = (*tkv)[j]; -// if( EbmlId( *el4 ) == KaxVideoFlagInterlaced::ClassInfos.GlobalId ) -// { -// KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)el4; + p_result->PreloadLinked( ); -// msg_Dbg( p_demux, "| | | | + Track Video Interlaced=%u", uint8( fint ) ); -// } -// else if( EbmlId( *el4 ) == KaxVideoStereoMode::ClassInfos.GlobalId ) -// { -// KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)el4; + p_result->PrepareChapters( ); -// msg_Dbg( p_demux, "| | | | + Track Video Stereo Mode=%u", uint8( stereo ) ); -// } -// else - if( MKV_IS_ID( l, KaxVideoPixelWidth ) ) - { - KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)l; + return p_result; +} - tk->fmt.video.i_width = uint16( vwidth ); - msg_Dbg( p_demux, "| | | | + width=%d", uint16( vwidth ) ); - } - else if( MKV_IS_ID( l, KaxVideoPixelHeight ) ) - { - KaxVideoPixelWidth &vheight = *(KaxVideoPixelWidth*)l; +bool demux_sys_t::PreparePlayback( virtual_segment_c *p_new_segment ) +{ + if ( p_new_segment != NULL && p_new_segment != p_current_segment ) + { + if ( p_current_segment != NULL && p_current_segment->Segment() != NULL ) + p_current_segment->Segment()->UnSelect(); - tk->fmt.video.i_height = uint16( vheight ); - msg_Dbg( p_demux, "| | | | + height=%d", uint16( vheight ) ); - } - else if( MKV_IS_ID( l, KaxVideoDisplayWidth ) ) - { - KaxVideoDisplayWidth &vwidth = *(KaxVideoDisplayWidth*)l; + p_current_segment = p_new_segment; + i_current_title = p_new_segment->i_sys_title; + } - tk->fmt.video.i_visible_width = uint16( vwidth ); - msg_Dbg( p_demux, "| | | | + display width=%d", uint16( vwidth ) ); - } - else if( MKV_IS_ID( l, KaxVideoDisplayHeight ) ) - { - KaxVideoDisplayWidth &vheight = *(KaxVideoDisplayWidth*)l; + p_current_segment->LoadCues(); + f_duration = p_current_segment->Duration(); - tk->fmt.video.i_visible_height = uint16( vheight ); - msg_Dbg( p_demux, "| | | | + display height=%d", uint16( vheight ) ); - } - else if( MKV_IS_ID( l, KaxVideoFrameRate ) ) - { - KaxVideoFrameRate &vfps = *(KaxVideoFrameRate*)l; + /* add information */ + p_current_segment->Segment()->InformationCreate( ); - tk->f_fps = float( vfps ); - msg_Dbg( p_demux, " | | | + fps=%f", float( vfps ) ); - } -// else if( EbmlId( *l ) == KaxVideoDisplayUnit::ClassInfos.GlobalId ) -// { -// KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l; + p_current_segment->Segment()->Select( 0 ); -// msg_Dbg( p_demux, "| | | | + Track Video Display Unit=%s", -// uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) ); -// } -// else if( EbmlId( *l ) == KaxVideoAspectRatio::ClassInfos.GlobalId ) -// { -// KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)l; + return true; +} -// msg_Dbg( p_demux, " | | | + Track Video Aspect Ratio Type=%u", uint8( ratio ) ); -// } -// else if( EbmlId( *l ) == KaxVideoGamma::ClassInfos.GlobalId ) -// { -// KaxVideoGamma &gamma = *(KaxVideoGamma*)l; +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 ) + return true; -// msg_Dbg( p_demux, " | | | + fps=%f", float( gamma ) ); -// } - else - { - msg_Dbg( p_demux, "| | | | + Unknown (%s)", typeid(*l).name() ); - } - } - if ( tk->fmt.video.i_visible_height && tk->fmt.video.i_visible_width ) - tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * tk->fmt.video.i_visible_width / tk->fmt.video.i_visible_height; + p_itema = (EbmlBinary *)(&p_item_a->next_segment_uid); + if ( *p_itema == p_item_b->segment_uid ) + return true; + + if ( *p_itema == p_item_b->prev_segment_uid ) + return true; + + return false; +} + +bool matroska_segment_c::Preload( ) +{ + if ( b_preloaded ) + return false; + + EbmlElement *el = NULL; + + ep->Reset( &sys.demuxer ); + + while( ( el = ep->Get() ) != NULL ) + { + if( MKV_IS_ID( el, KaxInfo ) ) + { + ParseInfo( static_cast( el ) ); } - else if( MKV_IS_ID( l, KaxTrackAudio ) ) + else if( MKV_IS_ID( el, KaxTracks ) ) { - EbmlMaster *tka = static_cast(l); - unsigned int j; + ParseTracks( static_cast( el ) ); + } + else if( MKV_IS_ID( el, KaxSeekHead ) ) + { + ParseSeekHead( static_cast( el ) ); + } + else if( MKV_IS_ID( el, KaxCues ) ) + { + msg_Dbg( &sys.demuxer, "| + Cues" ); + } + else if( MKV_IS_ID( el, KaxCluster ) ) + { + msg_Dbg( &sys.demuxer, "| + Cluster" ); - msg_Dbg( p_demux, "| | | + Track Audio" ); + cluster = (KaxCluster*)el; - for( j = 0; j < tka->ListSize(); j++ ) - { - EbmlElement *l = (*tka)[j]; + i_start_pos = cluster->GetElementPosition(); + ParseCluster( ); - if( MKV_IS_ID( l, KaxAudioSamplingFreq ) ) - { - KaxAudioSamplingFreq &afreq = *(KaxAudioSamplingFreq*)l; + ep->Down(); + /* stop parsing the stream */ + break; + } + else if( MKV_IS_ID( el, KaxAttachments ) ) + { + msg_Dbg( &sys.demuxer, "| + Attachments FIXME (but probably never supported)" ); + } + else if( MKV_IS_ID( el, KaxChapters ) ) + { + msg_Dbg( &sys.demuxer, "| + Chapters" ); + ParseChapters( static_cast( el ) ); + } + else if( MKV_IS_ID( el, KaxTag ) ) + { + msg_Dbg( &sys.demuxer, "| + Tags FIXME TODO" ); + } + else + { + msg_Dbg( &sys.demuxer, "| + Unknown (%s)", typeid(*el).name() ); + } + } - tk->fmt.audio.i_rate = (int)float( afreq ); - msg_Dbg( p_demux, "| | | | + afreq=%d", tk->fmt.audio.i_rate ); - } - else if( MKV_IS_ID( l, KaxAudioChannels ) ) - { - KaxAudioChannels &achan = *(KaxAudioChannels*)l; + b_preloaded = true; - tk->fmt.audio.i_channels = uint8( achan ); - msg_Dbg( p_demux, "| | | | + achan=%u", uint8( achan ) ); - } - else if( MKV_IS_ID( l, KaxAudioBitDepth ) ) - { - KaxAudioBitDepth &abits = *(KaxAudioBitDepth*)l; + return true; +} - tk->fmt.audio.i_bitspersample = uint8( abits ); - msg_Dbg( p_demux, "| | | | + abits=%u", uint8( abits ) ); - } - else - { - msg_Dbg( p_demux, "| | | | + Unknown (%s)", typeid(*l).name() ); - } - } +matroska_segment_c *demux_sys_t::FindSegment( const EbmlBinary & uid ) const +{ + for (size_t i=0; isegment_uid == uid ) + return opened_segments[i]; + } + return NULL; +} + +chapter_item_c *demux_sys_t::BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, + size_t i_cookie_size, + virtual_segment_c * &p_segment_found ) +{ + chapter_item_c *p_result = NULL; + for (size_t i=0; iBrowseCodecPrivate( codec_id, match, p_cookie, i_cookie_size ); + if ( p_result != NULL ) + { + p_segment_found = used_segments[i]; + break; } - else + } + return p_result; +} + +chapter_item_c *demux_sys_t::FindChapter( int64_t i_find_uid, virtual_segment_c * & p_segment_found ) +{ + chapter_item_c *p_result = NULL; + for (size_t i=0; iFindChapter( i_find_uid ); + if ( p_result != NULL ) { - msg_Dbg( p_demux, "| | | + Unknown (%s)", - typeid(*l).name() ); + p_segment_found = used_segments[i]; + break; } } + return p_result; } -static void ParseTracks( demux_t *p_demux, EbmlElement *tracks ) +void virtual_segment_c::Sort() { - demux_sys_t *p_sys = p_demux->p_sys; - EbmlElement *el; - EbmlMaster *m; - unsigned int i; - int i_upper_level = 0; + // keep the current segment index + matroska_segment_c *p_segment = linked_segments[i_current_segment]; - msg_Dbg( p_demux, "| + Tracks" ); + std::sort( linked_segments.begin(), linked_segments.end(), matroska_segment_c::CompareSegmentUIDs ); - /* Master elements */ - m = static_cast(tracks); - m->Read( *p_sys->es, tracks->Generic().Context, i_upper_level, el, true ); + for ( i_current_segment=0; i_current_segmentListSize(); i++ ) +size_t virtual_segment_c::AddSegment( matroska_segment_c *p_segment ) +{ + size_t i; + // check if it's not already in here + for ( i=0; isegment_uid == linked_segments[i]->segment_uid ) + return 0; + } - if( MKV_IS_ID( l, KaxTrackEntry ) ) - { - ParseTrackEntry( p_demux, static_cast(l) ); - } - else + // 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] ) { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid(*l).name() ); + linked_segments.push_back( p_segment ); + + AppendUID( p_segment->prev_segment_uid ); + AppendUID( p_segment->next_segment_uid ); + + return 1; } } + return 0; } -/***************************************************************************** - * ParseInfo: - *****************************************************************************/ -static void ParseInfo( demux_t *p_demux, EbmlElement *info ) +void virtual_segment_c::PreloadLinked( ) { - demux_sys_t *p_sys = p_demux->p_sys; - EbmlElement *el; - EbmlMaster *m; - unsigned int i; - int i_upper_level = 0; - - msg_Dbg( p_demux, "| + Information" ); + for ( size_t i=0; iPreload( ); + } + i_current_edition = linked_segments[0]->i_default_edition; +} - /* Master elements */ - m = static_cast(info); - m->Read( *p_sys->es, info->Generic().Context, i_upper_level, el, true ); +mtime_t virtual_segment_c::Duration() const +{ + mtime_t i_duration; + if ( linked_segments.size() == 0 ) + i_duration = 0; + else { + matroska_segment_c *p_last_segment = linked_segments[linked_segments.size()-1]; +// p_last_segment->ParseCluster( ); + + i_duration = p_last_segment->i_start_time / 1000 + p_last_segment->i_duration; + } + return i_duration; +} - for( i = 0; i < m->ListSize(); i++ ) +void virtual_segment_c::LoadCues( ) +{ + for ( size_t i=0; isegment_uid = *(new KaxSegmentUID(*static_cast(l))); + linked_segments[i]->LoadCues(); + } +} - msg_Dbg( p_demux, "| | + UID=%d", *(uint32*)p_sys->segment_uid.GetBuffer() ); - } - else if( MKV_IS_ID( l, KaxTimecodeScale ) ) - { - KaxTimecodeScale &tcs = *(KaxTimecodeScale*)l; +void virtual_segment_c::AppendUID( const EbmlBinary & UID ) +{ + if ( UID.GetBuffer() == NULL ) + return; - p_sys->i_timescale = uint64(tcs); + for (size_t i=0; if_duration ); + for( ; i_idx < i_index; i_idx++ ) + { + if( index[i_idx].i_time + i_time_offset > i_date ) + { + break; + } } - else if( MKV_IS_ID( l, KaxMuxingApp ) ) + + if( i_idx > 0 ) { - KaxMuxingApp &mapp = *(KaxMuxingApp*)l; + i_idx--; + } - p_sys->psz_muxing_application = UTF8ToStr( UTFstring( mapp ) ); + i_seek_position = index[i_idx].i_position; + i_seek_time = index[i_idx].i_time; + } - msg_Dbg( p_demux, "| | + Muxing Application=%s", - p_sys->psz_muxing_application ); - } - else if( MKV_IS_ID( l, KaxWritingApp ) ) - { - KaxWritingApp &wapp = *(KaxWritingApp*)l; + msg_Dbg( &sys.demuxer, "seek got "I64Fd" (%d%%)", + i_seek_time, (int)( 100 * i_seek_position / stream_Size( sys.demuxer.s ) ) ); - p_sys->psz_writing_application = UTF8ToStr( UTFstring( wapp ) ); + es.I_O().setFilePointer( i_seek_position, seek_beginning ); - msg_Dbg( p_demux, "| | + Writing Application=%s", - p_sys->psz_writing_application ); - } - else if( MKV_IS_ID( l, KaxSegmentFilename ) ) - { - KaxSegmentFilename &sfn = *(KaxSegmentFilename*)l; + delete ep; + ep = new EbmlParser( &es, segment, &sys.demuxer ); + cluster = NULL; - p_sys->psz_segment_filename = UTF8ToStr( UTFstring( sfn ) ); + sys.i_start_pts = i_date; - msg_Dbg( p_demux, "| | + Segment Filename=%s", - p_sys->psz_segment_filename ); - } - else if( MKV_IS_ID( l, KaxTitle ) ) + es_out_Control( sys.demuxer.out, ES_OUT_RESET_PCR ); + + /* now parse until key frame */ + i_track_skipping = 0; + for( i_track = 0; i_track < tracks.size(); i_track++ ) + { + if( tracks[i_track]->fmt.i_cat == VIDEO_ES ) { - KaxTitle &title = *(KaxTitle*)l; + tracks[i_track]->b_search_keyframe = VLC_TRUE; + i_track_skipping++; + } + es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, tracks[i_track]->p_es, i_date ); + } - p_sys->psz_title = UTF8ToStr( UTFstring( title ) ); - msg_Dbg( p_demux, "| | + Title=%s", p_sys->psz_title ); - } - if( MKV_IS_ID( l, KaxSegmentFamily ) ) + while( i_track_skipping > 0 ) + { + if( BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) { - KaxSegmentFamily *uid = static_cast(l); - - p_sys->families.push_back(*uid); + msg_Warn( &sys.demuxer, "cannot get block EOF?" ); - msg_Dbg( p_demux, "| | + family=%d", *(uint32*)uid->GetBuffer() ); + return; } -#if defined( HAVE_GMTIME_R ) && !defined( SYS_DARWIN ) - else if( MKV_IS_ID( l, KaxDateUTC ) ) - { - KaxDateUTC &date = *(KaxDateUTC*)l; - time_t i_date; - struct tm tmres; - char buffer[256]; - i_date = date.GetEpochDate(); - memset( buffer, 0, 256 ); - if( gmtime_r( &i_date, &tmres ) && - asctime_r( &tmres, buffer ) ) + for( i_track = 0; i_track < tracks.size(); i_track++ ) + { + if( tracks[i_track]->i_number == block->TrackNum() ) { - buffer[strlen( buffer)-1]= '\0'; - p_sys->psz_date_utc = strdup( buffer ); - msg_Dbg( p_demux, "| | + Date=%s", p_sys->psz_date_utc ); + break; } } -#endif - else + + sys.i_pts = sys.i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000; + + if( i_track < tracks.size() ) { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid(*l).name() ); + if( sys.i_pts >= sys.i_start_pts ) + { + BlockDecode( &sys.demuxer, block, sys.i_pts, 0 ); + 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 ) + { + 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 ); + } + } } - } - p_sys->f_duration *= p_sys->i_timescale / 1000000.0; + delete block; + } } - -/***************************************************************************** - * ParseChapterAtom - *****************************************************************************/ -static void ParseChapterAtom( demux_t *p_demux, int i_level, EbmlMaster *ca, chapter_item_t & chapters ) +void virtual_segment_c::Seek( demux_t & demuxer, mtime_t i_date, mtime_t i_time_offset, chapter_item_c *psz_chapter ) { - demux_sys_t *p_sys = p_demux->p_sys; - unsigned int i; - - if( p_sys->title == NULL ) - { - p_sys->title = vlc_input_title_New(); - } + demux_sys_t *p_sys = demuxer.p_sys; + size_t i; - msg_Dbg( p_demux, "| | | + ChapterAtom (level=%d)", i_level ); - for( i = 0; i < ca->ListSize(); i++ ) + // find the actual time for an ordered edition + if ( psz_chapter == NULL ) { - EbmlElement *l = (*ca)[i]; - - if( MKV_IS_ID( l, KaxChapterUID ) ) + if ( Edition() && Edition()->b_ordered ) { - chapters.i_uid = uint64_t(*(KaxChapterUID*)l); - msg_Dbg( p_demux, "| | | | + ChapterUID: %lld", chapters.i_uid ); + /* 1st, we need to know in which chapter we are */ + psz_chapter = (*p_editions)[i_current_edition]->FindTimecode( i_date ); } - else if( MKV_IS_ID( l, KaxChapterFlagHidden ) ) - { - KaxChapterFlagHidden &flag =*(KaxChapterFlagHidden*)l; - chapters.b_display_seekpoint = uint8( flag ) == 0; + } - msg_Dbg( p_demux, "| | | | + ChapterFlagHidden: %s", chapters.b_display_seekpoint ? "no":"yes" ); - } - else if( MKV_IS_ID( l, KaxChapterTimeStart ) ) + if ( psz_chapter != NULL ) + { + psz_current_chapter = psz_chapter; + p_sys->i_chapter_time = i_time_offset = psz_chapter->i_user_start_time - psz_chapter->i_start_time; + if ( psz_chapter->i_seekpoint_num > 0 ) { - KaxChapterTimeStart &start =*(KaxChapterTimeStart*)l; - chapters.i_start_time = uint64( start ) / I64C(1000); - - msg_Dbg( p_demux, "| | | | + ChapterTimeStart: %lld", chapters.i_start_time ); + demuxer.info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT; + demuxer.info.i_title = p_sys->i_current_title = i_sys_title; + demuxer.info.i_seekpoint = psz_chapter->i_seekpoint_num - 1; } - else if( MKV_IS_ID( l, KaxChapterTimeEnd ) ) - { - KaxChapterTimeEnd &end =*(KaxChapterTimeEnd*)l; - chapters.i_end_time = uint64( end ) / I64C(1000); + } - msg_Dbg( p_demux, "| | | | + ChapterTimeEnd: %lld", chapters.i_end_time ); - } - else if( MKV_IS_ID( l, KaxChapterDisplay ) ) - { - EbmlMaster *cd = static_cast(l); - unsigned int j; + // find the best matching segment + for ( i=0; ii_start_time ) + break; + } - msg_Dbg( p_demux, "| | | | + ChapterDisplay" ); - for( j = 0; j < cd->ListSize(); j++ ) - { - EbmlElement *l= (*cd)[j]; + if ( i > 0 ) + i--; - if( MKV_IS_ID( l, KaxChapterString ) ) - { - int k; + if ( i_current_segment != i ) + { + linked_segments[i_current_segment]->UnSelect(); + linked_segments[i]->Select( i_date ); + i_current_segment = i; + } - KaxChapterString &name =*(KaxChapterString*)l; - for (k = 0; k < i_level; k++) - chapters.psz_name += '+'; - chapters.psz_name += ' '; - chapters.psz_name += UTF8ToStr( UTFstring( name ) ); + linked_segments[i]->Seek( i_date, i_time_offset ); +} - msg_Dbg( p_demux, "| | | | | + ChapterString '%s'", UTF8ToStr(UTFstring(name)) ); - } - else if( MKV_IS_ID( l, KaxChapterLanguage ) ) - { - KaxChapterLanguage &lang =*(KaxChapterLanguage*)l; - const char *psz = string( lang ).c_str(); +void chapter_codec_cmds_c::AddCommand( const KaxChapterProcessCommand & command ) +{ + size_t i; - msg_Dbg( p_demux, "| | | | | + ChapterLanguage '%s'", psz ); - } - else if( MKV_IS_ID( l, KaxChapterCountry ) ) - { - KaxChapterCountry &ct =*(KaxChapterCountry*)l; - const char *psz = string( ct ).c_str(); + uint32 codec_time = uint32(-1); + for( i = 0; i < command.ListSize(); i++ ) + { + const EbmlElement *k = command[i]; - msg_Dbg( p_demux, "| | | | | + ChapterCountry '%s'", psz ); - } - } - } - else if( MKV_IS_ID( l, KaxChapterAtom ) ) + if( MKV_IS_ID( k, KaxChapterProcessTime ) ) { - chapter_item_t new_sub_chapter; - ParseChapterAtom( p_demux, i_level+1, static_cast(l), new_sub_chapter ); - new_sub_chapter.psz_parent = &chapters; - chapters.sub_chapters.push_back( new_sub_chapter ); + codec_time = uint32( *static_cast( k ) ); + break; } } -} - -/***************************************************************************** - * ParseChapters: - *****************************************************************************/ -static void ParseChapters( demux_t *p_demux, EbmlElement *chapters ) -{ - demux_sys_t *p_sys = p_demux->p_sys; - EbmlElement *el; - EbmlMaster *m; - unsigned int i; - int i_upper_level = 0; - int i_default_edition = 0; - float f_duration; - - /* Master elements */ - m = static_cast(chapters); - m->Read( *p_sys->es, chapters->Generic().Context, i_upper_level, el, true ); - for( i = 0; i < m->ListSize(); i++ ) + for( i = 0; i < command.ListSize(); i++ ) { - EbmlElement *l = (*m)[i]; + const EbmlElement *k = command[i]; - if( MKV_IS_ID( l, KaxEditionEntry ) ) + if( MKV_IS_ID( k, KaxChapterProcessData ) ) { - chapter_edition_t edition; - - EbmlMaster *E = static_cast(l ); - unsigned int j; - msg_Dbg( p_demux, "| | + EditionEntry" ); - for( j = 0; j < E->ListSize(); j++ ) + KaxChapterProcessData *p_data = new KaxChapterProcessData( *static_cast( k ) ); + switch ( codec_time ) { - EbmlElement *l = (*E)[j]; - - if( MKV_IS_ID( l, KaxChapterAtom ) ) - { - chapter_item_t new_sub_chapter; - ParseChapterAtom( p_demux, 0, static_cast(l), new_sub_chapter ); - edition.chapters.push_back( new_sub_chapter ); - } - else if( MKV_IS_ID( l, KaxEditionUID ) ) - { - edition.i_uid = uint64(*static_cast( l )); - } - else if( MKV_IS_ID( l, KaxEditionFlagOrdered ) ) - { - edition.b_ordered = uint8(*static_cast( l )) != 0; - } - else if( MKV_IS_ID( l, KaxEditionFlagDefault ) ) - { - if (uint8(*static_cast( l )) != 0) - i_default_edition = p_sys->editions.size(); - } - else - { - msg_Dbg( p_demux, "| | | + Unknown (%s)", typeid(*l).name() ); - } - } - p_sys->editions.push_back( edition ); - } - else - { - msg_Dbg( p_demux, "| | + Unknown (%s)", typeid(*l).name() ); + case 0: + during_cmds.push_back( *p_data ); + break; + case 1: + enter_cmds.push_back( *p_data ); + break; + case 2: + leave_cmds.push_back( *p_data ); + break; + default: + delete p_data; + } } } +} - for( i = 0; i < p_sys->editions.size(); i++ ) +bool chapter_item_c::Enter( bool b_do_subs ) +{ + bool f_result = false; + std::vector::iterator index = codecs.begin(); + while ( index != codecs.end() ) { - p_sys->editions[i].RefreshChapters( *p_sys->title ); + f_result |= (*index)->Enter(); + index++; } - - p_sys->i_current_edition = i_default_edition; - - if ( p_sys->editions[i_default_edition].b_ordered ) + + if ( b_do_subs ) { - /* update the duration of the segment according to the sum of all sub chapters */ - f_duration = p_sys->editions[i_default_edition].Duration() / I64C(1000); - if (f_duration > 0.0) - p_sys->f_duration = f_duration; + // sub chapters + std::vector::iterator index_ = sub_chapters.begin(); + while ( index_ != sub_chapters.end() ) + { + f_result |= (*index_)->Enter( true ); + index_++; + } } + return f_result; } -/***************************************************************************** - * InformationCreate: - *****************************************************************************/ -static void InformationCreate( demux_t *p_demux ) +bool chapter_item_c::Leave( bool b_do_subs ) { - demux_sys_t *p_sys = p_demux->p_sys; - int i_track; - - p_sys->meta = vlc_meta_New(); + bool f_result = false; + b_is_leaving = true; + std::vector::iterator index = codecs.begin(); + while ( index != codecs.end() ) + { + f_result |= (*index)->Leave(); + index++; + } - if( p_sys->psz_title ) + if ( b_do_subs ) { - vlc_meta_Add( p_sys->meta, VLC_META_TITLE, p_sys->psz_title ); + // sub chapters + std::vector::iterator index_ = sub_chapters.begin(); + while ( index_ != sub_chapters.end() ) + { + f_result |= (*index_)->Leave( true ); + index_++; + } } - if( p_sys->psz_date_utc ) + b_is_leaving = false; + return f_result; +} + +bool chapter_item_c::EnterAndLeave( chapter_item_c *p_item ) +{ + chapter_item_c *p_common_parent = p_item; + + // leave, up to a common parent + while ( p_common_parent != NULL && !p_common_parent->ParentOf( *this ) ) { - vlc_meta_Add( p_sys->meta, VLC_META_DATE, p_sys->psz_date_utc ); + if ( !p_common_parent->b_is_leaving && p_common_parent->Leave( false ) ) + return true; + p_common_parent = p_common_parent->psz_parent; } - if( p_sys->psz_segment_filename ) + + // enter from the parent to + if ( p_common_parent != NULL ) { - vlc_meta_Add( p_sys->meta, _("Segment filename"), p_sys->psz_segment_filename ); + do + { + if ( p_common_parent == this ) + return Enter( true ); + + for ( size_t i = 0; isub_chapters.size(); i++ ) + { + if ( p_common_parent->sub_chapters[i]->ParentOf( *this ) ) + { + p_common_parent = p_common_parent->sub_chapters[i]; + if ( p_common_parent != this ) + if ( p_common_parent->Enter( false ) ) + return true; + + break; + } + } + } while ( 1 ); } - if( p_sys->psz_muxing_application ) + + return Enter( true ); +} + +bool dvd_chapter_codec_c::Enter() +{ + bool f_result = false; + std::vector::iterator index = enter_cmds.begin(); + while ( index != enter_cmds.end() ) { - vlc_meta_Add( p_sys->meta, _("Muxing application"), p_sys->psz_muxing_application ); + if ( (*index).GetSize() ) + { + 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 ); + for ( ; i_size > 0; i_size--, p_data += 8 ) + { + msg_Dbg( &sys.demuxer, "Matroska DVD enter command" ); + f_result |= sys.dvd_interpretor.Interpret( p_data ); + } + } + index++; } - if( p_sys->psz_writing_application ) + return f_result; +} + +bool dvd_chapter_codec_c::Leave() +{ + bool f_result = false; + std::vector::iterator index = leave_cmds.begin(); + while ( index != leave_cmds.end() ) { - vlc_meta_Add( p_sys->meta, _("Writing application"), p_sys->psz_writing_application ); + if ( (*index).GetSize() ) + { + 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 ); + for ( ; i_size > 0; i_size--, p_data += 8 ) + { + msg_Dbg( &sys.demuxer, "Matroska DVD leave command" ); + f_result |= sys.dvd_interpretor.Interpret( p_data ); + } + } + index++; } + return f_result; +} + +// see http://www.dvd-replica.com/DVD/vmcmdset.php for a description of DVD commands +bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_size ) +{ + if ( i_size != 8 ) + return false; - for( i_track = 0; i_track < p_sys->i_track; i_track++ ) + virtual_segment_c *p_segment; + chapter_item_c *p_chapter; + 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 ) { - mkv_track_t *tk = &p_sys->track[i_track]; - vlc_meta_t *mtk = vlc_meta_New(); + bool b_test_positive = (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; - p_sys->meta->track = (vlc_meta_t**)realloc( p_sys->meta->track, - sizeof( vlc_meta_t * ) * ( p_sys->meta->i_track + 1 ) ); - p_sys->meta->track[p_sys->meta->i_track++] = mtk; + if ( b_test_value ) + i_value = ( p_command[4] << 8 ) + p_command[5]; + else + i_value = GetPRM( p_command[7] ); - if( tk->fmt.psz_description ) + 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 )) + { + b_test_positive = !b_test_positive; + } + 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 )) + { + b_test_positive = !b_test_positive; + } + 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 )) + { + b_test_positive = !b_test_positive; + } + 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 )) + { + b_test_positive = !b_test_positive; + } + break; + } + + if ( !b_test_positive ) + return false; + } + + // strip the test command + i_command &= 0xFF0F; + + switch ( i_command ) + { + case CMD_DVD_NOP: + case CMD_DVD_NOP2: { - vlc_meta_Add( p_sys->meta, VLC_META_DESCRIPTION, tk->fmt.psz_description ); + msg_Dbg( &sys.demuxer, "NOP" ); + break; } - if( tk->psz_codec_name ) + case CMD_DVD_BREAK: { - vlc_meta_Add( p_sys->meta, VLC_META_CODEC_NAME, tk->psz_codec_name ); + msg_Dbg( &sys.demuxer, "Break" ); + // TODO + break; } - if( tk->psz_codec_settings ) + case CMD_DVD_JUMP_TT: { - vlc_meta_Add( p_sys->meta, VLC_META_SETTING, tk->psz_codec_settings ); + uint8 i_title = p_command[5]; + msg_Dbg( &sys.demuxer, "JumpTT %d", i_title ); + + // 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 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 ); + + f_result = true; + } + + break; } - if( tk->psz_codec_info_url ) + case CMD_DVD_CALLSS_VTSM1: + { + msg_Dbg( &sys.demuxer, "CallSS VTSM" ); + switch( (p_command[6] & 0xC0) >> 6 ) { + case 0: + switch ( p_command[5] ) + { + case 0x00: + msg_Dbg( &sys.demuxer, "CallSS PGC (rsm_cell %x)", p_command[5]); + break; + case 0x82: + msg_Dbg( &sys.demuxer, "CallSS Title Entry (rsm_cell %x)", p_command[5]); + break; + case 0x83: + msg_Dbg( &sys.demuxer, "CallSS Root Menu (rsm_cell %x)", p_command[5]); + break; + case 0x84: + msg_Dbg( &sys.demuxer, "CallSS Subpicture Menu (rsm_cell %x)", p_command[5]); + break; + case 0x85: + msg_Dbg( &sys.demuxer, "CallSS Audio Menu (rsm_cell %x)", p_command[5]); + break; + case 0x86: + msg_Dbg( &sys.demuxer, "CallSS Angle Menu (rsm_cell %x)", p_command[5]); + break; + case 0x87: + msg_Dbg( &sys.demuxer, "CallSS Chapter Menu (rsm_cell %x)", p_command[5]); + break; + default: + msg_Dbg( &sys.demuxer, "CallSS (rsm_cell %x)", p_command[5]); + break; + } + p_chapter = sys.BrowseCodecPrivate( 1, MatchPgcType, &p_command[5], 1, p_segment ); + 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 ); + f_result = true; + } + break; + case 1: + msg_Dbg( &sys.demuxer, "CallSS VMGM (menu %d, rsm_cell %x)", p_command[6] & 0x0F, p_command[5]); + break; + case 2: + msg_Dbg( &sys.demuxer, "CallSS VTSM (menu %d, rsm_cell %x)", p_command[6] & 0x0F, p_command[5]); + break; + case 3: + msg_Dbg( &sys.demuxer, "CallSS VMGM (pgc %d, rsm_cell %x)", (p_command[3] << 8) + p_command[4], p_command[5]); + break; + } + break; + } + case CMD_DVD_SET_GPRMMD: { - vlc_meta_Add( p_sys->meta, VLC_META_CODEC_DESCRIPTION, tk->psz_codec_info_url ); + msg_Dbg( &sys.demuxer, "Set GPRMMD [%d]=%d", (p_command[4] << 8) + p_command[5], (p_command[2] << 8) + p_command[3]); + + if ( !SetGPRM( (p_command[4] << 8) + p_command[5], (p_command[2] << 8) + p_command[3] ) ) + msg_Dbg( &sys.demuxer, "Set GPRMMD failed" ); + break; } - if( tk->psz_codec_download_url ) + case CMD_DVD_LINKPGCN: { - vlc_meta_Add( p_sys->meta, VLC_META_URL, tk->psz_codec_download_url ); + uint16 i_pgcn = (p_command[6] << 8) + p_command[7]; + + msg_Dbg( &sys.demuxer, "Link PGCN(%d)", i_pgcn ); + 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 ); + f_result = true; + } + break; } - } - - if( p_sys->i_tags_position >= 0 ) - { - vlc_bool_t b_seekable; + case CMD_DVD_LINKCN: + { + uint8 i_cn = p_command[7]; + + p_chapter = sys.p_current_segment->CurrentChapter(); - stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable ); - if( b_seekable ) + msg_Dbg( &sys.demuxer, "LinkCN (cell %d)", i_cn ); + 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 ); + f_result = true; + } + break; + } + case CMD_DVD_GOTO_LINE: { - LoadTags( p_demux ); + msg_Dbg( &sys.demuxer, "GotoLine (%d)", (p_command[6] << 8) + p_command[7] ); + // TODO + break; + } + default: + { + msg_Dbg( &sys.demuxer, "unsupported command : %02X %02X %02X %02X %02X %02X %02X %02X" + ,p_command[0] + ,p_command[1] + ,p_command[2] + ,p_command[3] + ,p_command[4] + ,p_command[5] + ,p_command[6] + ,p_command[7]); + break; } } + + return f_result; } +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 ) + return false; + + if ( data.m_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]; + uint8 i_title = *(uint8*)p_cookie; -/***************************************************************************** - * Divers - *****************************************************************************/ + return (i_gtitle == i_title); +} -static void IndexAppendCluster( demux_t *p_demux, KaxCluster *cluster ) +bool dvd_command_interpretor_c::MatchPgcType( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) { - demux_sys_t *p_sys = p_demux->p_sys; + if ( i_cookie_size != 1 || data.m_private_data.GetSize() < 8 ) + return false; + + if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC ) + return false; -#define idx p_sys->index[p_sys->i_index] - idx.i_track = -1; - idx.i_block_number= -1; - idx.i_position = cluster->GetElementPosition(); - idx.i_time = -1; - idx.b_key = VLC_TRUE; + uint8 i_pgc_type = data.m_private_data.GetBuffer()[3]; + uint8 i_pgc = *(uint8*)p_cookie; - p_sys->i_index++; - if( p_sys->i_index >= p_sys->i_index_max ) - { - p_sys->i_index_max += 1024; - p_sys->index = (mkv_index_t*)realloc( p_sys->index, sizeof( mkv_index_t ) * p_sys->i_index_max ); - } -#undef idx + return (i_pgc_type == i_pgc); } -static char * UTF8ToStr( const UTFstring &u ) +bool dvd_command_interpretor_c::MatchPgcNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) { - int i_src; - const wchar_t *src; - char *dst, *p; - - i_src = u.length(); - src = u.c_str(); + if ( i_cookie_size != 2 || data.m_private_data.GetSize() < 8 ) + return false; + + if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC ) + return false; - p = dst = (char*)malloc( i_src + 1); - while( i_src > 0 ) - { - if( *src < 255 ) - { - *p++ = (char)*src; - } - else - { - *p++ = '?'; - } - src++; - i_src--; - } - *p++= '\0'; + uint16 *i_pgc_n = (uint16 *)p_cookie; + uint16 i_pgc_num = (data.m_private_data.GetBuffer()[1] << 8) + data.m_private_data.GetBuffer()[2]; - return dst; + return (i_pgc_num == *i_pgc_n); } -void chapter_edition_t::RefreshChapters( input_title_t & title ) +bool dvd_command_interpretor_c::MatchCellNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ) { - int64_t i_prev_user_time = 0; - std::vector::iterator index = chapters.begin(); + if ( i_cookie_size != 1 || data.m_private_data.GetSize() < 5 ) + return false; + + if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_CN ) + return false; - while ( index != chapters.end() ) - { - i_prev_user_time = (*index).RefreshChapters( b_ordered, i_prev_user_time, title ); - index++; - } + uint8 *i_cell_n = (uint8 *)p_cookie; + uint8 i_cell_num = data.m_private_data.GetBuffer()[3]; + + return (i_cell_num == *i_cell_n); } -int64_t chapter_item_t::RefreshChapters( bool b_ordered, int64_t i_prev_user_time, input_title_t & title ) +bool matroska_script_codec_c::Enter() { - int64_t i_user_time = i_prev_user_time; - - // first the sub-chapters, and then ourself - std::vector::iterator index = sub_chapters.begin(); - while ( index != sub_chapters.end() ) + bool f_result = false; + std::vector::iterator index = enter_cmds.begin(); + while ( index != enter_cmds.end() ) { - i_user_time = (*index).RefreshChapters( b_ordered, i_user_time, title ); + if ( (*index).GetSize() ) + { + msg_Dbg( &sys.demuxer, "Matroska Script enter command" ); + f_result |= interpretor.Interpret( (*index).GetBuffer(), (*index).GetSize() ); + } index++; } + return f_result; +} - if ( b_ordered ) +bool matroska_script_codec_c::Leave() +{ + bool f_result = false; + std::vector::iterator index = leave_cmds.begin(); + while ( index != leave_cmds.end() ) { - i_user_start_time = i_prev_user_time; - if ( i_end_time != -1 && i_user_time == i_prev_user_time ) - { - i_user_end_time = i_user_start_time - i_start_time + i_end_time; - } - else + if ( (*index).GetSize() ) { - i_user_end_time = i_user_time; + msg_Dbg( &sys.demuxer, "Matroska Script leave command" ); + f_result |= interpretor.Interpret( (*index).GetBuffer(), (*index).GetSize() ); } + index++; } - else - { - std::sort( sub_chapters.begin(), sub_chapters.end() ); - i_user_start_time = i_start_time; - i_user_end_time = i_end_time; - } - - if (b_display_seekpoint) - { - seekpoint_t *sk = vlc_seekpoint_New(); + return f_result; +} -// sk->i_level = i_level; - sk->i_time_offset = i_start_time; - sk->psz_name = strdup( psz_name.c_str() ); +// see http://www.matroska.org/technical/specs/chapters/index.html#mscript +// for a description of existing commands +bool matroska_script_interpretor_c::Interpret( const binary * p_command, size_t i_size ) +{ + bool b_result = false; - // A start time of '0' is ok. A missing ChapterTime element is ok, too, because '0' is its default value. - title.i_seekpoint++; - title.seekpoint = (seekpoint_t**)realloc( title.seekpoint, title.i_seekpoint * sizeof( seekpoint_t* ) ); - title.seekpoint[title.i_seekpoint-1] = sk; - } + char *psz_str = (char*) malloc( i_size + 1 ); + memcpy( psz_str, p_command, i_size ); + psz_str[ i_size ] = '\0'; - i_seekpoint_num = title.i_seekpoint; + std::string sz_command = psz_str; + free( psz_str ); - return i_user_end_time; -} + msg_Dbg( &sys.demuxer, "command : %s", sz_command.c_str() ); -double chapter_edition_t::Duration() const -{ - double f_result = 0.0; - - if ( chapters.size() ) +#if defined(__GNUC__) && (__GNUC__ < 3) + if ( sz_command.compare( CMD_MS_GOTO_AND_PLAY, 0, CMD_MS_GOTO_AND_PLAY.size() ) == 0 ) +#else + if ( sz_command.compare( 0, CMD_MS_GOTO_AND_PLAY.size(), CMD_MS_GOTO_AND_PLAY ) == 0 ) +#endif { - std::vector::const_iterator index = chapters.end(); - index--; - f_result = (*index).i_user_end_time; - } - - return f_result; -} + size_t i,j; -const chapter_item_t *chapter_item_t::FindTimecode( mtime_t i_user_timecode ) const -{ - const chapter_item_t *psz_result = NULL; + // find the ( + for ( i=CMD_MS_GOTO_AND_PLAY.size(); i= i_user_start_time && i_user_timecode < i_user_end_time) - { - std::vector::const_iterator index = sub_chapters.begin(); - while ( index != sub_chapters.end() && psz_result == NULL ) + std::string st = sz_command.substr( i+1, j-i-1 ); + int64_t i_chapter_uid = atoi( st.c_str() ); + + virtual_segment_c *p_segment; + chapter_item_c *p_chapter = sys.FindChapter( i_chapter_uid, p_segment ); + + if ( p_chapter == NULL ) + msg_Dbg( &sys.demuxer, "Chapter "I64Fd" not found", i_chapter_uid); + else { - psz_result = (*index).FindTimecode( i_user_timecode ); - index++; + if ( !p_chapter->EnterAndLeave( sys.p_current_segment->CurrentChapter() ) ) + p_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter ); + b_result = true; } - - if ( psz_result == NULL ) - psz_result = this; } - return psz_result; + return b_result; } -const chapter_item_t *chapter_edition_t::FindTimecode( mtime_t i_user_timecode ) const +void demux_sys_t::SwapButtons() { - const chapter_item_t *psz_result = NULL; +#ifndef WORDS_BIGENDIAN + uint8_t button, i, j; + + for( button = 1; button <= pci_packet.hli.hl_gi.btn_ns; button++) { + btni_t *button_ptr = &(pci_packet.hli.btnit[button-1]); + binary *p_data = (binary*) button_ptr; + + uint16 i_x_start = ((p_data[0] & 0x3F) << 4 ) + ( p_data[1] >> 4 ); + uint16 i_x_end = ((p_data[1] & 0x03) << 8 ) + p_data[2]; + uint16 i_y_start = ((p_data[3] & 0x3F) << 4 ) + ( p_data[4] >> 4 ); + uint16 i_y_end = ((p_data[4] & 0x03) << 8 ) + p_data[5]; + button_ptr->x_start = i_x_start; + button_ptr->x_end = i_x_end; + button_ptr->y_start = i_y_start; + button_ptr->y_end = i_y_end; - std::vector::const_iterator index = chapters.begin(); - while ( index != chapters.end() && psz_result == NULL ) + } + for ( i = 0; i<3; i++ ) { - psz_result = (*index).FindTimecode( i_user_timecode ); - index++; + for ( j = 0; j<2; j++ ) + { + pci_packet.hli.btn_colit.btn_coli[i][j] = U32_AT( &pci_packet.hli.btn_colit.btn_coli[i][j] ); + } } - - return psz_result; +#endif }