/*****************************************************************************
* mkv.cpp : matroska demuxer
*****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
#include "ebml/StdIOCallback.h"
+#if LIBMATROSKA_VERSION < 0x000706
+START_LIBMATROSKA_NAMESPACE
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxMatroska_Context;
+END_LIBMATROSKA_NAMESPACE
+#endif
+
+#include "vlc_keys.h"
+
extern "C" {
#include "mp4/libmp4.h"
}
#define MKVD_TIMECODESCALE 1000000
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#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
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
/**
* What's between a directory and a filename?
*/
static void Close( vlc_object_t * );
vlc_module_begin();
- set_shortname( _("Matroska") );
+ set_shortname( "Matroska" );
set_description( _("Matroska stream demuxer" ) );
set_capability( "demux2", 50 );
set_callbacks( Open, Close );
add_bool( "mkv-use-ordered-chapters", 1, NULL,
N_("Ordered chapters"),
- N_("Play ordered chapters as specified in the segment"), VLC_TRUE );
+ N_("Play ordered chapters as specified in the segment."), VLC_TRUE );
add_bool( "mkv-use-chapter-codec", 1, NULL,
N_("Chapter codecs"),
- N_("Use chapter codecs found in the segment"), VLC_TRUE );
+ N_("Use chapter codecs found in the segment."), VLC_TRUE );
+
+ add_bool( "mkv-preload-local-dir", 1, NULL,
+ N_("Preload Directory"),
+ N_("Preload matroska files from the same family in the same directory (not good for broken files)."), VLC_TRUE );
add_bool( "mkv-seek-percent", 0, NULL,
N_("Seek based on percent not time"),
- N_("Seek based on percent not time"), VLC_TRUE );
+ N_("Seek based on percent not time."), VLC_TRUE );
add_bool( "mkv-use-dummy", 0, NULL,
N_("Dummy Elements"),
- N_("Read and discard unknown EBML elements (not good for broken files)"), VLC_TRUE );
+ N_("Read and discard unknown EBML elements (not good for broken files)."), VLC_TRUE );
add_shortcut( "mka" );
add_shortcut( "mkv" );
private:
stream_t *s;
vlc_bool_t mb_eof;
+ vlc_bool_t b_owner;
public:
- vlc_stream_io_callback( stream_t * );
+ vlc_stream_io_callback( stream_t *, vlc_bool_t );
+
+ virtual ~vlc_stream_io_callback()
+ {
+ if( b_owner )
+ stream_Delete( s );
+ }
virtual uint32 read ( void *p_buffer, size_t i_size);
virtual void setFilePointer ( int64_t i_offset, seek_mode mode = seek_beginning );
void Reset( demux_t *p_demux );
EbmlElement *Get( void );
void Keep( void );
+ EbmlElement *UnGet( uint64 i_block_pos, uint64 i_cluster_pos );
int GetLevel( void );
uint64_t i_default_duration;
float f_timecodescale;
+ mtime_t i_last_dts;
/* video */
es_format_t fmt;
vlc_bool_t b_key;
} mkv_index_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)
+ :p_private_data(NULL)
+ ,i_codec_id( codec_id )
+ ,sys( demuxer )
+ {}
+
+ virtual ~chapter_codec_cmds_c()
+ {
+ delete p_private_data;
+ std::vector<KaxChapterProcessData*>::iterator indexe = enter_cmds.begin();
+ while ( indexe != enter_cmds.end() )
+ {
+ delete (*indexe);
+ indexe++;
+ }
+ std::vector<KaxChapterProcessData*>::iterator indexl = leave_cmds.begin();
+ while ( indexl != leave_cmds.end() )
+ {
+ delete (*indexl);
+ indexl++;
+ }
+ std::vector<KaxChapterProcessData*>::iterator indexd = during_cmds.begin();
+ while ( indexd != during_cmds.end() )
+ {
+ delete (*indexd);
+ indexd++;
+ }
+ }
+
void SetPrivate( const KaxChapterProcessPrivate & private_data )
{
- m_private_data = *( new KaxChapterProcessPrivate( private_data ) );
+ p_private_data = new KaxChapterProcessPrivate( private_data );
}
void AddCommand( const KaxChapterProcessCommand & command );
- virtual bool Enter() { return true; }
- virtual bool Leave() { return true; }
+ /// \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 ""; }
+ virtual int16 GetTitleNumber() { return -1; }
+
+ KaxChapterProcessPrivate *p_private_data;
protected:
- KaxChapterProcessPrivate m_private_data;
+ std::vector<KaxChapterProcessData*> enter_cmds;
+ std::vector<KaxChapterProcessData*> during_cmds;
+ std::vector<KaxChapterProcessData*> leave_cmds;
- std::vector<KaxChapterProcessData> enter_cmds;
- std::vector<KaxChapterProcessData> during_cmds;
- std::vector<KaxChapterProcessData> leave_cmds;
+ int i_codec_id;
+ demux_sys_t & sys;
};
class dvd_command_interpretor_c
{
public:
- dvd_command_interpretor_c()
- {
- memset( p_GPRM, 0, sizeof(p_GPRM) );
- memset( p_SPRM, 0, sizeof(p_SPRM) );
- p_SPRM[ 1 ] = 15;
- p_SPRM[ 2 ] = 62;
- p_SPRM[ 3 ] = 1;
- p_SPRM[ 4 ] = 1;
- p_SPRM[ 7 ] = 1;
- p_SPRM[ 8 ] = 1;
- p_SPRM[ 16 ] = 0xFFFFu;
- p_SPRM[ 18 ] = 0xFFFFu;
+ 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 );
-protected:
+ 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_GPRM[ index ];
+ return p_PRMs[ index ];
else return 0;
}
uint16 GetSPRM( size_t index ) const
{
// 21,22,23 reserved for future use
- if ( index >= 0 && index < 21 )
- return p_SPRM[ index ];
+ 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_GPRM[ index ] = value;
+ p_PRMs[ index ] = value;
return true;
}
return false;
bool SetSPRM( size_t index, uint16 value )
{
- if ( index > 0 && index <= 13 && index != 12 )
+ if ( index > 0x80 && index <= 0x8D && index != 0x8C )
{
- p_SPRM[ index ] = value;
+ p_PRMs[ index ] = value;
return true;
}
return false;
}
- uint16 p_GPRM[16];
- uint16 p_SPRM[24];
+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 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 = (1 << 4);
+ static const uint16 CMD_DVD_IF_GPREG_EQUAL = (2 << 4);
+ static const uint16 CMD_DVD_IF_GPREG_NOT_EQUAL = (3 << 4);
+ static const uint16 CMD_DVD_IF_GPREG_SUP_EQUAL = (4 << 4);
+ static const uint16 CMD_DVD_IF_GPREG_SUP = (5 << 4);
+ static const uint16 CMD_DVD_IF_GPREG_INF_EQUAL = (6 << 4);
+ static const uint16 CMD_DVD_IF_GPREG_INF = (7 << 4);
+
+ static const uint16 CMD_DVD_NOP = 0x0000;
+ static const uint16 CMD_DVD_GOTO_LINE = 0x0001;
+ 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_JUMPVTS_PTT = 0x3005;
+ static const uint16 CMD_DVD_JUMP_SS = 0x3006;
+ static const uint16 CMD_DVD_CALLSS_VTSM1 = 0x3008;
+ //
+ static const uint16 CMD_DVD_SET_HL_BTNN2 = 0x4600;
+ static const uint16 CMD_DVD_SET_HL_BTNN_LINKPGCN1 = 0x4604;
+ static const uint16 CMD_DVD_SET_STREAM = 0x5100;
+ static const uint16 CMD_DVD_SET_GPRMMD = 0x5300;
+ static const uint16 CMD_DVD_SET_HL_BTNN1 = 0x5600;
+ static const uint16 CMD_DVD_SET_HL_BTNN_LINKPGCN2 = 0x5604;
+ 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 MatchIsDomain ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
+ static bool MatchIsVMG ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
+ static bool MatchVTSNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
+ static bool MatchVTSMNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
+ static bool MatchTitleNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
+ static bool MatchPgcType ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
+ static bool MatchPgcNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
+ static bool MatchChapterNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
+ static bool MatchCellNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
};
class dvd_chapter_codec_c : public chapter_codec_cmds_c
{
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;
+ int16 GetTitleNumber();
+};
+
+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:
- dvd_command_interpretor_c interpretor;
+ 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;
+ chapter_translation_c()
+ :p_translated(NULL)
+ {}
+
+ ~chapter_translation_c()
+ {
+ delete p_translated;
+ }
+
+ KaxChapterTranslateID *p_translated;
unsigned int codec_id;
std::vector<uint64_t> editions;
};
,i_user_end_time(-1)
,i_seekpoint_num(-1)
,b_display_seekpoint(true)
+ ,b_user_display(false)
,psz_parent(NULL)
+ ,b_is_leaving(false)
{}
- ~chapter_item_c()
+ virtual ~chapter_item_c()
{
std::vector<chapter_codec_cmds_c*>::iterator index = codecs.begin();
while ( index != codecs.end() )
}
int64_t RefreshChapters( bool b_ordered, int64_t i_prev_user_time );
- void PublishChapters( input_title_t & title, int i_level );
- chapter_item_c * FindTimecode( mtime_t i_timecode );
+ int PublishChapters( input_title_t & title, int & i_user_chapters, int i_level = 0 );
+ virtual chapter_item_c * FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current, bool & b_found );
void Append( const chapter_item_c & edition );
- chapter_item_c * FindChapter( const chapter_item_c & chapter );
+ 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;
+ int16 GetTitleNumber( ) const;
int64_t i_start_time, i_end_time;
int64_t i_user_start_time, i_user_end_time; /* the time in the stream when an edition is ordered */
int i_seekpoint_num;
int64_t i_uid;
bool b_display_seekpoint;
+ bool b_user_display;
std::string psz_name;
chapter_item_c *psz_parent;
+ bool b_is_leaving;
std::vector<chapter_codec_cmds_c*> codecs;
- bool operator<( const chapter_item_c & item ) const
+ static bool CompareTimecode( const chapter_item_c * itemA, const chapter_item_c * itemB )
{
- return ( i_user_start_time < item.i_user_start_time || (i_user_start_time == item.i_user_start_time && i_user_end_time < item.i_user_end_time) );
+ return ( itemA->i_user_start_time < itemB->i_user_start_time || (itemA->i_user_start_time == itemB->i_user_start_time && itemA->i_user_end_time < itemB->i_user_end_time) );
}
- bool Enter();
- bool Leave();
+ bool Enter( bool b_do_subchapters );
+ bool Leave( bool b_do_subchapters );
+ bool EnterAndLeave( chapter_item_c *p_item, bool b_enter = true );
};
class chapter_edition_c : public chapter_item_c
void RefreshChapters( );
mtime_t Duration() const;
- void PublishChapters( input_title_t & title );
+ std::string GetMainName() const;
+ chapter_item_c * FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current );
bool b_ordered;
};
-class demux_sys_t;
-
class matroska_segment_c
{
public:
,i_chapters_position(-1)
,i_tags_position(-1)
,cluster(NULL)
+ ,i_block_pos(0)
+ ,i_cluster_pos(0)
,i_start_pos(0)
+ ,p_segment_uid(NULL)
+ ,p_prev_segment_uid(NULL)
+ ,p_next_segment_uid(NULL)
,b_cues(VLC_FALSE)
,i_index(0)
,i_index_max(1024)
,ep(NULL)
,b_preloaded(false)
{
- index = (mkv_index_t*)malloc( sizeof( mkv_index_t ) * i_index_max );
+ p_indexes = (mkv_index_t*)malloc( sizeof( mkv_index_t ) * i_index_max );
}
virtual ~matroska_segment_c()
{
for( size_t i_track = 0; i_track < tracks.size(); i_track++ )
{
-#define tk tracks[i_track]
- if( tk->fmt.psz_description )
+ if( tracks[i_track]->fmt.psz_description )
{
- free( tk->fmt.psz_description );
+ free( tracks[i_track]->fmt.psz_description );
}
- if( tk->psz_codec )
+ if( tracks[i_track]->psz_codec )
{
- free( tk->psz_codec );
+ free( tracks[i_track]->psz_codec );
}
- if( tk->fmt.psz_language )
+ if( tracks[i_track]->fmt.psz_language )
{
- free( tk->fmt.psz_language );
+ free( tracks[i_track]->fmt.psz_language );
}
- delete tk;
-#undef tk
+ delete tracks[i_track];
}
if( psz_writing_application )
{
free( psz_date_utc );
}
- if ( index )
- free( index );
+ if ( p_indexes )
+ free( p_indexes );
delete ep;
+ delete segment;
+ delete p_segment_uid;
+ delete p_prev_segment_uid;
+ delete p_next_segment_uid;
std::vector<chapter_edition_c*>::iterator index = stored_editions.begin();
while ( index != stored_editions.end() )
delete (*index);
index++;
}
+ std::vector<chapter_translation_c*>::iterator indext = translations.begin();
+ while ( indext != translations.end() )
+ {
+ delete (*indext);
+ indext++;
+ }
+ std::vector<KaxSegmentFamily*>::iterator indexf = families.begin();
+ while ( indexf != families.end() )
+ {
+ delete (*indexf);
+ indexf++;
+ }
}
KaxSegment *segment;
int64_t i_tags_position;
KaxCluster *cluster;
+ uint64 i_block_pos;
+ uint64 i_cluster_pos;
int64_t i_start_pos;
- KaxSegmentUID segment_uid;
- KaxPrevUID prev_segment_uid;
- KaxNextUID next_segment_uid;
+ KaxSegmentUID *p_segment_uid;
+ KaxPrevUID *p_prev_segment_uid;
+ KaxNextUID *p_next_segment_uid;
vlc_bool_t b_cues;
int i_index;
int i_index_max;
- mkv_index_t *index;
+ mkv_index_t *p_indexes;
/* info */
char *psz_muxing_application;
char *psz_title;
char *psz_date_utc;
+ /* !!!!! 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<chapter_edition_c> */
std::vector<chapter_edition_c*> stored_editions;
int i_default_edition;
- std::vector<chapter_translation_c> translations;
- std::vector<KaxSegmentFamily> families;
+ std::vector<chapter_translation_c*> translations;
+ std::vector<KaxSegmentFamily*> families;
demux_sys_t & sys;
EbmlParser *ep;
void LoadTags( );
void InformationCreate( );
void Seek( mtime_t i_date, mtime_t i_time_offset );
- int BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration );
+ int BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration );
bool Select( mtime_t i_start_time );
void UnSelect( );
+
static bool CompareSegmentUIDs( const matroska_segment_c * item_a, const matroska_segment_c * item_b );
};
{
public:
virtual_segment_c( matroska_segment_c *p_segment )
- :i_current_segment(0)
- ,p_editions(NULL)
+ :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 );
- AppendUID( p_segment->segment_uid );
- AppendUID( p_segment->prev_segment_uid );
- AppendUID( p_segment->next_segment_uid );
+ AppendUID( p_segment->p_segment_uid );
+ AppendUID( p_segment->p_prev_segment_uid );
+ AppendUID( p_segment->p_next_segment_uid );
}
void Sort();
return (*p_editions)[i_current_edition];
return NULL;
}
-
- inline bool EditionIsOrdered() const
- {
- return (p_editions->size() != 0 && i_current_edition >= 0 && (*p_editions)[i_current_edition]->b_ordered);
- }
matroska_segment_c * Segment() const
{
return linked_segments[i_current_segment];
}
- inline const chapter_item_c *CurrentChapter() const {
+ inline chapter_item_c *CurrentChapter() {
return psz_current_chapter;
}
return false;
}
-/* TODO handle/merge chapters here */
- void UpdateCurrentToChapter( demux_t & demux );
- bool Select( input_title_t & title );
+ bool FindUID( KaxSegmentUID & uid ) const
+ {
+ for ( size_t i=0; i<linked_uids.size(); i++ )
+ {
+ if ( linked_uids[i] == uid )
+ return true;
+ }
+ return false;
+ }
+
+ bool UpdateCurrentToChapter( demux_t & demux );
+ void PrepareChapters( );
+
+ 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<chapter_edition_c*> *p_editions;
+ int i_sys_title;
protected:
std::vector<matroska_segment_c*> linked_segments;
std::vector<KaxSegmentUID> linked_uids;
size_t i_current_segment;
- std::vector<chapter_edition_c*> *p_editions;
int i_current_edition;
chapter_item_c *psz_current_chapter;
- void AppendUID( const EbmlBinary & UID );
+ void AppendUID( const EbmlBinary * UID );
};
class matroska_stream_c
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:
,i_start_pts(0)
,i_chapter_time(0)
,meta(NULL)
- ,title(NULL)
+ ,i_current_title(0)
,p_current_segment(NULL)
+ ,dvd_interpretor( *this )
,f_duration(-1.0)
- {}
+ ,b_ui_hooked(false)
+ ,p_input(NULL)
+ ,b_pci_packet_set(false)
+ ,p_ev(NULL)
+ {
+ vlc_mutex_init( &demuxer, &lock_demuxer );
+ }
virtual ~demux_sys_t()
{
- for (size_t i=0; i<streams.size(); i++)
+ StopUiThread();
+ size_t i;
+ for ( i=0; i<streams.size(); i++ )
delete streams[i];
- for ( size_t i=0; i<opened_segments.size(); i++ )
+ for ( i=0; i<opened_segments.size(); i++ )
delete opened_segments[i];
+ for ( i=0; i<used_segments.size(); i++ )
+ delete used_segments[i];
+ vlc_mutex_destroy( &lock_demuxer );
}
/* current data */
vlc_meta_t *meta;
- input_title_t *title;
+ std::vector<input_title_t*> titles; // matroska editions
+ size_t i_current_title;
std::vector<matroska_stream_c*> streams;
std::vector<matroska_segment_c*> opened_segments;
+ std::vector<virtual_segment_c*> 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( );
- matroska_stream_c *AnalyseAllSegmentsFound( EbmlStream *p_estream );
+ bool PreparePlayback( virtual_segment_c *p_new_segment );
+ matroska_stream_c *AnalyseAllSegmentsFound( demux_t *p_demux, EbmlStream *p_estream, bool b_initial = false );
+ void JumpTo( virtual_segment_c & p_segment, chapter_item_c * p_chapter );
+
+ void StartUiThread();
+ void StopUiThread();
+ bool b_ui_hooked;
+ inline void SwapButtons();
+
+ /* for spu variables */
+ input_thread_t *p_input;
+ pci_t pci_packet;
+ bool b_pci_packet_set;
+ uint8_t palette[4][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 * );
#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId )
-static char *UTF8ToStr ( const UTFstring &u );
+static inline char * ToUTF8( const UTFstring &u )
+{
+ return strdup( u.GetUTF8().c_str() );
+}
/*****************************************************************************
* Open: initializes matroska demux structures
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = new demux_sys_t( *p_demux );
- p_io_callback = new vlc_stream_io_callback( p_demux->s );
+ p_io_callback = new vlc_stream_io_callback( p_demux->s, VLC_FALSE );
p_io_stream = new EbmlStream( *p_io_callback );
if( p_io_stream == NULL )
return VLC_EGENERIC;
}
- p_stream = p_sys->AnalyseAllSegmentsFound( p_io_stream );
+ p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_io_stream, true );
if( p_stream == NULL )
{
msg_Err( p_demux, "cannot find KaxSegment" );
p_stream->p_in->setFilePointer( p_segment->cluster->GetElementPosition() );
}
- /* get the files from the same dir from the same family (based on p_demux->psz_path) */
- if (p_demux->psz_path[0] != '\0' && !strcmp(p_demux->psz_access, ""))
+ if (config_GetInt( p_demux, "mkv-preload-local-dir" ))
{
- // assume it's a regular file
- // get the directory path
- s_path = p_demux->psz_path;
- if (s_path.at(s_path.length() - 1) == DIRECTORY_SEPARATOR)
- {
- s_path = s_path.substr(0,s_path.length()-1);
- }
- else
+ /* get the files from the same dir from the same family (based on p_demux->psz_path) */
+ if (p_demux->psz_path[0] != '\0' && !strcmp(p_demux->psz_access, ""))
{
- if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0)
+ // assume it's a regular file
+ // get the directory path
+ s_path = p_demux->psz_path;
+ if (s_path.at(s_path.length() - 1) == DIRECTORY_SEPARATOR)
{
- s_path = s_path.substr(0,s_path.find_last_of(DIRECTORY_SEPARATOR));
+ s_path = s_path.substr(0,s_path.length()-1);
+ }
+ else
+ {
+ if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0)
+ {
+ s_path = s_path.substr(0,s_path.find_last_of(DIRECTORY_SEPARATOR));
+ }
}
- }
- struct dirent *p_file_item;
- DIR *p_src_dir = opendir(s_path.c_str());
+ struct dirent *p_file_item;
+ DIR *p_src_dir = opendir(s_path.c_str());
- if (p_src_dir != NULL)
- {
- while ((p_file_item = (dirent *) readdir(p_src_dir)))
+ if (p_src_dir != NULL)
{
- if (strlen(p_file_item->d_name) > 4)
+ while ((p_file_item = (dirent *) readdir(p_src_dir)))
{
- s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name;
+ if (strlen(p_file_item->d_name) > 4)
+ {
+ s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name;
- if (!s_filename.compare(p_demux->psz_path))
- continue; // don't reuse the original opened file
+ if (!s_filename.compare(p_demux->psz_path))
+ continue; // don't reuse the original opened file
#if defined(__GNUC__) && (__GNUC__ < 3)
- if (!s_filename.compare("mkv", s_filename.length() - 3, 3) ||
- !s_filename.compare("mka", s_filename.length() - 3, 3))
+ if (!s_filename.compare("mkv", s_filename.length() - 3, 3) ||
+ !s_filename.compare("mka", s_filename.length() - 3, 3))
#else
- if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
- !s_filename.compare(s_filename.length() - 3, 3, "mka"))
+ if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
+ !s_filename.compare(s_filename.length() - 3, 3, "mka"))
#endif
- {
- // test wether this file belongs to the our family
- StdIOCallback *p_file_io = new StdIOCallback(s_filename.c_str(), MODE_READ);
- EbmlStream *p_estream = new EbmlStream(*p_file_io);
-
- p_stream = p_sys->AnalyseAllSegmentsFound( p_estream );
- if ( p_stream == NULL )
- {
- msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() );
- delete p_estream;
- delete p_file_io;
- }
- else
{
- p_stream->p_in = p_file_io;
- p_stream->p_es = p_estream;
- p_sys->streams.push_back( p_stream );
+ // test wether this file belongs to our family
+ stream_t *p_file_stream = stream_UrlNew( p_demux, s_filename.c_str());
+ if ( p_file_stream != NULL )
+ {
+ vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, VLC_TRUE );
+ EbmlStream *p_estream = new EbmlStream(*p_file_io);
+
+ p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_estream );
+
+ if ( p_stream == NULL )
+ {
+ msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() );
+ delete p_estream;
+ delete p_file_io;
+ }
+ else
+ {
+ p_stream->p_in = p_file_io;
+ p_stream->p_es = p_estream;
+ p_sys->streams.push_back( p_stream );
+ }
+ }
+ else
+ {
+ msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() );
+ }
}
}
}
+ closedir( p_src_dir );
}
- closedir( p_src_dir );
}
+
+ p_sys->PreloadFamily( *p_segment );
}
- p_sys->PreloadFamily( *p_segment );
p_sys->PreloadLinked( p_segment );
- if ( !p_sys->PreparePlayback( ) )
+
+ if ( !p_sys->PreparePlayback( NULL ) )
{
msg_Err( p_demux, "cannot use the segment" );
goto error;
}
+
+ p_sys->StartUiThread();
return VLC_SUCCESS;
int64_t *pi64;
double *pf, f;
int i_skp;
+ size_t i_idx;
vlc_meta_t **pp_meta;
return VLC_SUCCESS;
case DEMUX_GET_TITLE_INFO:
- if( p_sys->title && p_sys->title->i_seekpoint > 0 )
+ if( p_sys->titles.size() )
{
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**) );
+ *pi_int = p_sys->titles.size();
+ *ppp_title = (input_title_t**)malloc( sizeof( input_title_t**) * p_sys->titles.size() );
- (*ppp_title)[0] = vlc_input_title_Duplicate( p_sys->title );
+ for( size_t i = 0; i < p_sys->titles.size(); i++ )
+ {
+ (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] );
+ }
return VLC_SUCCESS;
}
return VLC_EGENERIC;
case DEMUX_SET_TITLE:
- /* TODO handle editions as titles & DVD titles as well */
- if( p_sys->title && p_sys->title->i_seekpoint > 0 )
+ /* TODO handle editions as titles */
+ i_idx = (int)va_arg( args, int );
+ if( i_idx < p_sys->used_segments.size() )
{
+ p_sys->JumpTo( *p_sys->used_segments[i_idx], NULL );
return VLC_SUCCESS;
}
return VLC_EGENERIC;
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)
+ // TODO change the way it works with the << & >> buttons on the UI (+1/-1 instead of a number)
+ if( p_sys->titles.size() && i_skp < p_sys->titles[p_sys->i_current_title]->i_seekpoint)
{
- Seek( p_demux, (int64_t)p_sys->title->seekpoint[i_skp]->i_time_offset, -1, NULL);
+ Seek( p_demux, (int64_t)p_sys->titles[p_sys->i_current_title]->seekpoint[i_skp]->i_time_offset, -1, NULL);
p_demux->info.i_seekpoint |= INPUT_UPDATE_SEEKPOINT;
p_demux->info.i_seekpoint = i_skp;
return VLC_SUCCESS;
}
}
-int matroska_segment_c::BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration )
+int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration )
{
- *pp_block = NULL;
- *pi_ref1 = -1;
- *pi_ref2 = -1;
+ pp_block = NULL;
+ *pi_ref1 = 0;
+ *pi_ref2 = 0;
for( ;; )
{
EbmlElement *el;
int i_level;
+ if ( ep == NULL )
+ return VLC_EGENERIC;
+
el = ep->Get();
i_level = ep->GetLevel();
- if( el == NULL && *pp_block != NULL )
+ if( el == NULL && pp_block != NULL )
{
/* update the index */
-#define idx index[i_index - 1]
+#define idx p_indexes[i_index - 1]
if( i_index > 0 && idx.i_time == -1 )
{
- idx.i_time = (*pp_block)->GlobalTimecode() / (mtime_t)1000;
- idx.b_key = *pi_ref1 == -1 ? VLC_TRUE : VLC_FALSE;
+ idx.i_time = (*pp_block).GlobalTimecode() / (mtime_t)1000;
+ idx.b_key = *pi_ref1 == 0 ? VLC_TRUE : VLC_FALSE;
}
#undef idx
return VLC_SUCCESS;
}
/* do parsing */
- if( i_level == 1 )
+ switch ( i_level )
{
+ case 1:
if( MKV_IS_ID( el, KaxCluster ) )
{
cluster = (KaxCluster*)el;
+ i_cluster_pos = cluster->GetElementPosition();
/* add it to the index */
if( i_index == 0 ||
- ( i_index > 0 && index[i_index - 1].i_position < (int64_t)cluster->GetElementPosition() ) )
+ ( i_index > 0 && p_indexes[i_index - 1].i_position < (int64_t)cluster->GetElementPosition() ) )
{
IndexAppendCluster( cluster );
}
{
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;
}
else if( MKV_IS_ID( el, KaxBlockGroup ) )
{
+ i_block_pos = el->GetElementPosition();
ep->Down();
}
- }
- else if( i_level == 3 )
- {
+ break;
+ case 3:
if( MKV_IS_ID( el, KaxBlock ) )
{
- *pp_block = (KaxBlock*)el;
+ pp_block = (KaxBlock*)el;
- (*pp_block)->ReadData( es.I_O() );
- (*pp_block)->SetParent( *cluster );
+ pp_block->ReadData( es.I_O() );
+ pp_block->SetParent( *cluster );
ep->Keep();
}
KaxReferenceBlock &ref = *(KaxReferenceBlock*)el;
ref.ReadData( es.I_O() );
- if( *pi_ref1 == -1 )
+ if( *pi_ref1 == 0 )
{
- *pi_ref1 = int64( ref );
+ *pi_ref1 = int64( ref ) * cluster->GlobalTimecodeScale();
}
else
{
- *pi_ref2 = int64( ref );
+ *pi_ref2 = int64( ref ) * cluster->GlobalTimecodeScale();
}
}
else if( MKV_IS_ID( el, KaxClusterSilentTrackNumber ) )
}
}
}
- }
- else
- {
+ break;
+ default:
msg_Err( &sys.demuxer, "invalid level = %d", i_level );
return VLC_EGENERIC;
}
}
static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts,
- mtime_t i_duration )
+ mtime_t i_duration, bool f_unreferenced )
{
demux_sys_t *p_sys = p_demux->p_sys;
matroska_segment_c *p_segment = p_sys->p_current_segment->Segment();
msg_Err( p_demux, "invalid track number=%d", block->TrackNum() );
return;
}
- if( tk->p_es == NULL )
+ if( tk->fmt.i_cat != NAV_ES && tk->p_es == NULL )
{
msg_Err( p_demux, "unknown track number=%d", block->TrackNum() );
return;
}
- if( i_pts < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES )
+ if( i_pts + i_duration < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES )
{
return; /* discard audio packets that shouldn't be rendered */
}
- es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
- if( !b )
+ if ( tk->fmt.i_cat != NAV_ES )
{
- 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 )
{
}
#endif
- // TODO implement correct timestamping when B frames are used
+ if ( tk->fmt.i_cat == NAV_ES )
+ {
+ // TODO handle the start/stop times of this packet
+ if ( p_sys->b_ui_hooked )
+ {
+ vlc_mutex_lock( &p_sys->p_ev->lock );
+ memcpy( &p_sys->pci_packet, &p_block->p_buffer[1], sizeof(pci_t) );
+ p_sys->SwapButtons();
+ p_sys->b_pci_packet_set = true;
+ vlc_mutex_unlock( &p_sys->p_ev->lock );
+ block_Release( p_block );
+ }
+ return;
+ }
+ // correct timestamping when B frames are used
if( tk->fmt.i_cat != VIDEO_ES )
{
p_block->i_dts = p_block->i_pts = i_pts;
}
else
{
- p_block->i_dts = i_pts;
- p_block->i_pts = 0;
+ if( !strcmp( tk->psz_codec, "V_MS/VFW/FOURCC" ) )
+ {
+ // in VFW we have no idea about B frames
+ p_block->i_pts = 0;
+ p_block->i_dts = i_pts;
+ }
+ else
+ {
+ p_block->i_pts = i_pts;
+ if ( f_unreferenced )
+ p_block->i_dts = p_block->i_pts;
+ else
+ p_block->i_dts = min( i_pts, tk->i_last_dts + (tk->i_default_duration >> 10));
+ p_sys->i_pts = p_block->i_dts;
+ }
}
+ tk->i_last_dts = p_block->i_dts;
- if( tk->fmt.i_cat == SPU_ES && strcmp( tk->psz_codec, "S_VOBSUB" ) )
+#if 1
+msg_Dbg( p_demux, "block i_dts: "I64Fd" / i_pts: "I64Fd, p_block->i_dts, p_block->i_pts);
+#endif
+ if( strcmp( tk->psz_codec, "S_VOBSUB" ) )
{
p_block->i_length = i_duration * 1000;
}
#undef tk
}
-matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream )
+matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlStream *p_estream, bool b_initial )
{
int i_upper_lvl = 0;
size_t i;
{
return NULL;
}
- p_l0->SkipData(*p_estream, EbmlHead_Context);
+
+ // verify we can read this Segment, we only support Matroska version 1 for now
+ p_l0->Read(*p_estream, EbmlHead::ClassInfos.Context, i_upper_lvl, p_l0, true);
+
+ EDocType doc_type = GetChild<EDocType>(*static_cast<EbmlHead*>(p_l0));
+ if (std::string(doc_type) != "matroska")
+ {
+ msg_Dbg( p_demux, "Not a Matroska file : %s ", std::string(doc_type).c_str());
+ return NULL;
+ }
+
+ EDocTypeReadVersion doc_read_version = GetChild<EDocTypeReadVersion>(*static_cast<EbmlHead*>(p_l0));
+ if (uint64(doc_read_version) != 1)
+ {
+ msg_Dbg( p_demux, "Matroska Read version not matching : "I64Fd, uint64(doc_read_version));
+ return NULL;
+ }
+
delete p_l0;
+
// find all segments in this file
- p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL);
+ p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFFLL);
if (p_l0 == NULL)
{
return NULL;
{
EbmlParser *ep;
matroska_segment_c *p_segment1 = new matroska_segment_c( *this, *p_estream );
- b_keep_segment = false;
+ b_keep_segment = b_initial;
ep = new EbmlParser(p_estream, p_l0, &demuxer );
p_segment1->ep = ep;
if ( !b_keep_segment )
break; // this segment is already known
opened_segments.push_back( p_segment1 );
- p_segment1->segment_uid = *( new KaxSegmentUID(*p_uid) );
+ delete p_segment1->p_segment_uid;
+ p_segment1->p_segment_uid = new KaxSegmentUID(*p_uid);
}
else if( MKV_IS_ID( l, KaxPrevUID ) )
{
- p_segment1->prev_segment_uid = *( new KaxPrevUID( *static_cast<KaxPrevUID*>(l) ) );
+ p_segment1->p_prev_segment_uid = new KaxPrevUID( *static_cast<KaxPrevUID*>(l) );
}
else if( MKV_IS_ID( l, KaxNextUID ) )
{
- p_segment1->next_segment_uid = *( new KaxNextUID( *static_cast<KaxNextUID*>(l) ) );
+ p_segment1->p_next_segment_uid = new KaxNextUID( *static_cast<KaxNextUID*>(l) );
}
else if( MKV_IS_ID( l, KaxSegmentFamily ) )
{
KaxSegmentFamily *p_fam = new KaxSegmentFamily( *static_cast<KaxSegmentFamily*>(l) );
- p_segment1->families.push_back( *p_fam );
+ p_segment1->families.push_back( p_fam );
}
}
break;
else
delete p_segment1;
}
-
- p_l0->SkipData(*p_estream, EbmlHead_Context);
- p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL);
+ if (p_l0->IsFiniteSize() )
+ {
+ p_l0->SkipData(*p_estream, KaxMatroska_Context);
+ p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL);
+ }
+ else
+ p_l0 = p_l0->SkipData(*p_estream, KaxSegment_Context);
}
if ( !b_keep_stream )
size_t i_track;
/* add all es */
- msg_Dbg( &sys.demuxer, "found %d es", tracks.size() );
+ msg_Dbg( &sys.demuxer, "found %d es", (int)tracks.size() );
+ sys.b_pci_packet_set = false;
+
for( i_track = 0; i_track < tracks.size(); i_track++ )
{
-#define tk tracks[i_track]
- if( tk->fmt.i_cat == UNKNOWN_ES )
+ if( tracks[i_track]->fmt.i_cat == UNKNOWN_ES )
{
- msg_Warn( &sys.demuxer, "invalid track[%d, n=%d]", i_track, tk->i_number );
- tk->p_es = NULL;
+ msg_Warn( &sys.demuxer, "invalid track[%d, n=%d]", (int)i_track, tracks[i_track]->i_number );
+ tracks[i_track]->p_es = NULL;
continue;
}
- if( !strcmp( tk->psz_codec, "V_MS/VFW/FOURCC" ) )
+ if( !strcmp( tracks[i_track]->psz_codec, "V_MS/VFW/FOURCC" ) )
{
- if( tk->i_extra_data < (int)sizeof( BITMAPINFOHEADER ) )
+ if( tracks[i_track]->i_extra_data < (int)sizeof( BITMAPINFOHEADER ) )
{
msg_Err( &sys.demuxer, "missing/invalid BITMAPINFOHEADER" );
- tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
}
else
{
- BITMAPINFOHEADER *p_bih = (BITMAPINFOHEADER*)tk->p_extra_data;
+ BITMAPINFOHEADER *p_bih = (BITMAPINFOHEADER*)tracks[i_track]->p_extra_data;
- tk->fmt.video.i_width = GetDWLE( &p_bih->biWidth );
- tk->fmt.video.i_height= GetDWLE( &p_bih->biHeight );
- tk->fmt.i_codec = GetFOURCC( &p_bih->biCompression );
+ 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 );
- tk->fmt.i_extra = GetDWLE( &p_bih->biSize ) - sizeof( BITMAPINFOHEADER );
- if( tk->fmt.i_extra > 0 )
+ tracks[i_track]->fmt.i_extra = GetDWLE( &p_bih->biSize ) - sizeof( BITMAPINFOHEADER );
+ if( tracks[i_track]->fmt.i_extra > 0 )
{
- tk->fmt.p_extra = malloc( tk->fmt.i_extra );
- memcpy( tk->fmt.p_extra, &p_bih[1], tk->fmt.i_extra );
+ 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 );
}
}
}
- else if( !strcmp( tk->psz_codec, "V_MPEG1" ) ||
- !strcmp( tk->psz_codec, "V_MPEG2" ) )
+ else if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG1" ) ||
+ !strcmp( tracks[i_track]->psz_codec, "V_MPEG2" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' );
}
- else if( !strncmp( tk->psz_codec, "V_MPEG4", 7 ) )
+ else if( !strncmp( tracks[i_track]->psz_codec, "V_MPEG4", 7 ) )
{
- if( !strcmp( tk->psz_codec, "V_MPEG4/MS/V3" ) )
+ if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG4/MS/V3" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' );
}
- else if( !strcmp( tk->psz_codec, "V_MPEG4/ISO/AVC" ) )
+ else if( !strcmp( tracks[i_track]->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 );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', 'v', 'c', '1' );
+ 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
{
- tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' );
}
}
- else if( !strcmp( tk->psz_codec, "V_QUICKTIME" ) )
+ 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),
- tk->p_extra_data,
- tk->i_extra_data );
-#else
- stream_t *p_mp4_stream = stream_MemoryNew( VLC_OBJECT(&sys.demuxer),
- tk->p_extra_data,
- tk->i_extra_data,
+ 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 );
- 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 );
+ 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( tk->psz_codec, "A_MS/ACM" ) )
+ else if( !strcmp( tracks[i_track]->psz_codec, "A_MS/ACM" ) )
{
- if( tk->i_extra_data < (int)sizeof( WAVEFORMATEX ) )
+ if( tracks[i_track]->i_extra_data < (int)sizeof( WAVEFORMATEX ) )
{
msg_Err( &sys.demuxer, "missing/invalid WAVEFORMATEX" );
- tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
}
else
{
- WAVEFORMATEX *p_wf = (WAVEFORMATEX*)tk->p_extra_data;
+ WAVEFORMATEX *p_wf = (WAVEFORMATEX*)tracks[i_track]->p_extra_data;
- wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &tk->fmt.i_codec, NULL );
+ wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &tracks[i_track]->fmt.i_codec, NULL );
- 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 );
+ 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 );
- tk->fmt.i_extra = GetWLE( &p_wf->cbSize );
- if( tk->fmt.i_extra > 0 )
+ tracks[i_track]->fmt.i_extra = GetWLE( &p_wf->cbSize );
+ if( tracks[i_track]->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 );
+ 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 );
}
}
}
- else if( !strcmp( tk->psz_codec, "A_MPEG/L3" ) ||
- !strcmp( tk->psz_codec, "A_MPEG/L2" ) ||
- !strcmp( tk->psz_codec, "A_MPEG/L1" ) )
+ 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" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' );
}
- else if( !strcmp( tk->psz_codec, "A_AC3" ) )
+ else if( !strcmp( tracks[i_track]->psz_codec, "A_AC3" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
}
- else if( !strcmp( tk->psz_codec, "A_DTS" ) )
+ else if( !strcmp( tracks[i_track]->psz_codec, "A_DTS" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
}
- else if( !strcmp( tk->psz_codec, "A_FLAC" ) )
+ else if( !strcmp( tracks[i_track]->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 );
+ 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( tk->psz_codec, "A_VORBIS" ) )
+ else if( !strcmp( tracks[i_track]->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' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'v', 'o', 'r', 'b' );
/* Split the 3 headers */
- if( tk->p_extra_data[0] != 0x02 )
+ if( tracks[i_track]->p_extra_data[0] != 0x02 )
msg_Err( &sys.demuxer, "invalid vorbis header" );
for( i = 0; i < 2; i++ )
{
i_size[i] = 0;
- while( i_offset < tk->i_extra_data )
+ while( i_offset < tracks[i_track]->i_extra_data )
{
- i_size[i] += tk->p_extra_data[i_offset];
- if( tk->p_extra_data[i_offset++] != 0xff ) break;
+ i_size[i] += tracks[i_track]->p_extra_data[i_offset];
+ if( tracks[i_track]->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];
+ 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];
- 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;
+ 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, tk->p_extra_data + i_offset + i_extra,
+ 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];
}
}
- else if( !strncmp( tk->psz_codec, "A_AAC/MPEG2/", strlen( "A_AAC/MPEG2/" ) ) ||
- !strncmp( tk->psz_codec, "A_AAC/MPEG4/", strlen( "A_AAC/MPEG4/" ) ) )
+ 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[] =
16000, 12000, 11025, 8000, 7350, 0, 0, 0
};
- tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' );
/* create data for faad (MP4DecSpecificDescrTag)*/
- if( !strcmp( &tk->psz_codec[12], "MAIN" ) )
+ if( !strcmp( &tracks[i_track]->psz_codec[12], "MAIN" ) )
{
i_profile = 0;
}
- else if( !strcmp( &tk->psz_codec[12], "LC" ) )
+ else if( !strcmp( &tracks[i_track]->psz_codec[12], "LC" ) )
{
i_profile = 1;
}
- else if( !strcmp( &tk->psz_codec[12], "SSR" ) )
+ else if( !strcmp( &tracks[i_track]->psz_codec[12], "SSR" ) )
{
i_profile = 2;
}
for( i_srate = 0; i_srate < 13; i_srate++ )
{
- if( i_sample_rates[i_srate] == tk->fmt.audio.i_rate )
+ 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 );
- 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);
+ 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( tk->psz_codec, "A_PCM/INT/BIG" ) ||
- !strcmp( tk->psz_codec, "A_PCM/INT/LIT" ) ||
- !strcmp( tk->psz_codec, "A_PCM/FLOAT/IEEE" ) )
+ 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( !strcmp( tk->psz_codec, "A_PCM/INT/BIG" ) )
+ if( !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/BIG" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' );
}
else
{
- tk->fmt.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' );
+ tracks[i_track]->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;
+ tracks[i_track]->fmt.audio.i_blockalign = ( tracks[i_track]->fmt.audio.i_bitspersample + 7 ) / 8 * tracks[i_track]->fmt.audio.i_channels;
}
- else if( !strcmp( tk->psz_codec, "A_TTA1" ) )
+ 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, tk->i_number );
- tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+ msg_Err( &sys.demuxer, "TTA not supported yet[%d, n=%d]", (int)i_track, tracks[i_track]->i_number );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
}
- else if( !strcmp( tk->psz_codec, "A_WAVPACK4" ) )
+ 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, tk->i_number );
- tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+ msg_Err( &sys.demuxer, "Wavpack not supported yet[%d, n=%d]", (int)i_track, tracks[i_track]->i_number );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
}
- else if( !strcmp( tk->psz_codec, "S_TEXT/UTF8" ) )
+ else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/UTF8" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
- tk->fmt.subs.psz_encoding = strdup( "UTF-8" );
+ 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( 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" ))
+ 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" ))
{
- tk->fmt.i_codec = VLC_FOURCC( 's', 's', 'a', ' ' );
- tk->fmt.subs.psz_encoding = strdup( "UTF-8" );
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 's', 'a', ' ' );
+ tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" );
}
- else if( !strcmp( tk->psz_codec, "S_VOBSUB" ) )
+ else if( !strcmp( tracks[i_track]->psz_codec, "S_VOBSUB" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 's','p','u',' ' );
- if( tk->i_extra_data )
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's','p','u',' ' );
+ if( tracks[i_track]->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';
+ 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",
- &tk->fmt.subs.spu.i_original_frame_width, &tk->fmt.subs.spu.i_original_frame_height ) == 2 )
+ &tracks[i_track]->fmt.subs.spu.i_original_frame_width, &tracks[i_track]->fmt.subs.spu.i_original_frame_height ) == 2 )
{
- msg_Dbg( &sys.demuxer, "original frame size vobsubs: %dx%d", tk->fmt.subs.spu.i_original_frame_width, tk->fmt.subs.spu.i_original_frame_height );
+ 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 );
}
else
{
free( p_buf );
}
}
- else if( !strcmp( tk->psz_codec, "B_VOBBTN" ) )
+ else if( !strcmp( tracks[i_track]->psz_codec, "B_VOBBTN" ) )
{
- /* FIXME: support this codec */
- msg_Err( &sys.demuxer, "Vob Buttons not supported yet[%d, n=%d]", i_track, tk->i_number );
- tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+ tracks[i_track]->fmt.i_cat = NAV_ES;
+ continue;
}
else
{
- msg_Err( &sys.demuxer, "unknow codec id=`%s'", tk->psz_codec );
- tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+ 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( tk->b_default )
+ if( tracks[i_track]->b_default )
{
- tk->fmt.i_priority = 1000;
+ tracks[i_track]->fmt.i_priority = 1000;
}
- tk->p_es = es_out_Add( sys.demuxer.out, &tk->fmt );
+ 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, tk->p_es, i_start_time );
-#undef tk
+ es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, tracks[i_track]->p_es, i_start_time );
}
sys.i_start_pts = i_start_time;
return true;
}
-void matroska_segment_c::UnSelect( )
+void demux_sys_t::StartUiThread()
{
- size_t i_track;
-
- for( i_track = 0; i_track < tracks.size(); i_track++ )
+ if ( !b_ui_hooked )
{
-#define tk tracks[i_track]
- if ( tk->p_es != NULL )
- {
- es_out_Del( sys.demuxer.out, tk->p_es );
- tk->p_es = NULL;
+ 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-palette", VLC_VAR_ADDRESS );
+ var_Create( p_input, "highlight", VLC_VAR_BOOL );
+ var_Create( p_input, "highlight-mutex", VLC_VAR_MUTEX );
+
+ /* Now create our event thread catcher */
+ p_ev = (event_thread_t *) vlc_object_create( &demuxer, sizeof( event_thread_t ) );
+ p_ev->p_demux = &demuxer;
+ p_ev->b_die = VLC_FALSE;
+ vlc_mutex_init( p_ev, &p_ev->lock );
+ vlc_thread_create( p_ev, "mkv event thread handler", EventThread,
+ VLC_THREAD_PRIORITY_LOW, VLC_FALSE );
+ }
+}
+
+void demux_sys_t::StopUiThread()
+{
+ if ( b_ui_hooked )
+ {
+ p_ev->b_die = VLC_TRUE;
+
+ vlc_thread_join( p_ev );
+ vlc_object_destroy( p_ev );
+
+ p_ev = NULL;
+
+ var_Destroy( p_input, "highlight-mutex" );
+ var_Destroy( p_input, "highlight" );
+ var_Destroy( p_input, "x-start" );
+ 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-palette" );
+
+ vlc_object_release( p_input );
+
+ 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;
+ msg_Dbg( p_this, "Event Mouse: clicked");
+ }
+ else if( psz_var[6] == 'm' )
+ p_ev->b_moved = VLC_TRUE;
+ vlc_mutex_unlock( &p_ev->lock );
+
+ 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 );
+ msg_Dbg( p_this, "Event Key");
+
+ 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->b_pci_packet_set )
+ {
+ /* Wait 100ms */
+ msleep( 100000 );
+ continue;
+ }
+
+ vlc_bool_t b_activated = VLC_FALSE;
+
+ /* KEY part */
+ if( p_ev->b_key )
+ {
+ vlc_value_t valk;
+ struct vlc_t::hotkey *p_hotkeys = p_ev->p_vlc->p_hotkeys;
+ int i, i_action = -1;
+
+ msg_Dbg( p_ev->p_demux, "Handle Key Event");
+
+ vlc_mutex_lock( &p_ev->lock );
+
+ pci_t *pci = (pci_t *) &p_sys->pci_packet;
+
+ 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;
+ }
+ }
+
+ uint16 i_curr_button = p_sys->dvd_interpretor.GetSPRM( 0x88 );
+
+ switch( i_action )
+ {
+ case ACTIONID_NAV_LEFT:
+ if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns )
+ {
+ btni_t *p_button_ptr = &(pci->hli.btnit[i_curr_button-1]);
+ if ( p_button_ptr->left > 0 && p_button_ptr->left <= pci->hli.hl_gi.btn_ns )
+ {
+ i_curr_button = p_button_ptr->left;
+ p_sys->dvd_interpretor.SetSPRM( 0x88, i_curr_button );
+ btni_t button_ptr = pci->hli.btnit[i_curr_button-1];
+ if ( button_ptr.auto_action_mode )
+ {
+ vlc_mutex_unlock( &p_ev->lock );
+ vlc_mutex_lock( &p_sys->lock_demuxer );
+
+ // process the button action
+ p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 );
+
+ vlc_mutex_unlock( &p_sys->lock_demuxer );
+ vlc_mutex_lock( &p_ev->lock );
+ }
+ }
+ }
+ break;
+ case ACTIONID_NAV_RIGHT:
+ if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns )
+ {
+ btni_t *p_button_ptr = &(pci->hli.btnit[i_curr_button-1]);
+ if ( p_button_ptr->right > 0 && p_button_ptr->right <= pci->hli.hl_gi.btn_ns )
+ {
+ i_curr_button = p_button_ptr->right;
+ p_sys->dvd_interpretor.SetSPRM( 0x88, i_curr_button );
+ btni_t button_ptr = pci->hli.btnit[i_curr_button-1];
+ if ( button_ptr.auto_action_mode )
+ {
+ vlc_mutex_unlock( &p_ev->lock );
+ vlc_mutex_lock( &p_sys->lock_demuxer );
+
+ // process the button action
+ p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 );
+
+ vlc_mutex_unlock( &p_sys->lock_demuxer );
+ vlc_mutex_lock( &p_ev->lock );
+ }
+ }
+ }
+ break;
+ case ACTIONID_NAV_UP:
+ if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns )
+ {
+ btni_t *p_button_ptr = &(pci->hli.btnit[i_curr_button-1]);
+ if ( p_button_ptr->up > 0 && p_button_ptr->up <= pci->hli.hl_gi.btn_ns )
+ {
+ i_curr_button = p_button_ptr->up;
+ p_sys->dvd_interpretor.SetSPRM( 0x88, i_curr_button );
+ btni_t button_ptr = pci->hli.btnit[i_curr_button-1];
+ if ( button_ptr.auto_action_mode )
+ {
+ vlc_mutex_unlock( &p_ev->lock );
+ vlc_mutex_lock( &p_sys->lock_demuxer );
+
+ // process the button action
+ p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 );
+
+ vlc_mutex_unlock( &p_sys->lock_demuxer );
+ vlc_mutex_lock( &p_ev->lock );
+ }
+ }
+ }
+ break;
+ case ACTIONID_NAV_DOWN:
+ if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns )
+ {
+ btni_t *p_button_ptr = &(pci->hli.btnit[i_curr_button-1]);
+ if ( p_button_ptr->down > 0 && p_button_ptr->down <= pci->hli.hl_gi.btn_ns )
+ {
+ i_curr_button = p_button_ptr->down;
+ p_sys->dvd_interpretor.SetSPRM( 0x88, i_curr_button );
+ btni_t button_ptr = pci->hli.btnit[i_curr_button-1];
+ if ( button_ptr.auto_action_mode )
+ {
+ vlc_mutex_unlock( &p_ev->lock );
+ vlc_mutex_lock( &p_sys->lock_demuxer );
+
+ // process the button action
+ p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 );
+
+ vlc_mutex_unlock( &p_sys->lock_demuxer );
+ vlc_mutex_lock( &p_ev->lock );
+ }
+ }
+ }
+ break;
+ case ACTIONID_NAV_ACTIVATE:
+ b_activated = VLC_TRUE;
+
+ if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns )
+ {
+ btni_t button_ptr = pci->hli.btnit[i_curr_button-1];
+
+ vlc_mutex_unlock( &p_ev->lock );
+ vlc_mutex_lock( &p_sys->lock_demuxer );
+
+ // process the button action
+ p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 );
+
+ vlc_mutex_unlock( &p_sys->lock_demuxer );
+ vlc_mutex_lock( &p_ev->lock );
+ }
+ break;
+ default:
+ break;
+ }
+ p_ev->b_key = VLC_FALSE;
+ vlc_mutex_unlock( &p_ev->lock );
+ }
+
+ /* MOUSE part */
+ if( p_vout && ( p_ev->b_moved || p_ev->b_clicked ) )
+ {
+ 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 )
+ {
+ int32_t button;
+ int32_t best,dist,d;
+ int32_t mx,my,dx,dy;
+
+ msg_Dbg( p_ev->p_demux, "Handle Mouse Event: Mouse clicked x(%d)*y(%d)", (unsigned)valx.i_int, (unsigned)valy.i_int);
+
+ b_activated = VLC_TRUE;
+ // get current button
+ best = 0;
+ dist = 0x08000000; /* >> than (720*720)+(567*567); */
+ for(button = 1; button <= pci->hli.hl_gi.btn_ns; button++)
+ {
+ btni_t *button_ptr = &(pci->hli.btnit[button-1]);
+
+ if(((unsigned)valx.i_int >= button_ptr->x_start)
+ && ((unsigned)valx.i_int <= button_ptr->x_end)
+ && ((unsigned)valy.i_int >= button_ptr->y_start)
+ && ((unsigned)valy.i_int <= button_ptr->y_end))
+ {
+ mx = (button_ptr->x_start + button_ptr->x_end)/2;
+ my = (button_ptr->y_start + button_ptr->y_end)/2;
+ 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;
+ }
+ }
+ }
+
+ if ( best != 0)
+ {
+ btni_t button_ptr = pci->hli.btnit[best-1];
+ uint16 i_curr_button = p_sys->dvd_interpretor.GetSPRM( 0x88 );
+
+ msg_Dbg( &p_sys->demuxer, "Clicked button %d", best );
+ vlc_mutex_unlock( &p_ev->lock );
+ vlc_mutex_lock( &p_sys->lock_demuxer );
+
+ // process the button action
+ p_sys->dvd_interpretor.SetSPRM( 0x88, best );
+ p_sys->dvd_interpretor.Interpret( button_ptr.cmd.bytes, 8 );
+
+ msg_Dbg( &p_sys->demuxer, "Processed button %d", best );
+
+ // select new button
+ if ( best != i_curr_button )
+ {
+ vlc_value_t val;
+
+ if( var_Get( p_sys->p_input, "highlight-mutex", &val ) == VLC_SUCCESS )
+ {
+ vlc_mutex_t *p_mutex = (vlc_mutex_t *) val.p_address;
+ 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;
+ }
+
+ for( int i = 0; i < 4; i++ )
+ {
+ uint32_t i_yuv = 0xFF;//p_sys->clut[(hl.palette>>(16+i*4))&0x0f];
+ uint8_t i_alpha = (i_palette>>(i*4))&0x0f;
+ i_alpha = i_alpha == 0xf ? 0xff : i_alpha << 4;
+
+ p_sys->palette[i][0] = (i_yuv >> 16) & 0xff;
+ p_sys->palette[i][1] = (i_yuv >> 0) & 0xff;
+ p_sys->palette[i][2] = (i_yuv >> 8) & 0xff;
+ p_sys->palette[i][3] = i_alpha;
+ }
+
+ vlc_mutex_lock( p_mutex );
+ val.i_int = button_ptr.x_start; var_Set( p_sys->p_input, "x-start", val );
+ val.i_int = button_ptr.x_end; var_Set( p_sys->p_input, "x-end", val );
+ val.i_int = button_ptr.y_start; var_Set( p_sys->p_input, "y-start", val );
+ val.i_int = button_ptr.y_end; var_Set( p_sys->p_input, "y-end", val );
+
+ val.p_address = (void *)p_sys->palette;
+ var_Set( p_sys->p_input, "menu-palette", val );
+
+ val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val );
+ vlc_mutex_unlock( p_mutex );
+ }
+ }
+ vlc_mutex_unlock( &p_sys->lock_demuxer );
+ vlc_mutex_lock( &p_ev->lock );
+ }
+ }
+ else if( p_ev->b_moved )
+ {
+// dvdnav_mouse_select( NULL, pci, valx.i_int, valy.i_int );
+ }
+
+ p_ev->b_moved = VLC_FALSE;
+ p_ev->b_clicked = VLC_FALSE;
+ vlc_mutex_unlock( &p_ev->lock );
+ }
+
+ /* VOUT part */
+ if( p_vout && p_vout->b_die )
+ {
+ var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev );
+ var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev );
+ vlc_object_release( p_vout );
+ p_vout = NULL;
+ }
+
+ else if( p_vout == NULL )
+ {
+ p_vout = (vlc_object_t*) vlc_object_find( p_sys->p_input, VLC_OBJECT_VOUT,
+ FIND_CHILD );
+ 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 );
+
+ return VLC_SUCCESS;
+}
+
+void matroska_segment_c::UnSelect( )
+{
+ size_t i_track;
+
+ for( i_track = 0; i_track < tracks.size(); i_track++ )
+ {
+ if ( tracks[i_track]->p_es != NULL )
+ {
+// es_format_Clean( &tracks[i_track]->fmt );
+ es_out_Del( sys.demuxer.out, tracks[i_track]->p_es );
+ tracks[i_track]->p_es = NULL;
}
-#undef tk
}
delete ep;
ep = NULL;
}
-bool virtual_segment_c::Select( input_title_t & title )
+void virtual_segment_c::PrepareChapters( )
{
if ( linked_segments.size() == 0 )
- return false;
+ return;
// !!! should be called only once !!!
matroska_segment_c *p_segment;
for (j=0; j<p_segment->stored_editions.size(); j++)
(*p_editions)[j]->Append( *p_segment->stored_editions[j] );
}
-
- if ( Edition() != NULL )
- Edition()->PublishChapters( title );
-
- return true;
}
-void chapter_edition_c::PublishChapters( input_title_t & title )
+std::string chapter_edition_c::GetMainName() const
{
- title.i_seekpoint = 0;
- if ( title.seekpoint != NULL )
- free( title.seekpoint );
- chapter_item_c::PublishChapters( title, 0 );
+ if ( sub_chapters.size() )
+ {
+ return sub_chapters[0]->GetCodecName( true );
+ }
+ return "";
}
-void chapter_item_c::PublishChapters( input_title_t & title, int i_level )
+int chapter_item_c::PublishChapters( input_title_t & title, int & i_user_chapters, int i_level )
{
+ // 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();
title.i_seekpoint++;
title.seekpoint = (seekpoint_t**)realloc( title.seekpoint, title.i_seekpoint * sizeof( seekpoint_t* ) );
title.seekpoint[title.i_seekpoint-1] = sk;
-
- i_seekpoint_num = title.i_seekpoint;
+
+ if ( b_user_display )
+ i_user_chapters++;
}
for ( size_t i=0; i<sub_chapters.size() ; i++)
{
- sub_chapters[i]->PublishChapters( title, i_level+1 );
+ sub_chapters[i]->PublishChapters( title, i_user_chapters, i_level+1 );
}
+
+ i_seekpoint_num = i_user_chapters;
+
+ return i_user_chapters;
}
-void virtual_segment_c::UpdateCurrentToChapter( demux_t & demux )
+bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux )
{
demux_sys_t & sys = *demux.p_sys;
chapter_item_c *psz_curr_chapter;
+ bool b_has_seeked = false;
/* update current chapter/seekpoint */
if ( p_editions->size() )
{
/* 1st, we need to know in which chapter we are */
- psz_curr_chapter = (*p_editions)[i_current_edition]->FindTimecode( sys.i_pts );
+ psz_curr_chapter = (*p_editions)[i_current_edition]->FindTimecode( sys.i_pts, psz_current_chapter );
/* we have moved to a new chapter */
if (psz_curr_chapter != NULL && psz_current_chapter != psz_curr_chapter)
{
- if ( psz_current_chapter != NULL )
- psz_current_chapter->Leave();
-
- if ( psz_curr_chapter->i_seekpoint_num > 0 )
+ if ( (*p_editions)[i_current_edition]->b_ordered )
+ {
+ // Leave/Enter up to the link point
+ b_has_seeked = psz_curr_chapter->EnterAndLeave( psz_current_chapter );
+ if ( !b_has_seeked )
+ {
+ // only physically seek if necessary
+ if ( psz_current_chapter == NULL || (psz_current_chapter->i_end_time != psz_curr_chapter->i_start_time) )
+ Seek( demux, sys.i_pts, 0, psz_curr_chapter );
+ }
+ }
+
+ if ( !b_has_seeked )
{
- demux.info.i_update |= INPUT_UPDATE_SEEKPOINT;
- demux.info.i_seekpoint = psz_curr_chapter->i_seekpoint_num - 1;
+ psz_current_chapter = psz_curr_chapter;
+ if ( psz_curr_chapter->i_seekpoint_num > 0 )
+ {
+ demux.info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT;
+ demux.info.i_title = sys.i_current_title = i_sys_title;
+ demux.info.i_seekpoint = psz_curr_chapter->i_seekpoint_num - 1;
+ }
}
- if ( (*p_editions)[i_current_edition]->b_ordered )
+ 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 )
{
- psz_curr_chapter->Enter();
-
- // 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 );
+ if ( !(*p_editions)[i_current_edition]->EnterAndLeave( psz_current_chapter, false ) )
+ psz_current_chapter = NULL;
+ else
+ return true;
}
}
- psz_current_chapter = psz_curr_chapter;
}
+ return false;
+}
+
+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 )
+{
+ // FIXME don't assume it is the first edition
+ std::vector<chapter_edition_c*>::iterator index = p_editions->begin();
+ if ( index != p_editions->end() )
+ {
+ chapter_item_c *p_result = (*index)->BrowseCodecPrivate( codec_id, match, p_cookie, i_cookie_size );
+ if ( p_result != NULL )
+ return p_result;
+ }
+ return NULL;
+}
+
+chapter_item_c *virtual_segment_c::FindChapter( int64_t i_find_uid )
+{
+ // FIXME don't assume it is the first edition
+ std::vector<chapter_edition_c*>::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;
+}
+
+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 )
+{
+ // this chapter
+ std::vector<chapter_codec_cmds_c*>::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<chapter_item_c*>::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;
}
void chapter_item_c::Append( const chapter_item_c & chapter )
for ( i=0; i<chapter.sub_chapters.size(); i++ )
{
- p_chapter = FindChapter( *chapter.sub_chapters[i] );
+ p_chapter = FindChapter( chapter.sub_chapters[i]->i_uid );
if ( p_chapter != NULL )
{
p_chapter->Append( *chapter.sub_chapters[i] );
i_user_end_time = max( i_user_end_time, chapter.i_user_end_time );
}
-chapter_item_c * chapter_item_c::FindChapter( const chapter_item_c & chapter )
+chapter_item_c * chapter_item_c::FindChapter( int64_t i_find_uid )
{
size_t i;
+ chapter_item_c *p_result = NULL;
+
+ if ( i_uid == i_find_uid )
+ return this;
+
for ( i=0; i<sub_chapters.size(); i++)
{
- if ( sub_chapters[i]->i_uid == chapter.i_uid )
- return sub_chapters[i];
+ p_result = sub_chapters[i]->FindChapter( i_find_uid );
+ if ( p_result != NULL )
+ break;
}
- return NULL;
+ return p_result;
}
-static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_item_c *psz_chapter )
+std::string chapter_item_c::GetCodecName( bool f_for_title ) const
{
- 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;
-
- int i_index;
+ std::string result;
- 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 )
+ std::vector<chapter_codec_cmds_c*>::const_iterator index = codecs.begin();
+ while ( index != codecs.end() )
{
- msg_Warn( p_demux, "cannot seek so far !" );
- return;
+ result = (*index)->GetCodecName( f_for_title );
+ if ( result != "" )
+ break;
+ index++;
}
- /* seek without index or without date */
- if( f_percent >= 0 && (config_GetInt( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 ))
+ return result;
+}
+
+std::string dvd_chapter_codec_c::GetCodecName( bool f_for_title ) const
+{
+ std::string result;
+ if ( p_private_data->GetSize() >= 3)
{
- if (p_sys->f_duration >= 0)
+ const binary* p_data = p_private_data->GetBuffer();
+/* if ( p_data[0] == MATROSKA_DVD_LEVEL_TT )
{
- i_date = int64_t( f_percent * p_sys->f_duration * 1000.0 );
+ 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
+ else */ if ( p_data[0] == MATROSKA_DVD_LEVEL_LU )
{
- int64_t i_pos = int64_t( f_percent * stream_Size( p_demux->s ) );
-
- msg_Dbg( p_demux, "inacurate way of seeking" );
- for( i_index = 0; i_index < p_segment->i_index; i_index++ )
- {
- if( p_segment->index[i_index].i_position >= i_pos)
- {
- break;
- }
- }
- if( i_index == p_segment->i_index )
+ 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 )
{
- i_index--;
+ 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;
+ }
+ }
+ }
+
+ return result;
+}
+
+int16 chapter_item_c::GetTitleNumber( ) const
+{
+ int result = -1;
+
+ std::vector<chapter_codec_cmds_c*>::const_iterator index = codecs.begin();
+ while ( index != codecs.end() )
+ {
+ result = (*index)->GetTitleNumber( );
+ if ( result >= 0 )
+ break;
+ index++;
+ }
+
+ return result;
+}
+
+int16 dvd_chapter_codec_c::GetTitleNumber()
+{
+ if ( p_private_data->GetSize() >= 3)
+ {
+ const binary* p_data = p_private_data->GetBuffer();
+ if ( p_data[0] == MATROSKA_DVD_LEVEL_SS )
+ {
+ return int16( (p_data[2] << 8) + p_data[3] );
+ }
+ }
+ return -1;
+}
+
+static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_item_c *psz_chapter )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ virtual_segment_c *p_vsegment = p_sys->p_current_segment;
+ matroska_segment_c *p_segment = p_vsegment->Segment();
+ mtime_t i_time_offset = 0;
+
+ int i_index;
+
+ msg_Dbg( p_demux, "seek request to "I64Fd" (%f%%)", i_date, f_percent );
+ if( i_date < 0 && f_percent < 0 )
+ {
+ msg_Warn( p_demux, "cannot seek nowhere !" );
+ return;
+ }
+ if( f_percent > 1.0 )
+ {
+ msg_Warn( p_demux, "cannot seek so far !" );
+ return;
+ }
+
+ /* seek without index or without date */
+ if( f_percent >= 0 && (config_GetInt( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 ))
+ {
+ if (p_sys->f_duration >= 0)
+ {
+ i_date = int64_t( f_percent * p_sys->f_duration * 1000.0 );
+ }
+ else
+ {
+ int64_t i_pos = int64_t( f_percent * stream_Size( p_demux->s ) );
+
+ msg_Dbg( p_demux, "inacurate way of seeking" );
+ for( i_index = 0; i_index < p_segment->i_index; i_index++ )
+ {
+ if( p_segment->p_indexes[i_index].i_position >= i_pos)
+ {
+ break;
+ }
+ }
+ if( i_index == p_segment->i_index )
+ {
+ i_index--;
}
- i_date = p_segment->index[i_index].i_time;
+ i_date = p_segment->p_indexes[i_index].i_time;
#if 0
- if( p_segment->index[i_index].i_position < i_pos )
+ if( p_segment->p_indexes[i_index].i_position < i_pos )
{
EbmlElement *el;
static int Demux( demux_t *p_demux)
{
demux_sys_t *p_sys = p_demux->p_sys;
+
+ vlc_mutex_lock( &p_sys->lock_demuxer );
+
virtual_segment_c *p_vsegment = p_sys->p_current_segment;
- matroska_segment_c *p_segmet = p_vsegment->Segment();
- if ( p_segmet == NULL ) return 0;
+ matroska_segment_c *p_segment = p_vsegment->Segment();
+ if ( p_segment == NULL ) return 0;
int i_block_count = 0;
-
- KaxBlock *block;
- int64_t i_block_duration;
- int64_t i_block_ref1;
- int64_t i_block_ref2;
+ int i_return = 0;
for( ;; )
{
if ( p_sys->demuxer.b_die )
- return 0;
+ break;
if( p_sys->i_pts >= p_sys->i_start_pts )
- p_vsegment->UpdateCurrentToChapter( *p_demux );
+ if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
+ {
+ i_return = 1;
+ break;
+ }
- if ( p_vsegment->EditionIsOrdered() && p_vsegment->CurrentChapter() == NULL )
+ if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL )
{
/* nothing left to read in this ordered edition */
if ( !p_vsegment->SelectNext() )
- return 0;
- p_segmet->UnSelect( );
+ break;
+ p_segment->UnSelect( );
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
/* switch to the next segment */
- p_segmet = p_vsegment->Segment();
- if ( !p_segmet->Select( 0 ) )
+ p_segment = p_vsegment->Segment();
+ if ( !p_segment->Select( 0 ) )
{
msg_Err( p_demux, "Failed to select new segment" );
- return 0;
+ break;
}
continue;
}
+ KaxBlock *block;
+ int64_t i_block_duration = 0;
+ int64_t i_block_ref1;
+ int64_t i_block_ref2;
- if( p_segmet->BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
+ if( p_segment->BlockGet( block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
{
- if ( p_vsegment->EditionIsOrdered() )
+ 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
p_sys->i_pts = p_chap->i_user_end_time;
p_sys->i_pts++; // trick to avoid staying on segments with no duration and no content
- return 1;
+ i_return = 1;
}
- return 0;
+ break;
}
- msg_Warn( p_demux, "cannot get block EOF?" );
- p_segmet->UnSelect( );
-
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
-
- /* switch to the next segment */
- if ( !p_vsegment->SelectNext() )
- // no more segments in this stream
- return 0;
- p_segmet = p_vsegment->Segment();
- if ( !p_segmet->Select( 0 ) )
+ else
{
- msg_Err( p_demux, "Failed to select new segment" );
- return 0;
- }
+ msg_Warn( p_demux, "cannot get block EOF?" );
+ p_segment->UnSelect( );
+
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
- continue;
+ /* switch to the next segment */
+ if ( !p_vsegment->SelectNext() )
+ // no more segments in this stream
+ break;
+ p_segment = p_vsegment->Segment();
+ if ( !p_segment->Select( 0 ) )
+ {
+ msg_Err( p_demux, "Failed to select new segment" );
+ break;
+ }
+
+ continue;
+ }
}
- p_sys->i_pts = p_sys->i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000;
+ p_sys->i_pts = (p_sys->i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
if( p_sys->i_pts >= p_sys->i_start_pts )
{
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts );
+
+ if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
+ {
+ i_return = 1;
+ delete block;
+ break;
+ }
+ }
+
+ if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL )
+ {
+ /* nothing left to read in this ordered edition */
+ if ( !p_vsegment->SelectNext() )
+ {
+ delete block;
+ break;
+ }
+ p_segment->UnSelect( );
+
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+
+ /* switch to the next segment */
+ p_segment = p_vsegment->Segment();
+ if ( !p_segment->Select( 0 ) )
+ {
+ msg_Err( p_demux, "Failed to select new segment" );
+ delete block;
+ break;
+ }
+ delete block;
+ continue;
}
- BlockDecode( p_demux, block, p_sys->i_pts, i_block_duration );
+ BlockDecode( p_demux, block, p_sys->i_pts, i_block_duration, i_block_ref1 >= 0 || i_block_ref2 > 0 );
delete block;
i_block_count++;
// TODO optimize when there is need to leave or when seeking has been called
if( i_block_count > 5 )
{
- return 1;
+ i_return = 1;
+ break;
}
}
+
+ vlc_mutex_unlock( &p_sys->lock_demuxer );
+
+ return i_return;
}
/*****************************************************************************
* Stream managment
*****************************************************************************/
-vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_ )
+vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_, vlc_bool_t b_owner_ )
{
s = s_;
+ b_owner = b_owner_;
mb_eof = VLC_FALSE;
}
}
uint64 vlc_stream_io_callback::getFilePointer( void )
{
+ if ( s == NULL )
+ return 0;
return stream_Tell( s );
}
void vlc_stream_io_callback::close( void )
}
}
+EbmlElement* EbmlParser::UnGet( uint64 i_block_pos, uint64 i_cluster_pos )
+{
+ if ( mi_user_level > mi_level )
+ {
+ while ( mi_user_level != mi_level )
+ {
+ delete m_el[mi_user_level];
+ m_el[mi_user_level] = NULL;
+ mi_user_level--;
+ }
+ }
+ m_got = NULL;
+ mb_keep = VLC_FALSE;
+ if ( m_el[1]->GetElementPosition() == i_cluster_pos )
+ {
+ m_es->I_O().setFilePointer( i_block_pos, seek_beginning );
+ return (EbmlMaster*) m_el[1];
+ }
+ else
+ {
+ // seek to the previous Cluster
+ m_es->I_O().setFilePointer( i_cluster_pos, seek_beginning );
+ mi_level--;
+ mi_user_level--;
+ delete m_el[mi_level];
+ m_el[mi_level] = NULL;
+ return NULL;
+ }
+}
+
void EbmlParser::Up( void )
{
if( mi_user_level == mi_level )
mb_keep = VLC_FALSE;
}
- m_el[mi_level] = m_es->FindNextElement( m_el[mi_level - 1]->Generic().Context, i_ulev, 0xFFFFFFFFL, mb_dummy, 1 );
+ m_el[mi_level] = m_es->FindNextElement( m_el[mi_level - 1]->Generic().Context, i_ulev, 0xFFFFFFFFL, mb_dummy != 0, 1 );
// mi_remain_size[mi_level] = m_el[mi_level]->GetSize();
if( i_ulev > 0 )
{
{
if( MKV_IS_ID( el, KaxCuePoint ) )
{
-#define idx index[i_index]
+#define idx p_indexes[i_index]
idx.i_track = -1;
idx.i_block_number= -1;
if( i_index >= i_index_max )
{
i_index_max += 1024;
- index = (mkv_index_t*)realloc( index, sizeof( mkv_index_t ) * i_index_max );
+ p_indexes = (mkv_index_t*)realloc( p_indexes, sizeof( mkv_index_t ) * i_index_max );
}
#undef idx
}
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;
{
KaxTrackName &tname = *(KaxTrackName*)l;
- tk->fmt.psz_description = UTF8ToStr( UTFstring( tname ) );
+ tk->fmt.psz_description = ToUTF8( UTFstring( tname ) );
msg_Dbg( &sys.demuxer, "| | | + Track Name=%s", tk->fmt.psz_description );
}
else if( MKV_IS_ID( l, KaxTrackLanguage ) )
{
KaxTrackLanguage &lang = *(KaxTrackLanguage*)l;
+ if ( tk->fmt.psz_language != NULL )
+ free( tk->fmt.psz_language );
tk->fmt.psz_language = strdup( string( lang ).c_str() );
msg_Dbg( &sys.demuxer,
"| | | + Track Language=`%s'", tk->fmt.psz_language );
{
KaxCodecName &cname = *(KaxCodecName*)l;
- tk->psz_codec_name = UTF8ToStr( UTFstring( cname ) );
+ tk->psz_codec_name = ToUTF8( UTFstring( cname ) );
msg_Dbg( &sys.demuxer, "| | | + Track Codec Name=%s", tk->psz_codec_name );
}
else if( MKV_IS_ID( l, KaxContentEncodings ) )
// {
// KaxCodecSettings &cset = *(KaxCodecSettings*)l;
-// tk->psz_codec_settings = UTF8ToStr( UTFstring( cset ) );
+// tk->psz_codec_settings = ToUTF8( UTFstring( cset ) );
// msg_Dbg( &sys.demuxer, "| | | + Track Codec Settings=%s", tk->psz_codec_settings );
// }
// else if( EbmlId( *l ) == KaxCodecInfoURL::ClassInfos.GlobalId )
msg_Dbg( &sys.demuxer, "| | | + Track Video" );
tk->f_fps = 0.0;
+ tk->fmt.video.i_frame_rate_base = (unsigned int)(tk->i_default_duration / 1000);
+ tk->fmt.video.i_frame_rate = 1000000;
+
for( j = 0; j < tkv->ListSize(); j++ )
{
EbmlElement *l = (*tkv)[j];
if( MKV_IS_ID( l, KaxSegmentUID ) )
{
- segment_uid = *(new KaxSegmentUID(*static_cast<KaxSegmentUID*>(l)));
+ if ( p_segment_uid == NULL )
+ p_segment_uid = new KaxSegmentUID(*static_cast<KaxSegmentUID*>(l));
- msg_Dbg( &sys.demuxer, "| | + UID=%d", *(uint32*)segment_uid.GetBuffer() );
+ msg_Dbg( &sys.demuxer, "| | + UID=%d", *(uint32*)p_segment_uid->GetBuffer() );
}
else if( MKV_IS_ID( l, KaxPrevUID ) )
{
- prev_segment_uid = *(new KaxPrevUID(*static_cast<KaxPrevUID*>(l)));
+ if ( p_prev_segment_uid == NULL )
+ p_prev_segment_uid = new KaxPrevUID(*static_cast<KaxPrevUID*>(l));
- msg_Dbg( &sys.demuxer, "| | + PrevUID=%d", *(uint32*)prev_segment_uid.GetBuffer() );
+ msg_Dbg( &sys.demuxer, "| | + PrevUID=%d", *(uint32*)p_prev_segment_uid->GetBuffer() );
}
else if( MKV_IS_ID( l, KaxNextUID ) )
{
- next_segment_uid = *(new KaxNextUID(*static_cast<KaxNextUID*>(l)));
+ if ( p_next_segment_uid == NULL )
+ p_next_segment_uid = new KaxNextUID(*static_cast<KaxNextUID*>(l));
- msg_Dbg( &sys.demuxer, "| | + NextUID=%d", *(uint32*)next_segment_uid.GetBuffer() );
+ msg_Dbg( &sys.demuxer, "| | + NextUID=%d", *(uint32*)p_next_segment_uid->GetBuffer() );
}
else if( MKV_IS_ID( l, KaxTimecodeScale ) )
{
{
KaxMuxingApp &mapp = *(KaxMuxingApp*)l;
- psz_muxing_application = UTF8ToStr( UTFstring( mapp ) );
+ psz_muxing_application = ToUTF8( UTFstring( mapp ) );
msg_Dbg( &sys.demuxer, "| | + Muxing Application=%s",
psz_muxing_application );
{
KaxWritingApp &wapp = *(KaxWritingApp*)l;
- psz_writing_application = UTF8ToStr( UTFstring( wapp ) );
+ psz_writing_application = ToUTF8( UTFstring( wapp ) );
msg_Dbg( &sys.demuxer, "| | + Writing Application=%s",
psz_writing_application );
{
KaxSegmentFilename &sfn = *(KaxSegmentFilename*)l;
- psz_segment_filename = UTF8ToStr( UTFstring( sfn ) );
+ psz_segment_filename = ToUTF8( UTFstring( sfn ) );
msg_Dbg( &sys.demuxer, "| | + Segment Filename=%s",
psz_segment_filename );
{
KaxTitle &title = *(KaxTitle*)l;
- psz_title = UTF8ToStr( UTFstring( title ) );
+ psz_title = ToUTF8( UTFstring( title ) );
msg_Dbg( &sys.demuxer, "| | + Title=%s", psz_title );
}
{
KaxSegmentFamily *uid = static_cast<KaxSegmentFamily*>(l);
- families.push_back(*uid);
+ families.push_back( new KaxSegmentFamily(*uid) );
msg_Dbg( &sys.demuxer, "| | + family=%d", *(uint32*)uid->GetBuffer() );
}
else if( MKV_IS_ID( l, KaxChapterTranslate ) )
{
KaxChapterTranslate *p_trans = static_cast<KaxChapterTranslate*>( l );
- chapter_translation_c translated;
+ chapter_translation_c *p_translate = new chapter_translation_c();
p_trans->Read( es, p_trans->Generic().Context, i_upper_level, el, true );
for( j = 0; j < p_trans->ListSize(); j++ )
if( MKV_IS_ID( l, KaxChapterTranslateEditionUID ) )
{
- translated.editions.push_back( uint64( *static_cast<KaxChapterTranslateEditionUID*>( l ) ) );
+ p_translate->editions.push_back( uint64( *static_cast<KaxChapterTranslateEditionUID*>( l ) ) );
}
else if( MKV_IS_ID( l, KaxChapterTranslateCodec ) )
{
- translated.codec_id = uint32( *static_cast<KaxChapterTranslateCodec*>( l ) );
+ p_translate->codec_id = uint32( *static_cast<KaxChapterTranslateCodec*>( l ) );
}
else if( MKV_IS_ID( l, KaxChapterTranslateID ) )
{
- translated.translated = *( new KaxChapterTranslateID( *static_cast<KaxChapterTranslateID*>( l ) ) );
+ p_translate->p_translated = new KaxChapterTranslateID( *static_cast<KaxChapterTranslateID*>( l ) );
}
}
- translations.push_back( translated );
+ translations.push_back( p_translate );
}
#endif
else
{
size_t i, j;
- if( sys.title == NULL )
- {
- sys.title = vlc_input_title_New();
- }
-
msg_Dbg( &sys.demuxer, "| | | + ChapterAtom (level=%d)", i_level );
for( i = 0; i < ca->ListSize(); i++ )
{
for (k = 0; k < i_level; k++)
chapters.psz_name += '+';
chapters.psz_name += ' ';
- chapters.psz_name += UTF8ToStr( UTFstring( name ) );
+ char *psz_tmp_utf8 = ToUTF8( UTFstring( name ) );
+ chapters.psz_name += psz_tmp_utf8;
+ chapters.b_user_display = true;
- msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", UTF8ToStr(UTFstring(name)) );
+ msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", psz_tmp_utf8 );
+ free( psz_tmp_utf8 );
}
else if( MKV_IS_ID( l, KaxChapterLanguage ) )
{
{
KaxChapterProcessCodecID *p_codec_id = static_cast<KaxChapterProcessCodecID*>( k );
if ( uint32(*p_codec_id) == 0 )
- p_ccodec = new matroska_script_codec_c();
+ p_ccodec = new matroska_script_codec_c( sys );
else if ( uint32(*p_codec_id) == 1 )
- p_ccodec = new dvd_chapter_codec_c();
+ p_ccodec = new dvd_chapter_codec_c( sys );
break;
}
}
stored_editions[i]->RefreshChapters( );
}
- if ( stored_editions[i_default_edition]->b_ordered )
+ if ( stored_editions.size() != 0 && stored_editions[i_default_edition]->b_ordered )
{
/* update the duration of the segment according to the sum of all sub chapters */
i_dur = stored_editions[i_default_edition]->Duration() / I64C(1000);
void matroska_segment_c::IndexAppendCluster( KaxCluster *cluster )
{
-#define idx index[i_index]
+#define idx p_indexes[i_index]
idx.i_track = -1;
idx.i_block_number= -1;
idx.i_position = cluster->GetElementPosition();
if( i_index >= i_index_max )
{
i_index_max += 1024;
- index = (mkv_index_t*)realloc( index, sizeof( mkv_index_t ) * i_index_max );
+ p_indexes = (mkv_index_t*)realloc( p_indexes, sizeof( mkv_index_t ) * i_index_max );
}
#undef idx
}
-static char * UTF8ToStr( const UTFstring &u )
-{
- int i_src;
- const wchar_t *src;
- char *dst, *p;
-
- i_src = u.length();
- src = u.c_str();
-
- p = dst = (char*)malloc( i_src + 1);
- while( i_src > 0 )
- {
- if( *src < 255 )
- {
- *p++ = (char)*src;
- }
- else
- {
- *p++ = '?';
- }
- src++;
- i_src--;
- }
- *p++= '\0';
-
- return dst;
-}
-
void chapter_edition_c::RefreshChapters( )
{
chapter_item_c::RefreshChapters( b_ordered, -1 );
}
else
{
- std::sort( sub_chapters.begin(), sub_chapters.end() );
+ if ( sub_chapters.begin() != sub_chapters.end() )
+ std::sort( sub_chapters.begin(), sub_chapters.end(), chapter_item_c::CompareTimecode );
i_user_start_time = i_start_time;
if ( i_end_time != -1 )
i_user_end_time = i_end_time;
return i_result;
}
-chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode )
+chapter_item_c * chapter_edition_c::FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current )
+{
+ if ( !b_ordered )
+ p_current = NULL;
+ bool b_found_current = false;
+ return chapter_item_c::FindTimecode( i_timecode, p_current, b_found_current );
+}
+
+chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode, const chapter_item_c * p_current, bool & b_found )
{
chapter_item_c *psz_result = NULL;
+ if ( p_current == this )
+ b_found = true;
+
if ( i_user_timecode >= i_user_start_time &&
( i_user_timecode < i_user_end_time ||
( i_user_start_time == i_user_end_time && i_user_timecode == i_user_end_time )))
{
std::vector<chapter_item_c*>::iterator index = sub_chapters.begin();
- while ( index != sub_chapters.end() && psz_result == NULL )
+ while ( index != sub_chapters.end() && ((p_current == NULL && psz_result == NULL) || (p_current != NULL && (!b_found || psz_result == NULL))))
{
- psz_result = (*index)->FindTimecode( i_user_timecode );
+ psz_result = (*index)->FindTimecode( i_user_timecode, p_current, b_found );
index++;
}
return psz_result;
}
+bool chapter_item_c::ParentOf( const chapter_item_c & item ) const
+{
+ if ( &item == this )
+ return true;
+
+ std::vector<chapter_item_c*>::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; i<opened_segments.size(); i++)
{
for (size_t j=0; j<of_segment.families.size(); j++)
{
- if ( families[i] == of_segment.families[j] )
+ if ( *(families[i]) == *(of_segment.families[j]) )
return Preload( );
}
}
// 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;
+
+ p_current_segment = VirtualFromSegments( p_segment );
+
+ used_segments.push_back( p_current_segment );
+
+ // 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] ) )
+ {
+ p_seg = VirtualFromSegments( opened_segments[i] );
+ used_segments.push_back( p_seg );
+ i_preloaded++;
+ }
+ }
+ } while ( i_preloaded ); // worst case: will stop when all segments are found as family related
+
+ // 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 )
+ {
+ std::string sz_name;
+ input_title_t *p_title = vlc_input_title_New();
+ p_seg->i_sys_title = i;
+ int i_chapters;
+
+ // TODO use a name for each edition, let the TITLE deal with a codec name
+ for ( j=0; j<p_seg->p_editions->size(); j++ )
+ {
+ if ( p_title->psz_name == NULL )
+ {
+ 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", (int)i );
+ sz_name += psz_str;
+ p_title->psz_name = strdup( sz_name.c_str() );
+ }
+
+ titles.push_back( p_title );
+ }
+ }
+
+ // TODO decide which segment should be first used (VMG for DVD)
+}
+
+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.p_segment_uid ) )
+ return true;
+ }
+ return false;
+}
+
+virtual_segment_c *demux_sys_t::VirtualFromSegments( matroska_segment_c *p_segment ) const
{
size_t i_preloaded, i;
- delete p_current_segment;
- p_current_segment = new virtual_segment_c( p_segment );
+ virtual_segment_c *p_result = new virtual_segment_c( p_segment );
// fill our current virtual segment with all hard linked segments
do {
i_preloaded = 0;
for ( i=0; i< opened_segments.size(); i++ )
{
- i_preloaded += p_current_segment->AddSegment( opened_segments[i] );
+ i_preloaded += p_result->AddSegment( opened_segments[i] );
}
} while ( i_preloaded ); // worst case: will stop when all segments are found as linked
- p_current_segment->Sort( );
+ p_result->Sort( );
+
+ p_result->PreloadLinked( );
- p_current_segment->PreloadLinked( );
+ p_result->PrepareChapters( );
+
+ return p_result;
}
-bool demux_sys_t::PreparePlayback( )
+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();
+
+ p_current_segment = p_new_segment;
+ i_current_title = p_new_segment->i_sys_title;
+ }
+
p_current_segment->LoadCues();
f_duration = p_current_segment->Duration();
p_current_segment->Segment()->Select( 0 );
- return p_current_segment->Select( *title );
+ return true;
+}
+
+void demux_sys_t::JumpTo( virtual_segment_c & vsegment, chapter_item_c * p_chapter )
+{
+ // if the segment is not part of the current segment, select the new one
+ if ( &vsegment != p_current_segment )
+ {
+ PreparePlayback( &vsegment );
+ }
+
+ if ( p_chapter != NULL )
+ {
+ if ( !p_chapter->Enter( true ) )
+ {
+ // jump to the location in the found segment
+ vsegment.Seek( demuxer, p_chapter->i_user_start_time, -1, p_chapter );
+ }
+ }
+
}
bool matroska_segment_c::CompareSegmentUIDs( const matroska_segment_c * p_item_a, const matroska_segment_c * p_item_b )
{
- EbmlBinary * p_itema = (EbmlBinary *)(&p_item_a->segment_uid);
- if ( *p_itema == p_item_b->prev_segment_uid )
+ if ( p_item_a == NULL || p_item_b == NULL )
+ return false;
+
+ EbmlBinary * p_itema = (EbmlBinary *)(p_item_a->p_segment_uid);
+ if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid )
return true;
- p_itema = (EbmlBinary *)(&p_item_a->next_segment_uid);
- if ( *p_itema == p_item_b->segment_uid )
+ p_itema = (EbmlBinary *)(&p_item_a->p_next_segment_uid);
+ if ( p_item_b->p_segment_uid != NULL && *p_itema == *p_item_b->p_segment_uid )
return true;
- if ( *p_itema == p_item_b->prev_segment_uid )
+ if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid )
return true;
return false;
cluster = (KaxCluster*)el;
- i_start_pos = cluster->GetElementPosition();
+ i_cluster_pos = i_start_pos = cluster->GetElementPosition();
ParseCluster( );
ep->Down();
}
else if( MKV_IS_ID( el, KaxAttachments ) )
{
- msg_Dbg( &sys.demuxer, "| + Attachments FIXME TODO (but probably never supported)" );
+ msg_Dbg( &sys.demuxer, "| + Attachments FIXME (but probably never supported)" );
}
else if( MKV_IS_ID( el, KaxChapters ) )
{
{
for (size_t i=0; i<opened_segments.size(); i++)
{
- if ( opened_segments[i]->segment_uid == uid )
+ if ( *opened_segments[i]->p_segment_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; i<used_segments.size(); i++)
+ {
+ p_result = used_segments[i]->BrowseCodecPrivate( codec_id, match, p_cookie, i_cookie_size );
+ if ( p_result != NULL )
+ {
+ p_segment_found = used_segments[i];
+ break;
+ }
+ }
+ 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; i<used_segments.size(); i++)
+ {
+ p_result = used_segments[i]->FindChapter( i_find_uid );
+ if ( p_result != NULL )
+ {
+ p_segment_found = used_segments[i];
+ break;
+ }
+ }
+ return p_result;
+}
+
void virtual_segment_c::Sort()
{
// keep the current segment index
// check if it's not already in here
for ( i=0; i<linked_segments.size(); i++ )
{
- if ( p_segment->segment_uid == linked_segments[i]->segment_uid )
+ if ( linked_segments[i]->p_segment_uid != NULL
+ && p_segment->p_segment_uid != NULL
+ && *p_segment->p_segment_uid == *linked_segments[i]->p_segment_uid )
return 0;
}
// find possible mates
for ( i=0; i<linked_uids.size(); i++ )
{
- if ( p_segment->segment_uid == linked_uids[i]
- || p_segment->prev_segment_uid == linked_uids[i]
- || p_segment->next_segment_uid == linked_uids[i] )
+ if ( (p_segment->p_segment_uid != NULL && *p_segment->p_segment_uid == linked_uids[i])
+ || (p_segment->p_prev_segment_uid != NULL && *p_segment->p_prev_segment_uid == linked_uids[i])
+ || (p_segment->p_next_segment_uid !=NULL && *p_segment->p_next_segment_uid == linked_uids[i]) )
{
linked_segments.push_back( p_segment );
- AppendUID( p_segment->prev_segment_uid );
- AppendUID( p_segment->next_segment_uid );
+ AppendUID( p_segment->p_prev_segment_uid );
+ AppendUID( p_segment->p_next_segment_uid );
return 1;
}
}
}
-void virtual_segment_c::AppendUID( const EbmlBinary & UID )
+void virtual_segment_c::AppendUID( const EbmlBinary * p_UID )
{
- if ( UID.GetBuffer() == NULL )
+ if ( p_UID == NULL )
+ return;
+ if ( p_UID->GetBuffer() == NULL )
return;
for (size_t i=0; i<linked_uids.size(); i++)
{
- if ( UID == linked_uids[i] )
+ if ( *p_UID == linked_uids[i] )
return;
}
- linked_uids.push_back( *(KaxSegmentUID*)(&UID) );
+ linked_uids.push_back( *(KaxSegmentUID*)(p_UID) );
}
void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset )
for( ; i_idx < i_index; i_idx++ )
{
- if( index[i_idx].i_time + i_time_offset > i_date )
+ if( p_indexes[i_idx].i_time + i_time_offset > i_date )
{
break;
}
i_idx--;
}
- i_seek_position = index[i_idx].i_position;
- i_seek_time = index[i_idx].i_time;
+ i_seek_position = p_indexes[i_idx].i_position;
+ i_seek_time = p_indexes[i_idx].i_time;
}
msg_Dbg( &sys.demuxer, "seek got "I64Fd" (%d%%)",
es_out_Control( sys.demuxer.out, ES_OUT_RESET_PCR );
/* now parse until key frame */
-#define tk tracks[i_track]
i_track_skipping = 0;
for( i_track = 0; i_track < tracks.size(); i_track++ )
{
- if( tk->fmt.i_cat == VIDEO_ES )
+ if( tracks[i_track]->fmt.i_cat == VIDEO_ES )
{
- tk->b_search_keyframe = VLC_TRUE;
+ tracks[i_track]->b_search_keyframe = VLC_TRUE;
i_track_skipping++;
}
- es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, tk->p_es, i_date );
+ es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, tracks[i_track]->p_es, i_date );
}
while( i_track_skipping > 0 )
{
- if( BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
+ if( BlockGet( block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
{
msg_Warn( &sys.demuxer, "cannot get block EOF?" );
return;
}
+ ep->Down();
for( i_track = 0; i_track < tracks.size(); i_track++ )
{
- if( tk->i_number == block->TrackNum() )
+ if( tracks[i_track]->i_number == block->TrackNum() )
{
break;
}
}
- sys.i_pts = sys.i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000;
+ sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
if( i_track < tracks.size() )
{
- if( sys.i_pts >= sys.i_start_pts )
+ if( sys.i_pts >= sys.i_start_pts )
{
- BlockDecode( &sys.demuxer, block, sys.i_pts, 0 );
+ cluster = static_cast<KaxCluster*>(ep->UnGet( i_block_pos, i_cluster_pos ));
i_track_skipping = 0;
}
- else if( tk->fmt.i_cat == VIDEO_ES )
+ else if( tracks[i_track]->fmt.i_cat == VIDEO_ES )
{
- if( i_block_ref1 == -1 && tk->b_search_keyframe )
+ if( i_block_ref1 == 0 && tracks[i_track]->b_search_keyframe )
{
- tk->b_search_keyframe = VLC_FALSE;
+ tracks[i_track]->b_search_keyframe = VLC_FALSE;
i_track_skipping--;
}
- if( !tk->b_search_keyframe )
+ if( !tracks[i_track]->b_search_keyframe )
{
- BlockDecode( &sys.demuxer, block, sys.i_pts, 0 );
+ BlockDecode( &sys.demuxer, block, sys.i_pts, 0, i_block_ref1 >= 0 || i_block_ref2 > 0 );
}
}
}
delete block;
}
-#undef tk
}
void virtual_segment_c::Seek( demux_t & demuxer, mtime_t i_date, mtime_t i_time_offset, chapter_item_c *psz_chapter )
// find the actual time for an ordered edition
if ( psz_chapter == NULL )
{
- if ( EditionIsOrdered() )
+ if ( Edition() && Edition()->b_ordered )
{
/* 1st, we need to know in which chapter we are */
- psz_chapter = (*p_editions)[i_current_edition]->FindTimecode( i_date );
+ psz_chapter = (*p_editions)[i_current_edition]->FindTimecode( i_date, psz_current_chapter );
}
}
{
psz_current_chapter = psz_chapter;
p_sys->i_chapter_time = i_time_offset = psz_chapter->i_user_start_time - psz_chapter->i_start_time;
- demuxer.info.i_update |= INPUT_UPDATE_SEEKPOINT;
- demuxer.info.i_seekpoint = psz_chapter->i_seekpoint_num - 1;
+ if ( psz_chapter->i_seekpoint_num > 0 )
+ {
+ 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;
+ }
}
// find the best matching segment
switch ( codec_time )
{
case 0:
- during_cmds.push_back( *p_data );
+ during_cmds.push_back( p_data );
break;
case 1:
- enter_cmds.push_back( *p_data );
+ enter_cmds.push_back( p_data );
break;
case 2:
- leave_cmds.push_back( *p_data );
+ leave_cmds.push_back( p_data );
break;
default:
delete p_data;
}
}
-bool chapter_item_c::Enter()
+bool chapter_item_c::Enter( bool b_do_subs )
{
+ bool f_result = false;
std::vector<chapter_codec_cmds_c*>::iterator index = codecs.begin();
while ( index != codecs.end() )
{
- (*index)->Enter();
+ f_result |= (*index)->Enter();
index++;
}
- return true;
-}
-bool chapter_item_c::Leave()
-{
- std::vector<chapter_codec_cmds_c*>::iterator index = codecs.begin();
- while ( index != codecs.end() )
+ if ( b_do_subs )
{
- (*index)->Leave();
+ // sub chapters
+ std::vector<chapter_item_c*>::iterator index_ = sub_chapters.begin();
+ while ( index_ != sub_chapters.end() )
+ {
+ f_result |= (*index_)->Enter( true );
+ index_++;
+ }
+ }
+ return f_result;
+}
+
+bool chapter_item_c::Leave( bool b_do_subs )
+{
+ bool f_result = false;
+ b_is_leaving = true;
+ std::vector<chapter_codec_cmds_c*>::iterator index = codecs.begin();
+ while ( index != codecs.end() )
+ {
+ f_result |= (*index)->Leave();
index++;
}
- return true;
+
+ if ( b_do_subs )
+ {
+ // sub chapters
+ std::vector<chapter_item_c*>::iterator index_ = sub_chapters.begin();
+ while ( index_ != sub_chapters.end() )
+ {
+ f_result |= (*index_)->Leave( true );
+ index_++;
+ }
+ }
+ b_is_leaving = false;
+ return f_result;
+}
+
+bool chapter_item_c::EnterAndLeave( chapter_item_c *p_item, bool b_final_enter )
+{
+ chapter_item_c *p_common_parent = p_item;
+
+ // leave, up to a common parent
+ while ( p_common_parent != NULL && !p_common_parent->ParentOf( *this ) )
+ {
+ if ( !p_common_parent->b_is_leaving && p_common_parent->Leave( false ) )
+ return true;
+ p_common_parent = p_common_parent->psz_parent;
+ }
+
+ // enter from the parent to <this>
+ if ( p_common_parent != NULL )
+ {
+ do
+ {
+ if ( p_common_parent == this )
+ return Enter( true );
+
+ for ( size_t i = 0; i<p_common_parent->sub_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 ( b_final_enter )
+ return Enter( true );
+ else
+ return false;
}
bool dvd_chapter_codec_c::Enter()
{
- std::vector<KaxChapterProcessData>::iterator index = enter_cmds.begin();
+ bool f_result = false;
+ std::vector<KaxChapterProcessData*>::iterator index = enter_cmds.begin();
while ( index != enter_cmds.end() )
{
- if ( (*index).GetSize() )
+ if ( (*index)->GetSize() )
{
- binary *p_data = (*index).GetBuffer();
+ binary *p_data = (*index)->GetBuffer();
size_t i_size = *p_data++;
// avoid reading too much from the buffer
- i_size = min( i_size, ((*index).GetSize() - 1) >> 3 );
+ i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 );
for ( ; i_size > 0; i_size--, p_data += 8 )
{
- interpretor.Interpret( p_data );
+ msg_Dbg( &sys.demuxer, "Matroska DVD enter command" );
+ f_result |= sys.dvd_interpretor.Interpret( p_data );
}
}
index++;
}
- return true;
+ return f_result;
}
bool dvd_chapter_codec_c::Leave()
{
- std::vector<KaxChapterProcessData>::iterator index = leave_cmds.begin();
+ bool f_result = false;
+ std::vector<KaxChapterProcessData*>::iterator index = leave_cmds.begin();
while ( index != leave_cmds.end() )
{
- if ( (*index).GetSize() )
+ if ( (*index)->GetSize() )
{
- binary *p_data = (*index).GetBuffer();
+ binary *p_data = (*index)->GetBuffer();
size_t i_size = *p_data++;
// avoid reading too much from the buffer
- i_size = min( i_size, ((*index).GetSize() - 1) >> 3 );
+ i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 );
for ( ; i_size > 0; i_size--, p_data += 8 )
{
- interpretor.Interpret( p_data );
+ msg_Dbg( &sys.demuxer, "Matroska DVD leave command" );
+ f_result |= sys.dvd_interpretor.Interpret( p_data );
}
}
index++;
}
- return true;
+ 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;
- return true;
-}
\ No newline at end of file
+ virtual_segment_c *p_segment = NULL;
+ chapter_item_c *p_chapter = NULL;
+ bool f_result = false;
+ uint16 i_command = ( p_command[0] << 8 ) + p_command[1];
+
+ // handle register tests if there are some
+ if ( (i_command & 0xF0) != 0 )
+ {
+ bool b_test_positive = true;//(i_command & CMD_DVD_IF_NOT) == 0;
+ bool b_test_value = (i_command & CMD_DVD_TEST_VALUE) != 0;
+ uint8 i_test = i_command & 0x70;
+ uint16 i_value;
+
+ // see http://dvd.sourceforge.net/dvdinfo/vmi.html
+ uint8 i_cr1;
+ uint16 i_cr2;
+ switch ( i_command >> 12 )
+ {
+ default:
+ i_cr1 = p_command[3];
+ i_cr2 = (p_command[4] << 8) + p_command[5];
+ break;
+ case 3:
+ case 4:
+ case 5:
+ i_cr1 = p_command[6];
+ i_cr2 = p_command[7];
+ b_test_value = false;
+ break;
+ case 6:
+ case 7:
+ if ( ((p_command[1] >> 4) & 0x7) == 0)
+ {
+ i_cr1 = p_command[2];
+ i_cr2 = (p_command[6] << 8) + p_command[7];
+ }
+ else
+ {
+ i_cr1 = p_command[2];
+ i_cr2 = (p_command[6] << 8) + p_command[7];
+ }
+ break;
+ }
+
+ if ( b_test_value )
+ i_value = i_cr2;
+ else
+ i_value = GetPRM( i_cr2 );
+
+ switch ( i_test )
+ {
+ case CMD_DVD_IF_GPREG_EQUAL:
+ // if equals
+ msg_Dbg( &sys.demuxer, "IF %s EQUALS %s", GetRegTypeName( false, i_cr1 ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) == i_value ))
+ {
+ b_test_positive = false;
+ }
+ break;
+ case CMD_DVD_IF_GPREG_NOT_EQUAL:
+ // if not equals
+ msg_Dbg( &sys.demuxer, "IF %s NOT EQUALS %s", GetRegTypeName( false, i_cr1 ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) != i_value ))
+ {
+ b_test_positive = false;
+ }
+ break;
+ case CMD_DVD_IF_GPREG_INF:
+ // if inferior
+ msg_Dbg( &sys.demuxer, "IF %s < %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) < i_value ))
+ {
+ b_test_positive = false;
+ }
+ break;
+ case CMD_DVD_IF_GPREG_INF_EQUAL:
+ // if inferior or equal
+ msg_Dbg( &sys.demuxer, "IF %s < %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) <= i_value ))
+ {
+ b_test_positive = false;
+ }
+ break;
+ case CMD_DVD_IF_GPREG_AND:
+ // if logical and
+ msg_Dbg( &sys.demuxer, "IF %s & %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) & i_value ))
+ {
+ b_test_positive = false;
+ }
+ break;
+ case CMD_DVD_IF_GPREG_SUP:
+ // if superior
+ msg_Dbg( &sys.demuxer, "IF %s >= %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) > i_value ))
+ {
+ b_test_positive = false;
+ }
+ break;
+ case CMD_DVD_IF_GPREG_SUP_EQUAL:
+ // if superior or equal
+ msg_Dbg( &sys.demuxer, "IF %s >= %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) >= i_value ))
+ {
+ b_test_positive = false;
+ }
+ 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:
+ {
+ msg_Dbg( &sys.demuxer, "NOP" );
+ break;
+ }
+ case CMD_DVD_BREAK:
+ {
+ msg_Dbg( &sys.demuxer, "Break" );
+ // TODO
+ break;
+ }
+ case CMD_DVD_JUMP_TT:
+ {
+ 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_segment != NULL )
+ {
+ sys.JumpTo( *p_segment, p_chapter );
+ f_result = true;
+ }
+
+ break;
+ }
+ case CMD_DVD_CALLSS_VTSM1:
+ {
+ msg_Dbg( &sys.demuxer, "CallSS" );
+ binary p_type;
+ switch( (p_command[6] & 0xC0) >> 6 ) {
+ case 0:
+ p_type = p_command[5] & 0x0F;
+ switch ( p_type )
+ {
+ case 0x00:
+ msg_Dbg( &sys.demuxer, "CallSS PGC (rsm_cell %x)", p_command[4]);
+ break;
+ case 0x02:
+ msg_Dbg( &sys.demuxer, "CallSS Title Entry (rsm_cell %x)", p_command[4]);
+ break;
+ case 0x03:
+ msg_Dbg( &sys.demuxer, "CallSS Root Menu (rsm_cell %x)", p_command[4]);
+ break;
+ case 0x04:
+ msg_Dbg( &sys.demuxer, "CallSS Subpicture Menu (rsm_cell %x)", p_command[4]);
+ break;
+ case 0x05:
+ msg_Dbg( &sys.demuxer, "CallSS Audio Menu (rsm_cell %x)", p_command[4]);
+ break;
+ case 0x06:
+ msg_Dbg( &sys.demuxer, "CallSS Angle Menu (rsm_cell %x)", p_command[4]);
+ break;
+ case 0x07:
+ msg_Dbg( &sys.demuxer, "CallSS Chapter Menu (rsm_cell %x)", p_command[4]);
+ break;
+ default:
+ msg_Dbg( &sys.demuxer, "CallSS <unknown> (rsm_cell %x)", p_command[4]);
+ break;
+ }
+ p_chapter = sys.BrowseCodecPrivate( 1, MatchPgcType, &p_type, 1, p_segment );
+ if ( p_segment != NULL )
+ {
+ sys.JumpTo( *p_segment, p_chapter );
+ f_result = true;
+ }
+ break;
+ case 1:
+ msg_Dbg( &sys.demuxer, "CallSS VMGM (menu %d, rsm_cell %x)", p_command[5] & 0x0F, p_command[4]);
+ break;
+ case 2:
+ msg_Dbg( &sys.demuxer, "CallSS VTSM (menu %d, rsm_cell %x)", p_command[5] & 0x0F, p_command[4]);
+ break;
+ case 3:
+ msg_Dbg( &sys.demuxer, "CallSS VMGM (pgc %d, rsm_cell %x)", (p_command[2] << 8) + p_command[3], p_command[4]);
+ break;
+ }
+ break;
+ }
+ case CMD_DVD_JUMP_SS:
+ {
+ msg_Dbg( &sys.demuxer, "JumpSS");
+ binary p_type;
+ switch( (p_command[5] & 0xC0) >> 6 ) {
+ case 0:
+ msg_Dbg( &sys.demuxer, "JumpSS FP");
+ break;
+ case 1:
+ p_type = p_command[5] & 0x0F;
+ switch ( p_type )
+ {
+ case 0x02:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Title Entry");
+ break;
+ case 0x03:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Root Menu");
+ break;
+ case 0x04:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Subpicture Menu");
+ break;
+ case 0x05:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Audio Menu");
+ break;
+ case 0x06:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Angle Menu");
+ break;
+ case 0x07:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Chapter Menu");
+ break;
+ default:
+ msg_Dbg( &sys.demuxer, "JumpSS <unknown>");
+ break;
+ }
+ // find the VMG
+ p_chapter = sys.BrowseCodecPrivate( 1, MatchIsVMG, NULL, 0, p_segment );
+ if ( p_segment != NULL )
+ {
+ p_chapter = p_segment->BrowseCodecPrivate( 1, MatchPgcType, &p_type, 1 );
+ if ( p_chapter != NULL )
+ {
+ sys.JumpTo( *p_segment, p_chapter );
+ f_result = true;
+ }
+ }
+ break;
+ case 2:
+ p_type = p_command[5] & 0x0F;
+ switch ( p_type )
+ {
+ case 0x02:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Title Entry", p_command[4], p_command[3]);
+ break;
+ case 0x03:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Root Menu", p_command[4], p_command[3]);
+ break;
+ case 0x04:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Subpicture Menu", p_command[4], p_command[3]);
+ break;
+ case 0x05:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Audio Menu", p_command[4], p_command[3]);
+ break;
+ case 0x06:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Angle Menu", p_command[4], p_command[3]);
+ break;
+ case 0x07:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Chapter Menu", p_command[4], p_command[3]);
+ break;
+ default:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) <unknown>", p_command[4], p_command[3]);
+ break;
+ }
+
+ p_chapter = sys.BrowseCodecPrivate( 1, MatchVTSMNumber, &p_command[4], 1, p_segment );
+
+ if ( p_segment != NULL && p_chapter != NULL )
+ {
+ // find the title in the VTS
+ p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchTitleNumber, &p_command[3], 1 );
+ if ( p_chapter != NULL )
+ {
+ // find the specified menu in the VTSM
+ p_chapter = p_segment->BrowseCodecPrivate( 1, MatchPgcType, &p_type, 1 );
+ if ( p_chapter != NULL )
+ {
+ sys.JumpTo( *p_segment, p_chapter );
+ f_result = true;
+ }
+ }
+ else
+ msg_Dbg( &sys.demuxer, "Title (%d) does not exist in this VTS", p_command[3] );
+ }
+ else
+ msg_Dbg( &sys.demuxer, "DVD Domain VTS (%d) not found", p_command[4] );
+ break;
+ case 3:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM (pgc %d)", (p_command[2] << 8) + p_command[3]);
+ break;
+ }
+ break;
+ }
+ case CMD_DVD_JUMPVTS_PTT:
+ {
+ uint8 i_title = p_command[5];
+ uint8 i_ptt = p_command[3];
+
+ msg_Dbg( &sys.demuxer, "JumpVTS Title (%d) PTT (%d)", i_title, i_ptt);
+
+ // find the current VTS content segment
+ p_chapter = sys.p_current_segment->BrowseCodecPrivate( 1, MatchIsDomain, NULL, 0 );
+ if ( p_chapter != NULL )
+ {
+ int16 i_curr_title = p_chapter->GetTitleNumber( );
+ if ( i_curr_title > 0 )
+ {
+ p_chapter = sys.BrowseCodecPrivate( 1, MatchVTSNumber, &i_curr_title, sizeof(i_curr_title), p_segment );
+
+ if ( p_segment != NULL && p_chapter != NULL )
+ {
+ // find the title in the VTS
+ p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchTitleNumber, &i_title, sizeof(i_title) );
+ if ( p_chapter != NULL )
+ {
+ // find the chapter in the title
+ p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchChapterNumber, &i_ptt, sizeof(i_ptt) );
+ if ( p_chapter != NULL )
+ {
+ sys.JumpTo( *p_segment, p_chapter );
+ f_result = true;
+ }
+ }
+ else
+ msg_Dbg( &sys.demuxer, "Title (%d) does not exist in this VTS", i_title );
+ }
+ else
+ msg_Dbg( &sys.demuxer, "DVD Domain VTS (%d) not found", i_curr_title );
+ }
+ else
+ msg_Dbg( &sys.demuxer, "JumpVTS_PTT command found but not in a VTS(M)");
+ }
+ else
+ msg_Dbg( &sys.demuxer, "JumpVTS_PTT command but the DVD domain wasn't found");
+ break;
+ }
+ case CMD_DVD_SET_GPRMMD:
+ {
+ msg_Dbg( &sys.demuxer, "Set GPRMMD [%d]=%d", (p_command[4] << 8) + p_command[5], (p_command[2] << 8) + p_command[3]);
+
+ if ( !SetGPRM( (p_command[4] << 8) + p_command[5], (p_command[2] << 8) + p_command[3] ) )
+ msg_Dbg( &sys.demuxer, "Set GPRMMD failed" );
+ break;
+ }
+ case CMD_DVD_LINKPGCN:
+ {
+ 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 )
+ {
+ if ( !p_chapter->Enter( true ) )
+ // jump to the location in the found segment
+ sys.p_current_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter );
+
+ f_result = true;
+ }
+ break;
+ }
+ case CMD_DVD_LINKCN:
+ {
+ uint8 i_cn = p_command[7];
+
+ p_chapter = sys.p_current_segment->CurrentChapter();
+
+ msg_Dbg( &sys.demuxer, "LinkCN (cell %d)", i_cn );
+ p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchCellNumber, &i_cn, 1 );
+ if ( p_chapter != NULL )
+ {
+ if ( !p_chapter->Enter( true ) )
+ // jump to the location in the found segment
+ sys.p_current_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter );
+
+ f_result = true;
+ }
+ break;
+ }
+ case CMD_DVD_GOTO_LINE:
+ {
+ msg_Dbg( &sys.demuxer, "GotoLine (%d)", (p_command[6] << 8) + p_command[7] );
+ // TODO
+ break;
+ }
+ case CMD_DVD_SET_HL_BTNN1:
+ {
+ msg_Dbg( &sys.demuxer, "SetHL_BTN (%d)", p_command[4] );
+ SetSPRM( 0x88, p_command[4] );
+ break;
+ }
+ default:
+ {
+ msg_Dbg( &sys.demuxer, "unsupported command : %02X %02X %02X %02X %02X %02X %02X %02X"
+ ,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::MatchIsDomain( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ return ( data.p_private_data != NULL && data.p_private_data->GetBuffer()[0] == MATROSKA_DVD_LEVEL_SS );
+}
+
+bool dvd_command_interpretor_c::MatchIsVMG( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ if ( data.p_private_data == NULL || data.p_private_data->GetSize() < 2 )
+ return false;
+
+ return ( data.p_private_data->GetBuffer()[0] == MATROSKA_DVD_LEVEL_SS && data.p_private_data->GetBuffer()[1] == 0xC0);
+}
+
+bool dvd_command_interpretor_c::MatchVTSNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ if ( i_cookie_size != 2 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 )
+ return false;
+
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_SS || data.p_private_data->GetBuffer()[1] != 0x80 )
+ return false;
+
+ uint16 i_gtitle = (data.p_private_data->GetBuffer()[2] << 8 ) + data.p_private_data->GetBuffer()[3];
+ uint16 i_title = *(uint16*)p_cookie;
+
+ return (i_gtitle == i_title);
+}
+
+bool dvd_command_interpretor_c::MatchVTSMNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 )
+ return false;
+
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_SS || data.p_private_data->GetBuffer()[1] != 0x40 )
+ return false;
+
+ uint8 i_gtitle = data.p_private_data->GetBuffer()[3];
+ uint8 i_title = *(uint8*)p_cookie;
+
+ return (i_gtitle == i_title);
+}
+
+bool dvd_command_interpretor_c::MatchTitleNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 )
+ return false;
+
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_TT )
+ return false;
+
+ uint16 i_gtitle = (data.p_private_data->GetBuffer()[1] << 8 ) + data.p_private_data->GetBuffer()[2];
+ uint8 i_title = *(uint8*)p_cookie;
+
+ return (i_gtitle == i_title);
+}
+
+bool dvd_command_interpretor_c::MatchPgcType( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 8 )
+ return false;
+
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC )
+ return false;
+
+ uint8 i_pgc_type = data.p_private_data->GetBuffer()[3] & 0x0F;
+ uint8 i_pgc = *(uint8*)p_cookie;
+
+ return (i_pgc_type == i_pgc);
+}
+
+bool dvd_command_interpretor_c::MatchPgcNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ if ( i_cookie_size != 2 || data.p_private_data == NULL || data.p_private_data->GetSize() < 8 )
+ return false;
+
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC )
+ return false;
+
+ uint16 *i_pgc_n = (uint16 *)p_cookie;
+ uint16 i_pgc_num = (data.p_private_data->GetBuffer()[1] << 8) + data.p_private_data->GetBuffer()[2];
+
+ return (i_pgc_num == *i_pgc_n);
+}
+
+bool dvd_command_interpretor_c::MatchChapterNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 2 )
+ return false;
+
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PTT )
+ return false;
+
+ uint8 i_chapter = data.p_private_data->GetBuffer()[1];
+ uint8 i_ptt = *(uint8*)p_cookie;
+
+ return (i_chapter == i_ptt);
+}
+
+bool dvd_command_interpretor_c::MatchCellNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 5 )
+ return false;
+
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_CN )
+ return false;
+
+ uint8 *i_cell_n = (uint8 *)p_cookie;
+ uint8 i_cell_num = data.p_private_data->GetBuffer()[3];
+
+ return (i_cell_num == *i_cell_n);
+}
+
+bool matroska_script_codec_c::Enter()
+{
+ bool f_result = false;
+ std::vector<KaxChapterProcessData*>::iterator index = enter_cmds.begin();
+ while ( index != enter_cmds.end() )
+ {
+ if ( (*index)->GetSize() )
+ {
+ msg_Dbg( &sys.demuxer, "Matroska Script enter command" );
+ f_result |= interpretor.Interpret( (*index)->GetBuffer(), (*index)->GetSize() );
+ }
+ index++;
+ }
+ return f_result;
+}
+
+bool matroska_script_codec_c::Leave()
+{
+ bool f_result = false;
+ std::vector<KaxChapterProcessData*>::iterator index = leave_cmds.begin();
+ while ( index != leave_cmds.end() )
+ {
+ if ( (*index)->GetSize() )
+ {
+ msg_Dbg( &sys.demuxer, "Matroska Script leave command" );
+ f_result |= interpretor.Interpret( (*index)->GetBuffer(), (*index)->GetSize() );
+ }
+ index++;
+ }
+ return f_result;
+}
+
+// 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;
+
+ char *psz_str = (char*) malloc( i_size + 1 );
+ memcpy( psz_str, p_command, i_size );
+ psz_str[ i_size ] = '\0';
+
+ std::string sz_command = psz_str;
+ free( psz_str );
+
+ msg_Dbg( &sys.demuxer, "command : %s", sz_command.c_str() );
+
+#if defined(__GNUC__) && (__GNUC__ < 3)
+ if ( sz_command.compare( CMD_MS_GOTO_AND_PLAY, 0, CMD_MS_GOTO_AND_PLAY.size() ) == 0 )
+#else
+ if ( sz_command.compare( 0, CMD_MS_GOTO_AND_PLAY.size(), CMD_MS_GOTO_AND_PLAY ) == 0 )
+#endif
+ {
+ size_t i,j;
+
+ // find the (
+ for ( i=CMD_MS_GOTO_AND_PLAY.size(); i<sz_command.size(); i++)
+ {
+ if ( sz_command[i] == '(' )
+ {
+ i++;
+ break;
+ }
+ }
+ // find the )
+ for ( j=i; j<sz_command.size(); j++)
+ {
+ if ( sz_command[j] == ')' )
+ {
+ i--;
+ break;
+ }
+ }
+
+ 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
+ {
+ 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;
+ }
+ }
+
+ return b_result;
+}
+
+void demux_sys_t::SwapButtons()
+{
+#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;
+
+ }
+ for ( i = 0; i<3; i++ )
+ {
+ 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] );
+ }
+ }
+#endif
+}
projects / vlc / blobdiff