X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmkv.cpp;h=c0022af1e2612565412ef9ef58bef57bf0da6056;hb=1d5ae295cd462d70d24cfad65b38638a1bb9407c;hp=65ed0fb85b915a90094c0a28a99c0d8ba8af1c92;hpb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;p=vlc diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index 65ed0fb85b..c0022af1e2 100644 --- a/modules/demux/mkv.cpp +++ b/modules/demux/mkv.cpp @@ -26,11 +26,19 @@ * Preamble *****************************************************************************/ +/* 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 +#include #ifdef HAVE_TIME_H # include /* time() */ @@ -38,7 +46,7 @@ #include /* BITMAPINFOHEADER, WAVEFORMATEX */ -#include "iso_lang.h" +#include #include "vlc_meta.h" #include #include @@ -397,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" ); @@ -498,7 +506,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 ); } @@ -510,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() { @@ -556,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; }; @@ -577,8 +585,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; @@ -598,14 +606,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; @@ -627,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; @@ -1023,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) @@ -1048,35 +1056,17 @@ public: 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; @@ -1130,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; @@ -1297,9 +1287,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; @@ -1313,7 +1303,7 @@ public: {} virtual ~attachment_c() { - if( p_data ) free( p_data ); + free( p_data ); } std::string psz_file_name; @@ -1340,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() @@ -1464,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 ) @@ -1563,7 +1553,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 ); @@ -1780,7 +1770,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; @@ -1818,7 +1808,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(); @@ -1900,7 +1890,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; } } @@ -1935,7 +1925,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++ ) @@ -1972,7 +1962,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; } } @@ -1987,7 +1977,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 @@ -2073,7 +2063,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" ) ) { @@ -2118,13 +2108,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 @@ -2371,7 +2361,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; @@ -2564,6 +2554,58 @@ 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; } +#if 0 + /* 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]; + } + } +#endif else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/UTF8" ) ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); @@ -2680,10 +2722,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 ); } } @@ -2693,7 +2735,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; @@ -2720,22 +2762,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"); @@ -2748,12 +2790,12 @@ 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 ) @@ -2765,14 +2807,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"); @@ -2780,18 +2820,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 ) @@ -2886,7 +2917,7 @@ 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 ) { @@ -2905,7 +2936,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 ); } @@ -2927,7 +2958,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); */ @@ -3006,7 +3037,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 ); } } @@ -3019,8 +3050,8 @@ 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 ); } @@ -3055,7 +3086,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 ); @@ -3398,7 +3429,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 !" ); @@ -3640,11 +3671,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 ) @@ -3675,14 +3706,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; } @@ -3720,7 +3751,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" ); } @@ -3734,7 +3765,7 @@ EbmlParser::~EbmlParser( void ) { delete m_el[i]; } - mb_keep = VLC_FALSE; + mb_keep = false; } } @@ -3750,7 +3781,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 ); @@ -3786,7 +3817,7 @@ void EbmlParser::Down( void ) void EbmlParser::Keep( void ) { - mb_keep = VLC_TRUE; + mb_keep = true; } int EbmlParser::GetLevel( void ) @@ -3835,7 +3866,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 ); @@ -3891,7 +3922,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 ) @@ -3919,7 +3950,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 ) @@ -3973,7 +4004,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 @@ -3994,7 +4025,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 ); @@ -4172,17 +4203,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 ); } } @@ -4215,9 +4246,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; @@ -4225,7 +4256,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; @@ -4323,7 +4354,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 ) ) { @@ -4366,7 +4397,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 ) ) { @@ -4753,7 +4784,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 ) ) @@ -4762,7 +4793,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 ) ) @@ -4893,14 +4924,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 ); } @@ -5105,7 +5136,7 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters ) 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; } @@ -5177,7 +5208,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 ) @@ -5199,7 +5230,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 ) @@ -5758,7 +5789,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 ); @@ -5777,7 +5808,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 ); @@ -5829,7 +5860,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 ) @@ -6035,7 +6066,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" ); @@ -6058,7 +6089,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" ); @@ -6682,7 +6713,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() ) )