vlc | branch: master | Francois Cartegnie <[email protected]> | Tue Oct 21 17:38:26 2014 +0200| [951e8760eb3aa4caf1d11ef89cbba4a34c2bf008] | committer: Francois Cartegnie
demux: libmp4: change tfra debug verbosity > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=951e8760eb3aa4caf1d11ef89cbba4a34c2bf008 --- modules/demux/mp4/libmp4.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index be12611..f81b966 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -3402,28 +3402,30 @@ static int MP4_ReadBox_tfra( stream_t *p_stream, MP4_Box_t *p_box ) if ( i < i_number_of_entries ) i_number_of_entries = i; -#ifdef MP4_VERBOSE - if( p_tfra->i_version == 0 ) - { - msg_Dbg( p_stream, "time[0]: %"PRIu32", moof_offset[0]: %"PRIx32"", - p_tfra->p_time[0], p_tfra->p_moof_offset[0] ); - - msg_Dbg( p_stream, "time[1]: %"PRIu32", moof_offset[1]: %"PRIx32"", - p_tfra->p_time[1], p_tfra->p_moof_offset[1] ); - } - else +#ifdef MP4_ULTRA_VERBOSE + for( i = 0; i < i_number_of_entries; i++ ) { - msg_Dbg( p_stream, "time[0]: %"PRIu64", moof_offset[0]: %"PRIx64"", - ((uint64_t *)(p_tfra->p_time))[0], - ((uint64_t *)(p_tfra->p_moof_offset))[0] ); - - msg_Dbg( p_stream, "time[1]: %"PRIu64", moof_offset[1]: %"PRIx64"", - ((uint64_t *)(p_tfra->p_time))[1], - ((uint64_t *)(p_tfra->p_moof_offset))[1] ); + if( p_tfra->i_version == 0 ) + { + msg_Dbg( p_stream, "tfra[%"PRIu32"] time[%"PRIu32"]: %"PRIu32", " + "moof_offset[%"PRIu32"]: %"PRIu32"", + p_tfra->i_track_ID, + i, p_tfra->p_time[i], + i, p_tfra->p_moof_offset[i] ); + } + else + { + msg_Dbg( p_stream, "tfra[%"PRIu32"] time[%"PRIu32"]: %"PRIu64", " + "moof_offset[%"PRIu32"]: %"PRIu64"", + p_tfra->i_track_ID, + i, ((uint64_t *)(p_tfra->p_time))[i], + i, ((uint64_t *)(p_tfra->p_moof_offset))[i] ); + } } - - msg_Dbg( p_stream, "number_of_entries is %"PRIu32"", i_number_of_entries ); - msg_Dbg( p_stream, "track ID is: %"PRIu32"", p_tfra->i_track_ID ); +#endif +#ifdef MP4_VERBOSE + msg_Dbg( p_stream, "tfra[%"PRIu32"] %"PRIu32" entries", + p_tfra->i_track_ID, i_number_of_entries ); #endif MP4_READBOX_EXIT( 1 ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
