X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmkv.cpp;h=fbb975979162e9c6d563766a91fd6c5ae96ab577;hb=d6abd400bfadd7c0bfe4bfe2cf1547d72e153508;hp=9308b02d3451465bd9efd2be02decc4e9888c7a6;hpb=3480318f76c15c851ffbca78c608d71d2c49f828;p=vlc diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index 9308b02d34..fbb9759791 100644 --- a/modules/demux/mkv.cpp +++ b/modules/demux/mkv.cpp @@ -25,9 +25,20 @@ /***************************************************************************** * 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() */ @@ -35,7 +46,7 @@ #include /* BITMAPINFOHEADER, WAVEFORMATEX */ -#include "iso_lang.h" +#include #include "vlc_meta.h" #include #include @@ -102,6 +113,46 @@ extern "C" { # include #endif +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); + +vlc_module_begin(); + set_shortname( "Matroska" ); + 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."), true ); + + add_bool( "mkv-use-chapter-codec", 1, NULL, + N_("Chapter codecs"), + 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)."), true ); + + add_bool( "mkv-seek-percent", 0, NULL, + N_("Seek based on percent not time"), + 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)."), true ); + + add_shortcut( "mka" ); + add_shortcut( "mkv" ); +vlc_module_end(); + + + #define MATROSKA_COMPRESSION_NONE -1 #define MATROSKA_COMPRESSION_ZLIB 0 #define MATROSKA_COMPRESSION_BLIB 1 @@ -152,7 +203,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; @@ -161,7 +212,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; @@ -170,7 +221,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; @@ -182,7 +233,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; @@ -191,7 +242,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; @@ -200,7 +251,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; @@ -386,44 +437,6 @@ typedef struct { using namespace LIBMATROSKA_NAMESPACE; using namespace std; -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close( vlc_object_t * ); - -vlc_module_begin(); - set_shortname( "Matroska" ); - set_description( _("Matroska stream demuxer" ) ); - set_capability( "demux2", 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 ); - - add_bool( "mkv-use-chapter-codec", 1, NULL, - N_("Chapter codecs"), - 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 ); - - add_bool( "mkv-use-dummy", 0, NULL, - N_("Dummy Elements"), - N_("Read and discard unknown EBML elements (not good for broken files)."), VLC_TRUE ); - - add_shortcut( "mka" ); - add_shortcut( "mkv" ); -vlc_module_end(); - /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -495,7 +508,7 @@ static void MkvTree( demux_t & demuxer, int i_level, const char *psz_format, ... psz_foo2[ 4 * i_level ] = '+'; psz_foo2[ 4 * i_level + 1 ] = ' '; strcpy( &psz_foo2[ 4 * i_level + 2 ], psz_format ); - __msg_GenericVa( VLC_OBJECT(&demuxer), MSG_QUEUE_NORMAL, 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 ); } @@ -507,11 +520,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() { @@ -542,7 +555,10 @@ class EbmlParser void Keep( void ); EbmlElement *UnGet( uint64 i_block_pos, uint64 i_cluster_pos ); - int GetLevel( void ); + int GetLevel( void ); + + /* Is the provided element presents in our upper elements */ + bool IsTopPresent( EbmlElement * ); private: EbmlStream *m_es; @@ -553,8 +569,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; }; @@ -574,8 +590,8 @@ typedef struct { // ~mkv_track_t(); - vlc_bool_t b_default; - vlc_bool_t b_enabled; + bool b_default; + bool b_enabled; unsigned int i_number; int i_extra_data; @@ -595,14 +611,14 @@ typedef struct /* audio */ unsigned int i_original_rate; - vlc_bool_t b_inited; + 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 */ const char *psz_codec_name; @@ -624,7 +640,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; @@ -645,7 +661,7 @@ public: ,i_codec_id( codec_id ) ,sys( demuxer ) {} - + virtual ~chapter_codec_cmds_c() { delete p_private_data; @@ -675,7 +691,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; } @@ -709,9 +725,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 ) @@ -743,7 +759,7 @@ public: } return false; } - + bool SetGPRM( size_t index, uint16 value ) { if ( index >= 0 && index < 16 ) @@ -800,7 +816,7 @@ protected: uint16 p_PRMs[256]; demux_sys_t & sys; - + // DVD command IDs // Tests @@ -813,7 +829,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; @@ -842,7 +858,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 ); @@ -876,10 +892,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; }; @@ -962,7 +978,7 @@ public: 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; @@ -973,7 +989,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 ) @@ -992,12 +1008,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; }; @@ -1020,7 +1036,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) @@ -1040,40 +1056,19 @@ public: { for( size_t i_track = 0; i_track < tracks.size(); i_track++ ) { - if ( tracks[i_track]->p_compression_data ) - { - delete tracks[i_track]->p_compression_data; - } + delete tracks[i_track]->p_compression_data; es_format_Clean( &tracks[i_track]->fmt ); - if( tracks[i_track]->p_extra_data ) - free( tracks[i_track]->p_extra_data ); - if( tracks[i_track]->psz_codec ) - free( tracks[i_track]->psz_codec ); + 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; @@ -1127,7 +1122,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; @@ -1147,7 +1142,7 @@ public: std::vector translations; std::vector families; - + demux_sys_t & sys; EbmlParser *ep; bool b_preloaded; @@ -1294,9 +1289,9 @@ 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; @@ -1310,7 +1305,7 @@ public: {} virtual ~attachment_c() { - if( p_data ) free( p_data ); + free( p_data ); } std::string psz_file_name; @@ -1337,7 +1332,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() @@ -1444,8 +1439,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; @@ -1461,7 +1456,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 ) @@ -1533,7 +1528,10 @@ static int Open( vlc_object_t * p_this ) #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) || @@ -1544,9 +1542,11 @@ static int Open( vlc_object_t * p_this ) #endif { // test wether this file belongs to our family - uint8_t *p_peek; - bool file_ok = false; - stream_t *p_file_stream = stream_UrlNew( p_demux, s_filename.c_str()); + 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 @@ -1555,7 +1555,7 @@ static int Open( vlc_object_t * p_this ) 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 ); @@ -1600,7 +1600,7 @@ static int Open( vlc_object_t * p_this ) } p_sys->StartUiThread(); - + return VLC_SUCCESS; error: @@ -1688,7 +1688,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* ); @@ -1700,7 +1700,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; @@ -1772,7 +1771,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; @@ -1791,6 +1790,20 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64 return VLC_EGENERIC; } + /* Verify that we are still inside our cluster + * It can happens whith broken files and when seeking + * without index */ + if( i_level > 1 ) + { + if( cluster && !ep->IsTopPresent( cluster ) ) + { + msg_Warn( &sys.demuxer, "Unexpected escape from current cluster" ); + cluster = NULL; + } + if( !cluster ) + continue; + } + /* do parsing */ switch ( i_level ) { @@ -1810,7 +1823,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(); @@ -1892,7 +1905,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; } } @@ -1927,7 +1940,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++ ) @@ -1964,7 +1977,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; } } @@ -1979,7 +1992,7 @@ 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 @@ -2065,7 +2078,7 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, 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" ) ) { @@ -2110,13 +2123,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 @@ -2190,7 +2203,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() ) { @@ -2302,7 +2318,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) 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 ); @@ -2325,6 +2341,17 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) } } } + 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" ) ) @@ -2349,7 +2376,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; @@ -2542,6 +2569,56 @@ 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; } + /* disabled due to the potential "S_KATE" namespace issue */ + else if( !strcmp( tracks[i_track]->psz_codec, "S_KATE" ) ) + { + 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' ); @@ -2581,7 +2658,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 ) @@ -2602,7 +2679,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 ) @@ -2612,9 +2689,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 ); @@ -2646,10 +2735,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 ); } } @@ -2659,7 +2748,7 @@ void demux_sys_t::StopUiThread() { vlc_object_kill( p_ev ); vlc_thread_join( p_ev ); - vlc_object_destroy( p_ev ); + vlc_object_release( p_ev ); p_ev = NULL; @@ -2686,22 +2775,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"); @@ -2714,15 +2803,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_libvlc, "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 ) { @@ -2731,14 +2820,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 libvlc_int_t::hotkey *p_hotkeys = p_ev->p_libvlc->p_hotkeys; - int i, i_action = -1; + int i; msg_Dbg( p_ev->p_demux, "Handle Key Event"); @@ -2746,18 +2833,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_libvlc, "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 ) @@ -2852,8 +2930,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]; @@ -2871,7 +2949,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 ); } @@ -2893,7 +2971,7 @@ 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); */ @@ -2972,7 +3050,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 ); } } @@ -2985,13 +3063,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 ); @@ -3021,7 +3099,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_libvlc, "key-pressed", EventKey, p_ev ); + var_DelCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev ); vlc_mutex_destroy( &p_ev->lock ); @@ -3063,7 +3141,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] ); + } } } @@ -3139,7 +3221,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; @@ -3210,7 +3292,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(); @@ -3221,7 +3303,7 @@ chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id, return p_result; index2++; } - + return p_result; } @@ -3360,7 +3442,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 !" ); @@ -3459,14 +3541,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 */ @@ -3514,7 +3596,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 */ @@ -3550,7 +3632,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 */ @@ -3560,7 +3642,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 */ @@ -3602,11 +3684,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 ) @@ -3637,14 +3719,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; } @@ -3682,7 +3764,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" ); } @@ -3696,7 +3778,7 @@ EbmlParser::~EbmlParser( void ) { delete m_el[i]; } - mb_keep = VLC_FALSE; + mb_keep = false; } } @@ -3712,7 +3794,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 ); @@ -3748,7 +3830,7 @@ void EbmlParser::Down( void ) void EbmlParser::Keep( void ) { - mb_keep = VLC_TRUE; + mb_keep = true; } int EbmlParser::GetLevel( void ) @@ -3797,7 +3879,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 ); @@ -3829,6 +3911,15 @@ EbmlElement *EbmlParser::Get( void ) return m_el[mi_level]; } +bool EbmlParser::IsTopPresent( EbmlElement *el ) +{ + for( int i = 0; i < mi_level; i++ ) + { + if( m_el[i] && m_el[i] == el ) + return true; + } + return false; +} /***************************************************************************** * Tools @@ -3853,7 +3944,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 ) @@ -3881,7 +3972,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 ) @@ -3935,7 +4026,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 @@ -3956,7 +4047,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 ); @@ -4134,17 +4225,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 ); } } @@ -4177,9 +4268,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; @@ -4187,7 +4278,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; @@ -4195,7 +4286,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; @@ -4285,7 +4376,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 ) ) { @@ -4328,7 +4419,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 ) ) { @@ -4457,7 +4548,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) 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]; @@ -4715,7 +4806,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 ) ) @@ -4724,7 +4815,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 ) ) @@ -4855,14 +4946,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 ); } @@ -5019,7 +5110,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" ); @@ -5063,11 +5154,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; } @@ -5139,7 +5230,7 @@ void matroska_segment_c::InformationCreate( ) 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 ) @@ -5151,7 +5242,7 @@ void matroska_segment_c::InformationCreate( ) /***************************************************************************** - * Divers + * Misc *****************************************************************************/ void matroska_segment_c::IndexAppendCluster( KaxCluster *cluster ) @@ -5161,7 +5252,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 ) @@ -5181,7 +5272,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() ) @@ -5229,14 +5320,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; } @@ -5265,7 +5356,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; } @@ -5320,7 +5411,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 @@ -5453,7 +5544,7 @@ 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 ) @@ -5471,7 +5562,7 @@ bool matroska_segment_c::CompareSegmentUIDs( const matroska_segment_c * p_item_a 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; @@ -5720,7 +5811,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 ); @@ -5739,7 +5830,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 ); @@ -5791,7 +5882,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 ) @@ -5997,7 +6088,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" ); @@ -6020,7 +6111,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" ); @@ -6150,10 +6241,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: @@ -6383,7 +6474,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; @@ -6391,7 +6482,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 ) @@ -6407,7 +6498,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 ); @@ -6469,7 +6560,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; @@ -6483,7 +6574,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; @@ -6497,7 +6588,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; @@ -6511,7 +6602,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; @@ -6525,7 +6616,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; @@ -6539,7 +6630,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; @@ -6553,7 +6644,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; @@ -6644,7 +6735,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() ) )