X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmkv.cpp;h=70a55b6c0172238191a7ed859d47e3fde6260361;hb=975bd7b51a72dcb025885ddbc4862b333fdf26a6;hp=7867d4b97bfe1304f77a28c3710e908b8cede5d1;hpb=071e4fc6d445d76ec42fb99dbcca5a69521b6079;p=vlc diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index 7867d4b97b..70a55b6c01 100644 --- a/modules/demux/mkv.cpp +++ b/modules/demux/mkv.cpp @@ -19,25 +19,38 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include +/* config.h may include inttypes.h, so make sure we define that option + * early enough. */ +#define __STDC_FORMAT_MACROS 1 +#define __STDC_CONSTANT_MACROS 1 + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include +#include #ifdef HAVE_TIME_H # include /* time() */ #endif -#include -#include /* BITMAPINFOHEADER, WAVEFORMATEX */ -#include "iso_lang.h" +#include /* BITMAPINFOHEADER, WAVEFORMATEX */ +#include #include "vlc_meta.h" +#include +#include +#include #include #include @@ -60,6 +73,7 @@ #include "ebml/StdIOCallback.h" #include "matroska/KaxAttachments.h" +#include "matroska/KaxAttached.h" #include "matroska/KaxBlock.h" #include "matroska/KaxBlockData.h" #include "matroska/KaxChapters.h" @@ -109,7 +123,7 @@ extern "C" { //////////////////////////////////////////////////////////////////////////////////////////////////////////////// #undef ATTRIBUTE_PACKED -#undef PRAGMA_PACK_BEGIN +#undef PRAGMA_PACK_BEGIN #undef PRAGMA_PACK_END #if defined(__GNUC__) @@ -149,7 +163,7 @@ 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; @@ -158,7 +172,7 @@ typedef struct { 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; @@ -167,7 +181,7 @@ typedef struct { 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; @@ -179,7 +193,7 @@ typedef struct { #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; @@ -188,7 +202,7 @@ typedef struct { 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; @@ -197,7 +211,7 @@ typedef struct { 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; @@ -218,7 +232,7 @@ typedef struct { #define COMMAND_DATA_SIZE 8 /** - * PCI General Information + * PCI General Information */ typedef struct { uint32_t nv_pck_lbn; /**< sector address of this nav pack */ @@ -239,8 +253,8 @@ typedef struct { uint32_t nsml_agl_dsta[9]; /**< address of destination vobu in AGL_C#n */ } ATTRIBUTE_PACKED nsml_agli_t; -/** - * Highlight General Information +/** + * Highlight General Information * * For btngrX_dsp_ty the bits have the following meaning: * 000b: normal 4/3 only buttons @@ -273,7 +287,7 @@ typedef struct { 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 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) */ @@ -281,19 +295,19 @@ typedef struct { } ATTRIBUTE_PACKED hl_gi_t; -/** - * Button Color Information Table +/** + * Button Color Information Table * Each entry beeing a 32bit word that contains the color indexs and alpha * values to use. They are all represented by 4 bit number and stored * like this [Ci3, Ci2, Ci1, Ci0, A3, A2, A1, A0]. The actual palette * that the indexes reference is in the PGC. - * @TODO split the uint32_t into a struct + * \todo split the uint32_t into a struct */ typedef struct { uint32_t btn_coli[3][2]; /**< [button color number-1][select:0/action:1] */ } ATTRIBUTE_PACKED btn_colit_t; -/** +/** * Button Information * * NOTE: I've had to change the structure from the disk layout to get @@ -346,7 +360,7 @@ typedef struct { } ATTRIBUTE_PACKED btni_t; /** - * Highlight Information + * Highlight Information */ typedef struct { hl_gi_t hl_gi; @@ -391,31 +405,31 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_shortname( "Matroska" ); - set_description( _("Matroska stream demuxer" ) ); - set_capability( "demux2", 50 ); + set_description( N_("Matroska stream demuxer" ) ); + set_capability( "demux", 50 ); set_callbacks( Open, Close ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_DEMUX ); add_bool( "mkv-use-ordered-chapters", 1, NULL, N_("Ordered chapters"), - N_("Play ordered chapters as specified in the segment."), VLC_TRUE ); + N_("Play ordered chapters as specified in the segment."), 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."), 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 ); + N_("Preload matroska files from the same family in the same directory (not good for broken files)."), 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."), 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)."), true ); add_shortcut( "mka" ); add_shortcut( "mkv" ); @@ -477,7 +491,7 @@ block_t *block_zlib_decompress( vlc_object_t *p_this, block_t *p_in_block ) { /** * Helper function to print the mkv parse tree */ -static void MkvTree( demux_t & demuxer, int i_level, char *psz_format, ... ) +static void MkvTree( demux_t & demuxer, int i_level, const char *psz_format, ... ) { va_list args; if( i_level > 9 ) @@ -486,17 +500,17 @@ static void MkvTree( demux_t & demuxer, int i_level, char *psz_format, ... ) return; } va_start( args, psz_format ); - static char *psz_foo = "| | | | | | | | | |"; + static const char psz_foo[] = "| | | | | | | | | |"; char *psz_foo2 = (char*)malloc( ( i_level * 4 + 3 + strlen( psz_format ) ) * sizeof(char) ); strncpy( psz_foo2, psz_foo, 4 * i_level ); psz_foo2[ 4 * i_level ] = '+'; psz_foo2[ 4 * i_level + 1 ] = ' '; strcpy( &psz_foo2[ 4 * i_level + 2 ], psz_format ); - __msg_GenericVa( VLC_OBJECT(&demuxer), VLC_MSG_DBG, "mkv", psz_foo2, args ); + __msg_GenericVa( VLC_OBJECT(&demuxer),VLC_MSG_DBG, "mkv", psz_foo2, args ); free( psz_foo2 ); va_end( args ); } - + /***************************************************************************** * Stream managment *****************************************************************************/ @@ -504,11 +518,11 @@ class vlc_stream_io_callback: public IOCallback { private: stream_t *s; - vlc_bool_t mb_eof; - vlc_bool_t b_owner; + bool mb_eof; + bool b_owner; public: - vlc_stream_io_callback( stream_t *, vlc_bool_t ); + vlc_stream_io_callback( stream_t *, bool ); virtual ~vlc_stream_io_callback() { @@ -550,8 +564,8 @@ class EbmlParser EbmlElement *m_got; int mi_user_level; - vlc_bool_t mb_keep; - vlc_bool_t mb_dummy; + bool mb_keep; + bool mb_dummy; }; @@ -569,8 +583,10 @@ static vlc_fourcc_t __GetFOURCC( uint8_t *p ) *****************************************************************************/ typedef struct { - vlc_bool_t b_default; - vlc_bool_t b_enabled; +// ~mkv_track_t(); + + bool b_default; + bool b_enabled; unsigned int i_number; int i_extra_data; @@ -587,21 +603,24 @@ typedef struct float f_fps; es_out_id_t *p_es; - vlc_bool_t b_inited; + /* audio */ + unsigned int i_original_rate; + + bool b_inited; /* data to be send first */ int i_data_init; uint8_t *p_data_init; /* hack : it's for seek */ - vlc_bool_t b_search_keyframe; - vlc_bool_t b_silent; + bool b_search_keyframe; + bool b_silent; /* informative */ - char *psz_codec_name; - char *psz_codec_settings; - char *psz_codec_info_url; - char *psz_codec_download_url; - + const char *psz_codec_name; + const char *psz_codec_settings; + const char *psz_codec_info_url; + const char *psz_codec_download_url; + /* encryption/compression */ int i_compression_type; KaxContentCompSettings *p_compression_data; @@ -616,7 +635,7 @@ typedef struct int64_t i_position; int64_t i_time; - vlc_bool_t b_key; + bool b_key; } mkv_index_t; class demux_sys_t; @@ -637,8 +656,8 @@ public: ,i_codec_id( codec_id ) ,sys( demuxer ) {} - - virtual ~chapter_codec_cmds_c() + + virtual ~chapter_codec_cmds_c() { delete p_private_data; std::vector::iterator indexe = enter_cmds.begin(); @@ -667,7 +686,7 @@ public: } void AddCommand( const KaxChapterProcessCommand & command ); - + /// \return wether the codec has seeked in the files or not virtual bool Enter() { return false; } virtual bool Leave() { return false; } @@ -701,9 +720,9 @@ public: p_PRMs[ 0x80 + 16 ] = 0xFFFFu; p_PRMs[ 0x80 + 18 ] = 0xFFFFu; } - + bool Interpret( const binary * p_command, size_t i_size = 8 ); - + uint16 GetPRM( size_t index ) const { if ( index < 256 ) @@ -735,7 +754,7 @@ public: } return false; } - + bool SetGPRM( size_t index, uint16 value ) { if ( index >= 0 && index < 16 ) @@ -792,7 +811,7 @@ protected: uint16 p_PRMs[256]; demux_sys_t & sys; - + // DVD command IDs // Tests @@ -805,7 +824,7 @@ protected: 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; @@ -834,7 +853,7 @@ protected: 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 ); @@ -868,10 +887,10 @@ public: {} bool Interpret( const binary * p_command, size_t i_size ); - + // DVD command IDs static const std::string CMD_MS_GOTO_AND_PLAY; - + protected: demux_sys_t & sys; }; @@ -891,7 +910,7 @@ public: bool Leave(); protected: - matroska_script_interpretor_c interpretor; + matroska_script_interpretor_c interpretor; }; class chapter_translation_c @@ -947,14 +966,14 @@ public: virtual chapter_item_c * FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current, bool & b_found ); void Append( const chapter_item_c & edition ); chapter_item_c * FindChapter( int64_t i_find_uid ); - virtual chapter_item_c *BrowseCodecPrivate( unsigned int codec_id, - bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), - const void *p_cookie, + 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 */ std::vector sub_chapters; @@ -965,7 +984,7 @@ public: std::string psz_name; chapter_item_c *psz_parent; bool b_is_leaving; - + std::vector codecs; static bool CompareTimecode( const chapter_item_c * itemA, const chapter_item_c * itemB ) @@ -984,12 +1003,12 @@ public: chapter_edition_c() :b_ordered(false) {} - + void RefreshChapters( ); mtime_t Duration() const; std::string GetMainName() const; chapter_item_c * FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current ); - + bool b_ordered; }; @@ -1012,7 +1031,7 @@ public: ,p_segment_uid(NULL) ,p_prev_segment_uid(NULL) ,p_next_segment_uid(NULL) - ,b_cues(VLC_FALSE) + ,b_cues(false) ,i_index(0) ,i_index_max(1024) ,psz_muxing_application(NULL) @@ -1036,43 +1055,18 @@ public: { delete tracks[i_track]->p_compression_data; } - if( tracks[i_track]->fmt.psz_description ) - { - free( tracks[i_track]->fmt.psz_description ); - } - if( tracks[i_track]->psz_codec ) - { - free( tracks[i_track]->psz_codec ); - } - if( tracks[i_track]->fmt.psz_language ) - { - free( tracks[i_track]->fmt.psz_language ); - } + es_format_Clean( &tracks[i_track]->fmt ); + free( tracks[i_track]->p_extra_data ); + free( tracks[i_track]->psz_codec ); delete tracks[i_track]; } - - if( psz_writing_application ) - { - free( psz_writing_application ); - } - if( psz_muxing_application ) - { - free( psz_muxing_application ); - } - if( psz_segment_filename ) - { - free( psz_segment_filename ); - } - if( psz_title ) - { - free( psz_title ); - } - if( psz_date_utc ) - { - free( psz_date_utc ); - } - if ( p_indexes ) - free( p_indexes ); + + free( psz_writing_application ); + free( psz_muxing_application ); + free( psz_segment_filename ); + free( psz_title ); + free( psz_date_utc ); + free( p_indexes ); delete ep; delete segment; @@ -1126,7 +1120,7 @@ public: KaxPrevUID *p_prev_segment_uid; KaxNextUID *p_next_segment_uid; - vlc_bool_t b_cues; + bool b_cues; int i_index; int i_index_max; mkv_index_t *p_indexes; @@ -1146,7 +1140,7 @@ public: std::vector translations; std::vector families; - + demux_sys_t & sys; EbmlParser *ep; bool b_preloaded; @@ -1154,6 +1148,7 @@ public: bool Preload( ); bool PreloadFamily( const matroska_segment_c & segment ); void ParseInfo( KaxInfo *info ); + void ParseAttachments( KaxAttachments *attachments ); void ParseChapters( KaxChapters *chapters ); void ParseSeekHead( KaxSeekHead *seekhead ); void ParseTracks( KaxTracks *tracks ); @@ -1242,9 +1237,9 @@ public: 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, + 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 ); @@ -1292,12 +1287,31 @@ typedef struct demux_t *p_demux; vlc_mutex_t lock; - vlc_bool_t b_moved; - vlc_bool_t b_clicked; - vlc_bool_t b_key; + bool b_moved; + bool b_clicked; + int i_key_action; } event_thread_t; + +class attachment_c +{ +public: + attachment_c() + :p_data(NULL) + ,i_size(0) + {} + virtual ~attachment_c() + { + free( p_data ); + } + + std::string psz_file_name; + std::string psz_mime_type; + void *p_data; + int i_size; +}; + class demux_sys_t { public: @@ -1316,7 +1330,7 @@ public: ,b_pci_packet_set(false) ,p_ev(NULL) { - vlc_mutex_init( &demuxer, &lock_demuxer ); + vlc_mutex_init( &lock_demuxer ); } virtual ~demux_sys_t() @@ -1329,6 +1343,13 @@ public: delete opened_segments[i]; for ( i=0; i streams; + std::vector stored_attachments; std::vector opened_segments; std::vector used_segments; virtual_segment_c *p_current_segment; @@ -1355,10 +1377,10 @@ public: 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, + 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 ); @@ -1415,8 +1437,8 @@ static int Open( vlc_object_t * p_this ) demux_sys_t *p_sys; matroska_stream_c *p_stream; matroska_segment_c *p_segment; - uint8_t *p_peek; - std::string s_path, s_filename; + const uint8_t *p_peek; + std::string s_path, s_filename; vlc_stream_io_callback *p_io_callback; EbmlStream *p_io_stream; @@ -1432,7 +1454,7 @@ static int Open( vlc_object_t * p_this ) p_demux->pf_control = Control; p_demux->p_sys = p_sys = new demux_sys_t( *p_demux ); - p_io_callback = new vlc_stream_io_callback( p_demux->s, VLC_FALSE ); + p_io_callback = new vlc_stream_io_callback( p_demux->s, false ); p_io_stream = new EbmlStream( *p_io_callback ); if( p_io_stream == NULL ) @@ -1482,43 +1504,56 @@ static int Open( vlc_object_t * p_this ) } else { - if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0) + 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()); + DIR *p_src_dir = utf8_opendir(s_path.c_str()); if (p_src_dir != NULL) { - while ((p_file_item = (dirent *) readdir(p_src_dir))) + char *psz_file; + while ((psz_file = utf8_readdir(p_src_dir)) != NULL) { - if (strlen(p_file_item->d_name) > 4) + if (strlen(psz_file) > 4) { - s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name; + s_filename = s_path + DIRECTORY_SEPARATOR + psz_file; #ifdef WIN32 if (!strcasecmp(s_filename.c_str(), p_demux->psz_path)) #else if (!s_filename.compare(p_demux->psz_path)) #endif + { + free (psz_file); continue; // don't reuse the original opened file + } #if defined(__GNUC__) && (__GNUC__ < 3) - if (!s_filename.compare("mkv", 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") || + 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 our family - stream_t *p_file_stream = stream_UrlNew( p_demux, s_filename.c_str()); - if ( p_file_stream != NULL ) + const uint8_t *p_peek; + bool file_ok = false; + stream_t *p_file_stream = stream_UrlNew( + p_demux, + s_filename.c_str()); + /* peek the begining */ + if( p_file_stream && + stream_Peek( p_file_stream, &p_peek, 4 ) >= 4 + && p_peek[0] == 0x1a && p_peek[1] == 0x45 && + p_peek[2] == 0xdf && p_peek[3] == 0xa3 ) file_ok = true; + + if ( file_ok ) { - vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, VLC_TRUE ); + vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, true ); EbmlStream *p_estream = new EbmlStream(*p_file_io); p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_estream ); @@ -1538,10 +1573,14 @@ static int Open( vlc_object_t * p_this ) } else { + if( p_file_stream ) { + stream_Delete( p_file_stream ); + } msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() ); } } } + free (psz_file); } closedir( p_src_dir ); } @@ -1559,7 +1598,7 @@ static int Open( vlc_object_t * p_this ) } p_sys->StartUiThread(); - + return VLC_SUCCESS; error: @@ -1589,13 +1628,36 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) int i_skp; size_t i_idx; - vlc_meta_t **pp_meta; + vlc_meta_t *p_meta; + input_attachment_t ***ppp_attach; + int *pi_int; + int i; switch( i_query ) { + case DEMUX_GET_ATTACHMENTS: + ppp_attach = (input_attachment_t***)va_arg( args, input_attachment_t*** ); + pi_int = (int*)va_arg( args, int * ); + + if( p_sys->stored_attachments.size() <= 0 ) + return VLC_EGENERIC; + + *pi_int = p_sys->stored_attachments.size(); + *ppp_attach = (input_attachment_t**)malloc( sizeof(input_attachment_t**) * + p_sys->stored_attachments.size() ); + if( !(*ppp_attach) ) + return VLC_ENOMEM; + for( i = 0; i < p_sys->stored_attachments.size(); i++ ) + { + attachment_c *a = p_sys->stored_attachments[i]; + (*ppp_attach)[i] = vlc_input_attachment_New( a->psz_file_name.c_str(), a->psz_mime_type.c_str(), NULL, + a->p_data, a->i_size ); + } + return VLC_SUCCESS; + case DEMUX_GET_META: - pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** ); - *pp_meta = vlc_meta_Duplicate( p_sys->meta ); + p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* ); + vlc_meta_Merge( p_meta, p_sys->meta ); return VLC_SUCCESS; case DEMUX_GET_LENGTH: @@ -1624,7 +1686,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_TITLE_INFO: - if( p_sys->titles.size() ) + if( p_sys->titles.size() > 1 || ( p_sys->titles.size() == 1 && p_sys->titles[0]->i_seekpoint > 0 ) ) { input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** ); int *pi_int = (int*)va_arg( args, int* ); @@ -1636,7 +1698,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] ); } - return VLC_SUCCESS; } return VLC_EGENERIC; @@ -1708,7 +1769,7 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64 else #endif idx.i_time = (*pp_block).GlobalTimecode() / (mtime_t)1000; - idx.b_key = *pi_ref1 == 0 ? VLC_TRUE : VLC_FALSE; + idx.b_key = *pi_ref1 == 0 ? true : false; } #undef idx return VLC_SUCCESS; @@ -1746,7 +1807,7 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64 // reset silent tracks for (size_t i=0; ib_silent = VLC_FALSE; + tracks[i]->b_silent = false; } ep->Down(); @@ -1828,7 +1889,7 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64 { if ( tracks[i]->i_number == uint32(track_num)) { - tracks[i]->b_silent = VLC_TRUE; + tracks[i]->b_silent = true; break; } } @@ -1851,7 +1912,7 @@ static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, int i_mem, size_t } #if LIBMATROSKA_VERSION >= 0x000800 -static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock, +static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock, mtime_t i_pts, mtime_t i_duration, bool f_mandatory ) #else static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, @@ -1863,7 +1924,7 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, size_t i_track; unsigned int i; - vlc_bool_t b; + bool b; #define tk p_segment->tracks[i_track] for( i_track = 0; i_track < p_segment->tracks.size(); i_track++ ) @@ -1881,12 +1942,12 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, if( i_track >= p_segment->tracks.size() ) { - msg_Err( p_demux, "invalid track number=%d", block->TrackNum() ); + msg_Err( p_demux, "invalid track number" ); return; } if( tk->fmt.i_cat != NAV_ES && tk->p_es == NULL ) { - msg_Err( p_demux, "unknown track number=%d", block->TrackNum() ); + msg_Err( p_demux, "unknown track number" ); return; } if( i_pts + i_duration < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES ) @@ -1900,7 +1961,7 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, if( !b ) { - tk->b_inited = VLC_FALSE; + tk->b_inited = false; return; } } @@ -1915,11 +1976,11 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, p_init = MemToBlock( p_demux, tk->p_data_init, tk->i_data_init, 0 ); if( p_init ) es_out_Send( p_demux->out, tk->p_es, p_init ); } - tk->b_inited = VLC_TRUE; + tk->b_inited = true; #if LIBMATROSKA_VERSION >= 0x000800 - for( i = 0; + for( i = 0; (block != NULL && i < block->NumberFrames()) || (simpleblock != NULL && i < simpleblock->NumberFrames()); i++ ) #else @@ -1994,14 +2055,14 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, if ( f_mandatory ) p_block->i_dts = p_block->i_pts; else - p_block->i_dts = min( i_pts, tk->i_last_dts + (tk->i_default_duration >> 10)); + p_block->i_dts = min( i_pts, tk->i_last_dts + (mtime_t)(tk->i_default_duration >> 10)); p_sys->i_pts = p_block->i_dts; } } tk->i_last_dts = p_block->i_dts; #if 0 -msg_Dbg( p_demux, "block i_dts: "I64Fd" / i_pts: "I64Fd, p_block->i_dts, p_block->i_pts); +msg_Dbg( p_demux, "block i_dts: %"PRId64" / i_pts: %"PRId64, p_block->i_dts, p_block->i_pts); #endif if( strcmp( tk->psz_codec, "S_VOBSUB" ) ) { @@ -2046,13 +2107,13 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS #if LIBMATROSKA_VERSION >= 0x000800 if (uint64(doc_read_version) > 2) { - msg_Err( p_demux, "This matroska file is needs version "I64Fd" and this VLC only supports version 1 & 2", uint64(doc_read_version)); + msg_Err( p_demux, "This matroska file is needs version %"PRId64" and this VLC only supports version 1 & 2", uint64(doc_read_version)); return NULL; } #else if (uint64(doc_read_version) != 1) { - msg_Err( p_demux, "This matroska file is needs version "I64Fd" and this VLC only supports version 1", uint64(doc_read_version)); + msg_Err( p_demux, "This matroska file is needs version %"PRId64" and this VLC only supports version 1", uint64(doc_read_version)); return NULL; } #endif @@ -2126,7 +2187,10 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS p_stream1->segments.push_back( p_segment1 ); } else + { + p_segment1->segment = NULL; delete p_segment1; + } } if (p_l0->IsFiniteSize() ) { @@ -2191,23 +2255,104 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' ); } + else if( !strncmp( tracks[i_track]->psz_codec, "V_THEORA", 8 ) ) + { + uint8_t *p_data = tracks[i_track]->p_extra_data; + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 't', 'h', 'e', 'o' ); + if( tracks[i_track]->i_extra_data >= 4 ) { + if( p_data[0] == 2 ) { + int i = 1; + int i_size1 = 0, i_size2 = 0; + p_data++; + /* read size of first header packet */ + while( *p_data == 0xFF && + i < tracks[i_track]->i_extra_data ) + { + i_size1 += *p_data; + p_data++; + i++; + } + i_size1 += *p_data; + p_data++; + i++; + msg_Dbg( &sys.demuxer, "first theora header size %d", i_size1 ); + /* read size of second header packet */ + while( *p_data == 0xFF && + i < tracks[i_track]->i_extra_data ) + { + i_size2 += *p_data; + p_data++; + i++; + } + i_size2 += *p_data; + p_data++; + i++; + int i_size3 = tracks[i_track]->i_extra_data - i - i_size1 + - i_size2; + msg_Dbg( &sys.demuxer, "second theora header size %d", i_size2 ); + msg_Dbg( &sys.demuxer, "third theora header size %d", i_size3 ); + tracks[i_track]->fmt.i_extra = i_size1 + i_size2 + i_size3 + + 6; + if( i_size1 > 0 && i_size2 > 0 && i_size3 > 0 ) { + tracks[i_track]->fmt.p_extra = + malloc( tracks[i_track]->fmt.i_extra ); + uint8_t *p_out = (uint8_t*)tracks[i_track]->fmt.p_extra; + *p_out++ = (i_size1>>8) & 0xFF; + *p_out++ = i_size1 & 0xFF; + memcpy( p_out, p_data, i_size1 ); + p_data += i_size1; + p_out += i_size1; + + *p_out++ = (i_size2>>8) & 0xFF; + *p_out++ = i_size2 & 0xFF; + memcpy( p_out, p_data, i_size2 ); + p_data += i_size2; + p_out += i_size2; + + *p_out++ = (i_size3>>8) & 0xFF; + *p_out++ = i_size3 & 0xFF; + memcpy( p_out, p_data, i_size3 ); + p_data += i_size3; + p_out += i_size3; + } + else + { + msg_Err( &sys.demuxer, "inconsistant theora extradata" ); + } + } + else { + msg_Err( &sys.demuxer, "Wrong number of ogg packets with theora headers (%d)", p_data[0] + 1 ); + } + } + } + else if( !strncmp( tracks[i_track]->psz_codec, "V_REAL/RV", 9 ) ) + { + if( !strcmp( tracks[i_track]->psz_codec, "V_REAL/RV10" ) ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'R', 'V', '1', '0' ); + else if( !strcmp( tracks[i_track]->psz_codec, "V_REAL/RV20" ) ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'R', 'V', '2', '0' ); + else if( !strcmp( tracks[i_track]->psz_codec, "V_REAL/RV30" ) ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'R', 'V', '3', '0' ); + else if( !strcmp( tracks[i_track]->psz_codec, "V_REAL/RV40" ) ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'R', 'V', '4', '0' ); + } else if( !strncmp( tracks[i_track]->psz_codec, "V_MPEG4", 7 ) ) { if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG4/MS/V3" ) ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' ); } - else if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG4/ISO/AVC" ) ) + else if( !strncmp( tracks[i_track]->psz_codec, "V_MPEG4/ISO", 11 ) ) { - tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', 'v', 'c', '1' ); + /* A MPEG 4 codec, SP, ASP, AP or AVC */ + if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG4/ISO/AVC" ) ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', 'v', 'c', '1' ); + else + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); memcpy( tracks[i_track]->fmt.p_extra,tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); } - else - { - tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); - } } else if( !strcmp( tracks[i_track]->psz_codec, "V_QUICKTIME" ) ) { @@ -2215,7 +2360,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) stream_t *p_mp4_stream = stream_MemoryNew( VLC_OBJECT(&sys.demuxer), tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data, - VLC_FALSE ); + false ); MP4_ReadBoxCommon( p_mp4_stream, p_box ); MP4_ReadBox_sample_vide( p_mp4_stream, p_box ); tracks[i_track]->fmt.i_codec = p_box->i_type; @@ -2316,7 +2461,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) else if( !strncmp( tracks[i_track]->psz_codec, "A_AAC/MPEG2/", strlen( "A_AAC/MPEG2/" ) ) || !strncmp( tracks[i_track]->psz_codec, "A_AAC/MPEG4/", strlen( "A_AAC/MPEG4/" ) ) ) { - int i_profile, i_srate; + int i_profile, i_srate, sbr = 0; static unsigned int i_sample_rates[] = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, @@ -2338,6 +2483,11 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) { i_profile = 2; } + else if( !strcmp( &tracks[i_track]->psz_codec[12], "LC/SBR" ) ) + { + i_profile = 1; + sbr = 1; + } else { i_profile = 3; @@ -2345,17 +2495,49 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) for( i_srate = 0; i_srate < 13; i_srate++ ) { - if( i_sample_rates[i_srate] == tracks[i_track]->fmt.audio.i_rate ) + if( i_sample_rates[i_srate] == tracks[i_track]->i_original_rate ) { break; } } msg_Dbg( &sys.demuxer, "profile=%d srate=%d", i_profile, i_srate ); - tracks[i_track]->fmt.i_extra = 2; + tracks[i_track]->fmt.i_extra = sbr ? 5 : 2; tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->fmt.i_extra ); ((uint8_t*)tracks[i_track]->fmt.p_extra)[0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1); ((uint8_t*)tracks[i_track]->fmt.p_extra)[1] = ((i_srate & 0x1) << 7) | (tracks[i_track]->fmt.audio.i_channels << 3); + if (sbr != 0) + { + int syncExtensionType = 0x2B7; + int iDSRI; + for (iDSRI=0; iDSRI<13; iDSRI++) + if( i_sample_rates[iDSRI] == tracks[i_track]->fmt.audio.i_rate ) + break; + ((uint8_t*)tracks[i_track]->fmt.p_extra)[2] = (syncExtensionType >> 3) & 0xFF; + ((uint8_t*)tracks[i_track]->fmt.p_extra)[3] = ((syncExtensionType & 0x7) << 5) | 5; + ((uint8_t*)tracks[i_track]->fmt.p_extra)[4] = ((1 & 0x1) << 7) | (iDSRI << 3); + } + } + else if( !strcmp( tracks[i_track]->psz_codec, "A_AAC" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); + tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); + memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); + } + else if( !strcmp( tracks[i_track]->psz_codec, "A_WAVPACK4" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'W', 'V', 'P', 'K' ); + tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); + memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); + } + else if( !strcmp( tracks[i_track]->psz_codec, "A_TTA1" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'T', 'T', 'A', '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 if( !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/BIG" ) || !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/LIT" ) || @@ -2371,23 +2553,72 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) } 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( tracks[i_track]->psz_codec, "A_TTA1" ) ) + /* disabled due to the potential "S_KATE" namespace issue */ + else if( !strcmp( tracks[i_track]->psz_codec, "S_KATE" ) ) { - /* FIXME: support this codec */ - msg_Err( &sys.demuxer, "TTA not supported yet[%d, n=%d]", (int)i_track, tracks[i_track]->i_number ); - tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); - } - else if( !strcmp( tracks[i_track]->psz_codec, "A_WAVPACK4" ) ) - { - /* FIXME: support this codec */ - msg_Err( &sys.demuxer, "Wavpack not supported yet[%d, n=%d]", (int)i_track, tracks[i_track]->i_number ); - tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); + int i, i_offset = 1, *i_size, i_extra, num_headers, size_so_far; + uint8_t *p_extra; + + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'k', 'a', 't', 'e' ); + tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" ); + + /* Recover the number of headers to expect */ + num_headers = tracks[i_track]->p_extra_data[0]+1; + msg_Dbg( &sys.demuxer, "kate in mkv detected: %d headers in %u bytes", + num_headers, tracks[i_track]->i_extra_data); + + /* this won't overflow the stack as is can allocate only 1020 bytes max */ + i_size = (int*)alloca(num_headers*sizeof(int)); + + /* Split the headers */ + size_so_far = 0; + for( i = 0; i < num_headers-1; i++ ) + { + i_size[i] = 0; + while( i_offset < tracks[i_track]->i_extra_data ) + { + i_size[i] += tracks[i_track]->p_extra_data[i_offset]; + if( tracks[i_track]->p_extra_data[i_offset++] != 0xff ) break; + } + msg_Dbg( &sys.demuxer, "kate header %d is %d bytes", i, i_size[i]); + size_so_far += i_size[i]; + } + i_size[num_headers-1] = tracks[i_track]->i_extra_data - (size_so_far+i_offset); + msg_Dbg( &sys.demuxer, "kate last header (%d) is %d bytes", num_headers-1, i_size[num_headers-1]); + + tracks[i_track]->fmt.i_extra = 1 + num_headers * 2 + size_so_far + i_size[num_headers-1]; + 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; + *(p_extra++) = num_headers; + ++i_extra; + for( i = 0; i < num_headers; i++ ) + { + *(p_extra++) = i_size[i] >> 8; + *(p_extra++) = i_size[i] & 0xFF; + memcpy( p_extra, tracks[i_track]->p_extra_data + i_offset + i_extra-1, + i_size[i] ); + p_extra += i_size[i]; + i_extra += i_size[i]; + } } else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/UTF8" ) ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" ); } + else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/USF" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 's', 'f', ' ' ); + tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" ); + if( tracks[i_track]->i_extra_data ) + { + tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); + memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); + } + } else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/SSA" ) || !strcmp( tracks[i_track]->psz_codec, "S_TEXT/ASS" ) || !strcmp( tracks[i_track]->psz_codec, "S_SSA" ) || @@ -2395,6 +2626,12 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 's', 'a', ' ' ); tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" ); + if( tracks[i_track]->i_extra_data ) + { + tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); + memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); + } } else if( !strcmp( tracks[i_track]->psz_codec, "S_VOBSUB" ) ) { @@ -2405,7 +2642,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) char *p_buf = (char *)malloc( tracks[i_track]->i_extra_data + 1); memcpy( p_buf, tracks[i_track]->p_extra_data , tracks[i_track]->i_extra_data ); p_buf[tracks[i_track]->i_extra_data] = '\0'; - + p_start = strstr( p_buf, "size:" ); if( sscanf( p_start, "size: %dx%d", &tracks[i_track]->fmt.subs.spu.i_original_frame_width, &tracks[i_track]->fmt.subs.spu.i_original_frame_height ) == 2 ) @@ -2426,7 +2663,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) } else { - msg_Err( &sys.demuxer, "unknow codec id=`%s'", tracks[i_track]->psz_codec ); + msg_Err( &sys.demuxer, "unknown codec id=`%s'", tracks[i_track]->psz_codec ); tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); } if( tracks[i_track]->b_default ) @@ -2436,9 +2673,21 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) tracks[i_track]->p_es = es_out_Add( sys.demuxer.out, &tracks[i_track]->fmt ); + /* Turn on a subtitles track if it has been flagged as default - + * but only do this if no subtitles track has already been engaged, + * either by an earlier 'default track' (??) or by default + * language choice behaviour. + */ + if( tracks[i_track]->b_default ) + { + es_out_Control( sys.demuxer.out, + ES_OUT_SET_DEFAULT, + tracks[i_track]->p_es ); + } + 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; // reset the stream reading to the first cluster of the segment used es.I_O().setFilePointer( i_start_pos ); @@ -2470,10 +2719,10 @@ void demux_sys_t::StartUiThread() /* 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 ); + p_ev->b_die = false; + vlc_mutex_init( &p_ev->lock ); vlc_thread_create( p_ev, "mkv event thread handler", EventThread, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ); + VLC_THREAD_PRIORITY_LOW, false ); } } @@ -2481,10 +2730,9 @@ void demux_sys_t::StopUiThread() { if ( b_ui_hooked ) { - p_ev->b_die = VLC_TRUE; - + vlc_object_kill( p_ev ); vlc_thread_join( p_ev ); - vlc_object_destroy( p_ev ); + vlc_object_release( p_ev ); p_ev = NULL; @@ -2511,22 +2759,22 @@ int demux_sys_t::EventMouse( vlc_object_t *p_this, char const *psz_var, vlc_mutex_lock( &p_ev->lock ); if( psz_var[6] == 'c' ) { - p_ev->b_clicked = VLC_TRUE; + p_ev->b_clicked = true; msg_Dbg( p_this, "Event Mouse: clicked"); } else if( psz_var[6] == 'm' ) - p_ev->b_moved = VLC_TRUE; + p_ev->b_moved = 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 ) +int demux_sys_t::EventKey( vlc_object_t *p_this, char const *, + vlc_value_t, 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; + p_ev->i_key_action = newval.i_int; vlc_mutex_unlock( &p_ev->lock ); msg_Dbg( p_this, "Event Key"); @@ -2539,15 +2787,15 @@ int demux_sys_t::EventThread( vlc_object_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; + p_ev->b_moved = false; + p_ev->b_clicked = false; + p_ev->i_key_action = 0; /* catch all key event */ - var_AddCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev ); + var_AddCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev ); /* main loop */ - while( !p_ev->b_die ) + while( vlc_object_alive (p_ev) ) { if ( !p_sys->b_pci_packet_set ) { @@ -2556,14 +2804,12 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) continue; } - vlc_bool_t b_activated = VLC_FALSE; + bool b_activated = false; /* KEY part */ - if( p_ev->b_key ) + if( p_ev->i_key_action ) { - vlc_value_t valk; - struct vlc_t::hotkey *p_hotkeys = p_ev->p_vlc->p_hotkeys; - int i, i_action = -1; + int i; msg_Dbg( p_ev->p_demux, "Handle Key Event"); @@ -2571,18 +2817,9 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) 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 ) + switch( p_ev->i_key_action ) { case ACTIONID_NAV_LEFT: if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns ) @@ -2677,8 +2914,8 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) } break; case ACTIONID_NAV_ACTIVATE: - b_activated = VLC_TRUE; - + b_activated = 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]; @@ -2696,7 +2933,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) default: break; } - p_ev->b_key = VLC_FALSE; + p_ev->i_key_action = 0; vlc_mutex_unlock( &p_ev->lock ); } @@ -2718,18 +2955,18 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) 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; + b_activated = true; // get current button best = 0; dist = 0x08000000; /* >> than (720*720)+(567*567); */ - for(button = 1; button <= pci->hli.hl_gi.btn_ns; button++) + 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)) + && ((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; @@ -2797,7 +3034,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) 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 ); + val.b_bool = true; var_Set( p_sys->p_input, "highlight", val ); vlc_mutex_unlock( p_mutex ); } } @@ -2810,13 +3047,13 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) // dvdnav_mouse_select( NULL, pci, valx.i_int, valy.i_int ); } - p_ev->b_moved = VLC_FALSE; - p_ev->b_clicked = VLC_FALSE; + p_ev->b_moved = false; + p_ev->b_clicked = false; vlc_mutex_unlock( &p_ev->lock ); } /* VOUT part */ - if( p_vout && p_vout->b_die ) + if( p_vout && !vlc_object_alive (p_vout) ) { var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev ); var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); @@ -2846,7 +3083,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) 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 ); + var_DelCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev ); vlc_mutex_destroy( &p_ev->lock ); @@ -2888,7 +3125,11 @@ void virtual_segment_c::PrepareChapters( ) p_segment = linked_segments[i]; // FIXME assume we have the same editions in all segments for (j=0; jstored_editions.size(); j++) + { + if( j >= p_editions->size() ) /* Protect against broken files (?) */ + break; (*p_editions)[j]->Append( *p_segment->stored_editions[j] ); + } } } @@ -2964,7 +3205,7 @@ bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux ) Seek( demux, sys.i_pts, 0, psz_curr_chapter ); } } - + if ( !b_has_seeked ) { psz_current_chapter = psz_curr_chapter; @@ -2993,9 +3234,9 @@ bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux ) 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, +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 @@ -3022,9 +3263,9 @@ chapter_item_c *virtual_segment_c::FindChapter( int64_t i_find_uid ) 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, +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 @@ -3035,7 +3276,7 @@ chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id, return this; index++; } - + // sub-chapters chapter_item_c *p_result = NULL; std::vector::const_iterator index2 = sub_chapters.begin(); @@ -3046,7 +3287,7 @@ chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id, return p_result; index2++; } - + return p_result; } @@ -3185,7 +3426,7 @@ static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_it int i_index; - msg_Dbg( p_demux, "seek request to "I64Fd" (%f%%)", i_date, f_percent ); + msg_Dbg( p_demux, "seek request to %"PRId64" (%f%%)", i_date, f_percent ); if( i_date < 0 && f_percent < 0 ) { msg_Warn( p_demux, "cannot seek nowhere !" ); @@ -3284,14 +3525,14 @@ static int Demux( demux_t *p_demux) i_return = 1; break; } - + if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL ) { /* nothing left to read in this ordered edition */ if ( !p_vsegment->SelectNext() ) break; p_segment->UnSelect( ); - + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); /* switch to the next segment */ @@ -3339,7 +3580,7 @@ static int Demux( demux_t *p_demux) { msg_Warn( p_demux, "cannot get block EOF?" ); p_segment->UnSelect( ); - + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); /* switch to the next segment */ @@ -3375,7 +3616,7 @@ static int Demux( demux_t *p_demux) break; } } - + if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL ) { /* nothing left to read in this ordered edition */ @@ -3385,7 +3626,7 @@ static int Demux( demux_t *p_demux) break; } p_segment->UnSelect( ); - + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); /* switch to the next segment */ @@ -3427,11 +3668,11 @@ static int Demux( demux_t *p_demux) /***************************************************************************** * Stream managment *****************************************************************************/ -vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_, vlc_bool_t b_owner_ ) +vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_, bool b_owner_ ) { s = s_; b_owner = b_owner_; - mb_eof = VLC_FALSE; + mb_eof = false; } uint32 vlc_stream_io_callback::read( void *p_buffer, size_t i_size ) @@ -3462,14 +3703,14 @@ void vlc_stream_io_callback::setFilePointer(int64_t i_offset, seek_mode mode ) if( i_pos < 0 || i_pos >= stream_Size( s ) ) { - mb_eof = VLC_TRUE; + mb_eof = true; return; } - mb_eof = VLC_FALSE; + mb_eof = false; if( stream_Seek( s, i_pos ) ) { - mb_eof = VLC_TRUE; + mb_eof = true; } return; } @@ -3507,7 +3748,7 @@ EbmlParser::EbmlParser( EbmlStream *es, EbmlElement *el_start, demux_t *p_demux } mi_level = 1; mi_user_level = 1; - mb_keep = VLC_FALSE; + mb_keep = false; mb_dummy = config_GetInt( p_demux, "mkv-use-dummy" ); } @@ -3521,7 +3762,7 @@ EbmlParser::~EbmlParser( void ) { delete m_el[i]; } - mb_keep = VLC_FALSE; + mb_keep = false; } } @@ -3537,7 +3778,7 @@ EbmlElement* EbmlParser::UnGet( uint64 i_block_pos, uint64 i_cluster_pos ) } } m_got = NULL; - mb_keep = VLC_FALSE; + mb_keep = false; if ( m_el[1]->GetElementPosition() == i_cluster_pos ) { m_es->I_O().setFilePointer( i_block_pos, seek_beginning ); @@ -3573,7 +3814,7 @@ void EbmlParser::Down( void ) void EbmlParser::Keep( void ) { - mb_keep = VLC_TRUE; + mb_keep = true; } int EbmlParser::GetLevel( void ) @@ -3622,7 +3863,7 @@ EbmlElement *EbmlParser::Get( void ) { delete m_el[mi_level]; } - mb_keep = VLC_FALSE; + mb_keep = false; } m_el[mi_level] = m_es->FindNextElement( m_el[mi_level - 1]->Generic().Context, i_ulev, 0xFFFFFFFFL, mb_dummy != 0, 1 ); @@ -3678,7 +3919,7 @@ void matroska_segment_c::LoadCues( ) // IndexAppendCluster( cluster ); } - vlc_bool_t b_seekable; + bool b_seekable; stream_Control( sys.demuxer.s, STREAM_CAN_FASTSEEK, &b_seekable ); if( !b_seekable ) @@ -3706,7 +3947,7 @@ void matroska_segment_c::LoadCues( ) idx.i_block_number= -1; idx.i_position = -1; idx.i_time = 0; - idx.b_key = VLC_TRUE; + idx.b_key = true; ep->Down(); while( ( el = ep->Get() ) != NULL ) @@ -3760,7 +4001,7 @@ void matroska_segment_c::LoadCues( ) ep->Up(); #if 0 - msg_Dbg( &sys.demuxer, " * added time="I64Fd" pos="I64Fd + msg_Dbg( &sys.demuxer, " * added time=%"PRId64" pos=%"PRId64 " track=%d bnum=%d", idx.i_time, idx.i_position, idx.i_track, idx.i_block_number ); #endif @@ -3781,7 +4022,7 @@ void matroska_segment_c::LoadCues( ) delete ep; delete cues; - b_cues = VLC_TRUE; + b_cues = true; msg_Dbg( &sys.demuxer, "loading cues done." ); es.I_O().setFilePointer( i_sav_position, seek_beginning ); @@ -3959,17 +4200,17 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) { if( id == KaxCues::ClassInfos.GlobalId ) { - msg_Dbg( &sys.demuxer, "| | | = cues at "I64Fd, i_pos ); + msg_Dbg( &sys.demuxer, "| | | = cues at %"PRId64, i_pos ); i_cues_position = segment->GetGlobalPosition( i_pos ); } else if( id == KaxChapters::ClassInfos.GlobalId ) { - msg_Dbg( &sys.demuxer, "| | | = chapters at "I64Fd, i_pos ); + msg_Dbg( &sys.demuxer, "| | | = chapters at %"PRId64, i_pos ); i_chapters_position = segment->GetGlobalPosition( i_pos ); } else if( id == KaxTags::ClassInfos.GlobalId ) { - msg_Dbg( &sys.demuxer, "| | | = tags at "I64Fd, i_pos ); + msg_Dbg( &sys.demuxer, "| | | = tags at %"PRId64, i_pos ); i_tags_position = segment->GetGlobalPosition( i_pos ); } } @@ -3987,13 +4228,13 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { size_t i, j, k, n; + bool bSupported = true; mkv_track_t *tk; msg_Dbg( &sys.demuxer, "| | + Track Entry" ); tk = new mkv_track_t(); - tracks.push_back( tk ); /* Init the track */ memset( tk, 0, sizeof( mkv_track_t ) ); @@ -4002,9 +4243,9 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) tk->fmt.psz_language = strdup("English"); tk->fmt.psz_description = NULL; - tk->b_default = VLC_TRUE; - tk->b_enabled = VLC_TRUE; - tk->b_silent = VLC_FALSE; + tk->b_default = true; + tk->b_enabled = true; + tk->b_silent = false; tk->i_number = tracks.size() - 1; tk->i_extra_data = 0; tk->p_extra_data = NULL; @@ -4012,7 +4253,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) tk->i_default_duration = 0; tk->f_timecodescale = 1.0; - tk->b_inited = VLC_FALSE; + tk->b_inited = false; tk->i_data_init = 0; tk->p_data_init = NULL; @@ -4020,7 +4261,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) tk->psz_codec_settings = NULL; tk->psz_codec_info_url = NULL; tk->psz_codec_download_url = NULL; - + tk->i_compression_type = MATROSKA_COMPRESSION_NONE; tk->p_compression_data = NULL; @@ -4043,7 +4284,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) } else if( MKV_IS_ID( l, KaxTrackType ) ) { - char *psz_type; + const char *psz_type; KaxTrackType &ttype = *(KaxTrackType*)l; switch( uint8(ttype) ) @@ -4110,7 +4351,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) KaxTrackDefaultDuration &defd = *(KaxTrackDefaultDuration*)l; tk->i_default_duration = uint64(defd); - msg_Dbg( &sys.demuxer, "| | | + Track Default Duration="I64Fd, uint64(defd) ); + msg_Dbg( &sys.demuxer, "| | | + Track Default Duration=%"PRId64, uint64(defd) ); } else if( MKV_IS_ID( l, KaxTrackTimecodeScale ) ) { @@ -4153,7 +4394,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) tk->p_extra_data = (uint8_t*)malloc( tk->i_extra_data ); memcpy( tk->p_extra_data, cpriv.GetBuffer(), tk->i_extra_data ); } - msg_Dbg( &sys.demuxer, "| | | + Track CodecPrivate size="I64Fd, cpriv.GetSize() ); + msg_Dbg( &sys.demuxer, "| | | + Track CodecPrivate size=%"PRId64, cpriv.GetSize() ); } else if( MKV_IS_ID( l, KaxCodecName ) ) { @@ -4166,6 +4407,11 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { EbmlMaster *cencs = static_cast(l); MkvTree( sys.demuxer, 3, "Content Encodings" ); + if ( cencs->ListSize() > 1 ) + { + msg_Err( &sys.demuxer, "Multiple Compression method not supported" ); + bSupported = false; + } for( j = 0; j < cencs->ListSize(); j++ ) { EbmlElement *l2 = (*cencs)[j]; @@ -4203,6 +4449,12 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) KaxContentCompAlgo &compalg = *(KaxContentCompAlgo*)l4; MkvTree( sys.demuxer, 6, "Compression Algorithm: %i", uint32(compalg) ); tk->i_compression_type = uint32( compalg ); + if ( ( tk->i_compression_type != MATROSKA_COMPRESSION_ZLIB ) && + ( tk->i_compression_type != MATROSKA_COMPRESSION_HEADER ) ) + { + msg_Err( &sys.demuxer, "Track Compression method %d not supported", tk->i_compression_type ); + bSupported = false; + } } else if( MKV_IS_ID( l4, KaxContentCompSettings ) ) { @@ -4214,20 +4466,17 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) } } } - else { MkvTree( sys.demuxer, 5, "Unknown (%s)", typeid(*l3).name() ); } } - } else { MkvTree( sys.demuxer, 4, "Unknown (%s)", typeid(*l2).name() ); } } - } // else if( EbmlId( *l ) == KaxCodecSettings::ClassInfos.GlobalId ) // { @@ -4266,13 +4515,15 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { EbmlMaster *tkv = static_cast(l); unsigned int j; + unsigned int i_crop_right = 0, i_crop_left = 0, i_crop_top = 0, i_crop_bottom = 0; + unsigned int i_display_unit = 0, i_display_width = 0, i_display_height = 0; 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; - + tk->fmt.video.i_frame_rate = 1000000; + for( j = 0; j < tkv->ListSize(); j++ ) { EbmlElement *l = (*tkv)[j]; @@ -4293,30 +4544,58 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)l; - tk->fmt.video.i_width = uint16( vwidth ); + tk->fmt.video.i_width += uint16( vwidth ); msg_Dbg( &sys.demuxer, "| | | | + width=%d", uint16( vwidth ) ); } else if( MKV_IS_ID( l, KaxVideoPixelHeight ) ) { KaxVideoPixelWidth &vheight = *(KaxVideoPixelWidth*)l; - tk->fmt.video.i_height = uint16( vheight ); + tk->fmt.video.i_height += uint16( vheight ); msg_Dbg( &sys.demuxer, "| | | | + height=%d", uint16( vheight ) ); } else if( MKV_IS_ID( l, KaxVideoDisplayWidth ) ) { KaxVideoDisplayWidth &vwidth = *(KaxVideoDisplayWidth*)l; - tk->fmt.video.i_visible_width = uint16( vwidth ); + i_display_width = uint16( vwidth ); msg_Dbg( &sys.demuxer, "| | | | + display width=%d", uint16( vwidth ) ); } else if( MKV_IS_ID( l, KaxVideoDisplayHeight ) ) { KaxVideoDisplayWidth &vheight = *(KaxVideoDisplayWidth*)l; - tk->fmt.video.i_visible_height = uint16( vheight ); + i_display_height = uint16( vheight ); msg_Dbg( &sys.demuxer, "| | | | + display height=%d", uint16( vheight ) ); } + else if( MKV_IS_ID( l, KaxVideoPixelCropBottom ) ) + { + KaxVideoPixelCropBottom &cropval = *(KaxVideoPixelCropBottom*)l; + + i_crop_bottom = uint16( cropval ); + msg_Dbg( &sys.demuxer, "| | | | + crop pixel bottom=%d", uint16( cropval ) ); + } + else if( MKV_IS_ID( l, KaxVideoPixelCropTop ) ) + { + KaxVideoPixelCropTop &cropval = *(KaxVideoPixelCropTop*)l; + + i_crop_top = uint16( cropval ); + msg_Dbg( &sys.demuxer, "| | | | + crop pixel top=%d", uint16( cropval ) ); + } + else if( MKV_IS_ID( l, KaxVideoPixelCropRight ) ) + { + KaxVideoPixelCropRight &cropval = *(KaxVideoPixelCropRight*)l; + + i_crop_right = uint16( cropval ); + msg_Dbg( &sys.demuxer, "| | | | + crop pixel right=%d", uint16( cropval ) ); + } + else if( MKV_IS_ID( l, KaxVideoPixelCropLeft ) ) + { + KaxVideoPixelCropLeft &cropval = *(KaxVideoPixelCropLeft*)l; + + i_crop_left = uint16( cropval ); + msg_Dbg( &sys.demuxer, "| | | | + crop pixel left=%d", uint16( cropval ) ); + } else if( MKV_IS_ID( l, KaxVideoFrameRate ) ) { KaxVideoFrameRate &vfps = *(KaxVideoFrameRate*)l; @@ -4324,13 +4603,14 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) tk->f_fps = float( vfps ); msg_Dbg( &sys.demuxer, " | | | + fps=%f", float( vfps ) ); } -// else if( EbmlId( *l ) == KaxVideoDisplayUnit::ClassInfos.GlobalId ) -// { -// KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l; + else if( EbmlId( *l ) == KaxVideoDisplayUnit::ClassInfos.GlobalId ) + { + KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l; -// msg_Dbg( &sys.demuxer, "| | | | + Track Video Display Unit=%s", -// uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) ); -// } + i_display_unit = uint8( vdmode ); + msg_Dbg( &sys.demuxer, "| | | | + Track Video Display Unit=%s", + uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) ); + } // else if( EbmlId( *l ) == KaxVideoAspectRatio::ClassInfos.GlobalId ) // { // KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)l; @@ -4341,15 +4621,26 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) // { // KaxVideoGamma &gamma = *(KaxVideoGamma*)l; -// msg_Dbg( &sys.demuxer, " | | | + fps=%f", float( gamma ) ); +// msg_Dbg( &sys.demuxer, " | | | + gamma=%f", float( gamma ) ); // } else { msg_Dbg( &sys.demuxer, "| | | | + Unknown (%s)", typeid(*l).name() ); } } - if ( tk->fmt.video.i_visible_height && tk->fmt.video.i_visible_width ) - tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * tk->fmt.video.i_visible_width / tk->fmt.video.i_visible_height; + if( i_display_height && i_display_width ) + tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * i_display_width / i_display_height; + if( i_crop_left || i_crop_right || i_crop_top || i_crop_bottom ) + { + tk->fmt.video.i_visible_width = tk->fmt.video.i_width; + tk->fmt.video.i_visible_height = tk->fmt.video.i_height; + tk->fmt.video.i_x_offset = i_crop_left; + tk->fmt.video.i_y_offset = i_crop_top; + tk->fmt.video.i_visible_width -= i_crop_left + i_crop_right; + tk->fmt.video.i_visible_height -= i_crop_top + i_crop_bottom; + } + /* FIXME: i_display_* allows you to not only set DAR, but also a zoom factor. + we do not support this atm */ } else if( MKV_IS_ID( l, KaxTrackAudio ) ) { @@ -4366,9 +4657,16 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxAudioSamplingFreq &afreq = *(KaxAudioSamplingFreq*)l; - tk->fmt.audio.i_rate = (int)float( afreq ); + tk->i_original_rate = tk->fmt.audio.i_rate = (int)float( afreq ); msg_Dbg( &sys.demuxer, "| | | | + afreq=%d", tk->fmt.audio.i_rate ); } + else if( MKV_IS_ID( l, KaxAudioOutputSamplingFreq ) ) + { + KaxAudioOutputSamplingFreq &afreq = *(KaxAudioOutputSamplingFreq*)l; + + tk->fmt.audio.i_rate = (int)float( afreq ); + msg_Dbg( &sys.demuxer, "| | | | + aoutfreq=%d", tk->fmt.audio.i_rate ); + } else if( MKV_IS_ID( l, KaxAudioChannels ) ) { KaxAudioChannels &achan = *(KaxAudioChannels*)l; @@ -4395,6 +4693,16 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) typeid(*l).name() ); } } + + if ( bSupported ) + { + tracks.push_back( tk ); + } + else + { + msg_Err( &sys.demuxer, "Track Entry %d not supported", tk->i_number ); + delete tk; + } } /***************************************************************************** @@ -4473,7 +4781,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) i_timescale = uint64(tcs); - msg_Dbg( &sys.demuxer, "| | + TimecodeScale="I64Fd, + msg_Dbg( &sys.demuxer, "| | + TimecodeScale=%"PRId64, i_timescale ); } else if( MKV_IS_ID( l, KaxDuration ) ) @@ -4482,7 +4790,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) i_duration = mtime_t( double( dur ) ); - msg_Dbg( &sys.demuxer, "| | + Duration="I64Fd, + msg_Dbg( &sys.demuxer, "| | + Duration=%"PRId64, i_duration ); } else if( MKV_IS_ID( l, KaxMuxingApp ) ) @@ -4528,7 +4836,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) msg_Dbg( &sys.demuxer, "| | + family=%d", *(uint32*)uid->GetBuffer() ); } -#if defined( HAVE_GMTIME_R ) && !defined( SYS_DARWIN ) +#if defined( HAVE_GMTIME_R ) && !defined( __APPLE__ ) else if( MKV_IS_ID( l, KaxDateUTC ) ) { KaxDateUTC &date = *(KaxDateUTC*)l; @@ -4613,14 +4921,14 @@ void matroska_segment_c::ParseChapterAtom( int i_level, KaxChapterAtom *ca, chap else if( MKV_IS_ID( l, KaxChapterTimeStart ) ) { KaxChapterTimeStart &start =*(KaxChapterTimeStart*)l; - chapters.i_start_time = uint64( start ) / I64C(1000); + chapters.i_start_time = uint64( start ) / INT64_C(1000); msg_Dbg( &sys.demuxer, "| | | | + ChapterTimeStart: %lld", chapters.i_start_time ); } else if( MKV_IS_ID( l, KaxChapterTimeEnd ) ) { KaxChapterTimeEnd &end =*(KaxChapterTimeEnd*)l; - chapters.i_end_time = uint64( end ) / I64C(1000); + chapters.i_end_time = uint64( end ) / INT64_C(1000); msg_Dbg( &sys.demuxer, "| | | | + ChapterTimeEnd: %lld", chapters.i_end_time ); } @@ -4715,6 +5023,48 @@ void matroska_segment_c::ParseChapterAtom( int i_level, KaxChapterAtom *ca, chap } } +/***************************************************************************** + * ParseAttachments: + *****************************************************************************/ +void matroska_segment_c::ParseAttachments( KaxAttachments *attachments ) +{ + EbmlElement *el; + int i_upper_level = 0; + + attachments->Read( es, attachments->Generic().Context, i_upper_level, el, true ); + + KaxAttached *attachedFile = FindChild( *attachments ); + + while( attachedFile && ( attachedFile->GetSize() > 0 ) ) + { + std::string psz_mime_type = GetChild( *attachedFile ); + KaxFileName &file_name = GetChild( *attachedFile ); + KaxFileData &img_data = GetChild( *attachedFile ); + + attachment_c *new_attachment = new attachment_c(); + + if( new_attachment ) + { + new_attachment->psz_file_name = ToUTF8( UTFstring( file_name ) ); + new_attachment->psz_mime_type = psz_mime_type; + new_attachment->i_size = img_data.GetSize(); + new_attachment->p_data = malloc( img_data.GetSize() ); + + if( new_attachment->p_data ) + { + memcpy( new_attachment->p_data, img_data.GetBuffer(), img_data.GetSize() ); + sys.stored_attachments.push_back( new_attachment ); + } + else + { + delete new_attachment; + } + } + + attachedFile = &GetNextChild( *attachments, *attachedFile ); + } +} + /***************************************************************************** * ParseChapters: *****************************************************************************/ @@ -4735,7 +5085,7 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters ) if( MKV_IS_ID( l, KaxEditionEntry ) ) { chapter_edition_c *p_edition = new chapter_edition_c(); - + EbmlMaster *E = static_cast(l ); size_t j; msg_Dbg( &sys.demuxer, "| | + EditionEntry" ); @@ -4779,11 +5129,11 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters ) { stored_editions[i]->RefreshChapters( ); } - + 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); + i_dur = stored_editions[i_default_edition]->Duration() / INT64_C(1000); if (i_dur > 0) i_duration = i_dur; } @@ -4821,65 +5171,41 @@ void matroska_segment_c::ParseCluster( ) *****************************************************************************/ void matroska_segment_c::InformationCreate( ) { - size_t i_track; - sys.meta = vlc_meta_New(); if( psz_title ) { - vlc_meta_Add( sys.meta, VLC_META_TITLE, psz_title ); + vlc_meta_SetTitle( sys.meta, psz_title ); } if( psz_date_utc ) { - vlc_meta_Add( sys.meta, VLC_META_DATE, psz_date_utc ); + vlc_meta_SetDate( sys.meta, psz_date_utc ); } +#if 0 if( psz_segment_filename ) { - vlc_meta_Add( sys.meta, _("Segment filename"), psz_segment_filename ); + fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" ); } if( psz_muxing_application ) { - vlc_meta_Add( sys.meta, _("Muxing application"), psz_muxing_application ); + fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" ); } if( psz_writing_application ) { - vlc_meta_Add( sys.meta, _("Writing application"), psz_writing_application ); + fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" ); } - for( i_track = 0; i_track < tracks.size(); i_track++ ) + for( size_t i_track = 0; i_track < tracks.size(); i_track++ ) { - mkv_track_t *tk = tracks[i_track]; - vlc_meta_t *mtk = vlc_meta_New(); - - sys.meta->track = (vlc_meta_t**)realloc( sys.meta->track, - sizeof( vlc_meta_t * ) * ( sys.meta->i_track + 1 ) ); - sys.meta->track[sys.meta->i_track++] = mtk; - - if( tk->fmt.psz_description ) - { - vlc_meta_Add( sys.meta, VLC_META_DESCRIPTION, tk->fmt.psz_description ); - } - if( tk->psz_codec_name ) - { - vlc_meta_Add( sys.meta, VLC_META_CODEC_NAME, tk->psz_codec_name ); - } - if( tk->psz_codec_settings ) - { - vlc_meta_Add( sys.meta, VLC_META_SETTING, tk->psz_codec_settings ); - } - if( tk->psz_codec_info_url ) - { - vlc_meta_Add( sys.meta, VLC_META_CODEC_DESCRIPTION, tk->psz_codec_info_url ); - } - if( tk->psz_codec_download_url ) - { - vlc_meta_Add( sys.meta, VLC_META_URL, tk->psz_codec_download_url ); - } +// mkv_track_t *tk = tracks[i_track]; +// vlc_meta_t *mtk = vlc_meta_New(); + fprintf( stderr, "***** WARNING: Unhandled child meta\n"); } +#endif if( i_tags_position >= 0 ) { - vlc_bool_t b_seekable; + bool b_seekable; stream_Control( sys.demuxer.s, STREAM_CAN_FASTSEEK, &b_seekable ); if( b_seekable ) @@ -4891,7 +5217,7 @@ void matroska_segment_c::InformationCreate( ) /***************************************************************************** - * Divers + * Misc *****************************************************************************/ void matroska_segment_c::IndexAppendCluster( KaxCluster *cluster ) @@ -4901,7 +5227,7 @@ void matroska_segment_c::IndexAppendCluster( KaxCluster *cluster ) idx.i_block_number= -1; idx.i_position = cluster->GetElementPosition(); idx.i_time = -1; - idx.b_key = VLC_TRUE; + idx.b_key = true; i_index++; if( i_index >= i_index_max ) @@ -4921,7 +5247,7 @@ void chapter_edition_c::RefreshChapters( ) int64_t chapter_item_c::RefreshChapters( bool b_ordered, int64_t i_prev_user_time ) { int64_t i_user_time = i_prev_user_time; - + // first the sub-chapters, and then ourself std::vector::iterator index = sub_chapters.begin(); while ( index != sub_chapters.end() ) @@ -4969,14 +5295,14 @@ int64_t chapter_item_c::RefreshChapters( bool b_ordered, int64_t i_prev_user_tim mtime_t chapter_edition_c::Duration() const { mtime_t i_result = 0; - + if ( sub_chapters.size() ) { std::vector::const_iterator index = sub_chapters.end(); index--; i_result = (*index)->i_user_end_time; } - + return i_result; } @@ -4995,8 +5321,8 @@ chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode, const cha if ( p_current == this ) b_found = true; - if ( i_user_timecode >= i_user_start_time && - ( i_user_timecode < i_user_end_time || + if ( i_user_timecode >= i_user_start_time && + ( i_user_timecode < i_user_end_time || ( i_user_start_time == i_user_end_time && i_user_timecode == i_user_end_time ))) { std::vector::iterator index = sub_chapters.begin(); @@ -5005,7 +5331,7 @@ chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode, const cha psz_result = (*index)->FindTimecode( i_user_timecode, p_current, b_found ); index++; } - + if ( psz_result == NULL ) psz_result = this; } @@ -5060,7 +5386,7 @@ void demux_sys_t::PreloadLinked( matroska_segment_c *p_segment ) 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 @@ -5107,9 +5433,9 @@ void demux_sys_t::PreloadLinked( matroska_segment_c *p_segment ) // create a name if there is none if ( p_title->psz_name == NULL ) { - sz_name = N_("Segment "); + sz_name = N_("Segment"); char psz_str[6]; - sprintf( psz_str, "%d", (int)i ); + sprintf( psz_str, " %d", (int)i ); sz_name += psz_str; p_title->psz_name = strdup( sz_name.c_str() ); } @@ -5193,23 +5519,31 @@ void demux_sys_t::JumpTo( virtual_segment_c & vsegment, chapter_item_c * p_chapt 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_tmp; + 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 ) + p_tmp = (EbmlBinary *)p_item_a->p_segment_uid; + if ( p_item_b->p_prev_segment_uid != NULL + && *p_tmp == *p_item_b->p_prev_segment_uid ) return true; - 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 ) + p_tmp = (EbmlBinary *)p_item_a->p_next_segment_uid; + if ( !p_tmp ) + return false; + + if ( p_item_b->p_segment_uid != NULL + && *p_tmp == *p_item_b->p_segment_uid ) return true; - if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid ) + if ( p_item_b->p_prev_segment_uid != NULL + && *p_tmp == *p_item_b->p_prev_segment_uid ) return true; return false; @@ -5233,6 +5567,11 @@ bool matroska_segment_c::Preload( ) else if( MKV_IS_ID( el, KaxTracks ) ) { ParseTracks( static_cast( el ) ); + if ( tracks.size() == 0 ) + { + msg_Err( &sys.demuxer, "No tracks supported" ); + return false; + } } else if( MKV_IS_ID( el, KaxSeekHead ) ) { @@ -5257,7 +5596,8 @@ bool matroska_segment_c::Preload( ) } else if( MKV_IS_ID( el, KaxAttachments ) ) { - msg_Dbg( &sys.demuxer, "| + Attachments FIXME (but probably never supported)" ); + msg_Dbg( &sys.demuxer, "| + Attachments" ); + ParseAttachments( static_cast( el ) ); } else if( MKV_IS_ID( el, KaxChapters ) ) { @@ -5289,10 +5629,10 @@ matroska_segment_c *demux_sys_t::FindSegment( const EbmlBinary & uid ) const 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, +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; @@ -5341,7 +5681,7 @@ size_t virtual_segment_c::AddSegment( matroska_segment_c *p_segment ) // check if it's not already in here for ( i=0; ip_segment_uid != NULL + 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; @@ -5446,7 +5786,7 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) i_seek_time = p_indexes[i_idx].i_time; } - msg_Dbg( &sys.demuxer, "seek got "I64Fd" (%d%%)", + msg_Dbg( &sys.demuxer, "seek got %"PRId64" (%d%%)", i_seek_time, (int)( 100 * i_seek_position / stream_Size( sys.demuxer.s ) ) ); es.I_O().setFilePointer( i_seek_position, seek_beginning ); @@ -5465,7 +5805,7 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) { if( tracks[i_track]->fmt.i_cat == VIDEO_ES ) { - tracks[i_track]->b_search_keyframe = VLC_TRUE; + tracks[i_track]->b_search_keyframe = true; i_track_skipping++; } es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, tracks[i_track]->p_es, i_date ); @@ -5488,13 +5828,23 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) for( i_track = 0; i_track < tracks.size(); i_track++ ) { +#if LIBMATROSKA_VERSION >= 0x000800 + if( (simpleblock && tracks[i_track]->i_number == simpleblock->TrackNum()) || + (block && tracks[i_track]->i_number == block->TrackNum()) ) +#else if( tracks[i_track]->i_number == block->TrackNum() ) +#endif { break; } } - sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; +#if LIBMATROSKA_VERSION >= 0x000800 + if( simpleblock ) + sys.i_pts = (sys.i_chapter_time + simpleblock->GlobalTimecode()) / (mtime_t) 1000; + else +#endif + sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; if( i_track < tracks.size() ) { @@ -5507,7 +5857,7 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) { if( i_block_ref1 == 0 && tracks[i_track]->b_search_keyframe ) { - tracks[i_track]->b_search_keyframe = VLC_FALSE; + tracks[i_track]->b_search_keyframe = false; i_track_skipping--; } if( !tracks[i_track]->b_search_keyframe ) @@ -5518,7 +5868,7 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) BlockDecode( &sys.demuxer, block, sys.i_pts, 0, i_block_ref1 >= 0 || i_block_ref2 > 0 ); #endif } - } + } } delete block; @@ -5713,7 +6063,7 @@ bool dvd_chapter_codec_c::Enter() binary *p_data = (*index)->GetBuffer(); size_t i_size = *p_data++; // avoid reading too much from the buffer - i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 ); + i_size = __MIN( i_size, ((*index)->GetSize() - 1) >> 3 ); for ( ; i_size > 0; i_size--, p_data += 8 ) { msg_Dbg( &sys.demuxer, "Matroska DVD enter command" ); @@ -5736,7 +6086,7 @@ bool dvd_chapter_codec_c::Leave() binary *p_data = (*index)->GetBuffer(); size_t i_size = *p_data++; // avoid reading too much from the buffer - i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 ); + i_size = __MIN( i_size, ((*index)->GetSize() - 1) >> 3 ); for ( ; i_size > 0; i_size--, p_data += 8 ) { msg_Dbg( &sys.demuxer, "Matroska DVD leave command" ); @@ -5866,10 +6216,10 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si if ( !b_test_positive ) return false; } - + // strip the test command i_command &= 0xFF0F; - + switch ( i_command ) { case CMD_DVD_NOP: @@ -6099,7 +6449,7 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si 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; @@ -6107,7 +6457,7 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si 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 ) @@ -6123,7 +6473,7 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si 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 ); @@ -6185,7 +6535,7 @@ bool dvd_command_interpretor_c::MatchVTSNumber( const chapter_codec_cmds_c &data { 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; @@ -6199,7 +6549,7 @@ bool dvd_command_interpretor_c::MatchVTSMNumber( const chapter_codec_cmds_c &dat { 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; @@ -6213,7 +6563,7 @@ bool dvd_command_interpretor_c::MatchTitleNumber( const chapter_codec_cmds_c &da { 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; @@ -6227,7 +6577,7 @@ bool dvd_command_interpretor_c::MatchPgcType( const chapter_codec_cmds_c &data, { 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; @@ -6241,7 +6591,7 @@ bool dvd_command_interpretor_c::MatchPgcNumber( const chapter_codec_cmds_c &data { 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; @@ -6255,7 +6605,7 @@ bool dvd_command_interpretor_c::MatchChapterNumber( const chapter_codec_cmds_c & { 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; @@ -6269,7 +6619,7 @@ bool dvd_command_interpretor_c::MatchCellNumber( const chapter_codec_cmds_c &dat { 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; @@ -6311,7 +6661,7 @@ bool matroska_script_codec_c::Leave() return f_result; } -// see http://www.matroska.org/technical/specs/chapters/index.html#mscript +// 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 ) { @@ -6360,7 +6710,7 @@ bool matroska_script_interpretor_c::Interpret( const binary * p_command, size_t 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); + msg_Dbg( &sys.demuxer, "Chapter %"PRId64" not found", i_chapter_uid); else { if ( !p_chapter->EnterAndLeave( sys.p_current_segment->CurrentChapter() ) )