"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "modules/demux/mp4/mp4.c" between
vlc-3.0.14.tar.xz and vlc-3.0.15.tar.xz

About: VLC (VideoLAN Client) is a multimedia player for various audio and video formats (MPEG-1/2/4, DivX, MP3, Vorbis, Ogg, ...) as well as DVDs, Audio CDs, VCDs, and various streaming protocols.

mp4.c  (vlc-3.0.14.tar.xz):mp4.c  (vlc-3.0.15.tar.xz)
skipping to change at line 1647 skipping to change at line 1647
/* check condition */ /* check condition */
if( i_time + dur > i_target_time ) if( i_time + dur > i_target_time )
break; break;
if( p_data->i_flags & MP4_TRUN_SAMPLE_SIZE ) if( p_data->i_flags & MP4_TRUN_SAMPLE_SIZE )
len = p_data->p_samples[i].i_size; len = p_data->p_samples[i].i_size;
i_time += dur; i_time += dur;
i_pos += len; i_pos += len;
i_sample++;
} }
} }
p_track->context.i_trun_sample = i_sample; p_track->context.i_trun_sample = i_sample;
p_track->context.i_trun_sample_pos = i_pos; p_track->context.i_trun_sample_pos = i_pos;
p_track->context.runs.i_current = i_run; p_track->context.runs.i_current = i_run;
} }
static int FragSeekToTime( demux_t *p_demux, mtime_t i_nztime, bool b_accurate ) static int FragSeekToTime( demux_t *p_demux, mtime_t i_nztime, bool b_accurate )
{ {
skipping to change at line 4368 skipping to change at line 4369
{ {
if( p_block ) if( p_block )
block_Release( p_block ); block_Release( p_block );
return VLC_DEMUXER_FATAL; return VLC_DEMUXER_FATAL;
} }
#if 0 #if 0
msg_Dbg( p_demux, "tk(%i)=%"PRId64" mv=%"PRId64" pos=%"PRIu64, p_track-> i_track_ID, msg_Dbg( p_demux, "tk(%i)=%"PRId64" mv=%"PRId64" pos=%"PRIu64, p_track-> i_track_ID,
VLC_TS_0 + MP4_rescale( i_dts, p_track->i_timescale, CLOCK_FREQ ), VLC_TS_0 + MP4_rescale( i_dts, p_track->i_timescale, CLOCK_FREQ ),
VLC_TS_0 + MP4_rescale( i_pts, p_track->i_timescale, CLOCK_FREQ ), VLC_TS_0 + MP4_rescale( i_pts, p_track->i_timescale, CLOCK_FREQ ),
p_track->context.i_trun_sample_pos ); p_track->context.i_trun_sample_pos - i_read );
#endif #endif
if ( p_track->p_es ) if ( p_track->p_es )
{ {
p_block->i_dts = VLC_TS_0 + MP4_rescale( i_dts, p_track->i_timescale , CLOCK_FREQ ); p_block->i_dts = VLC_TS_0 + MP4_rescale( i_dts, p_track->i_timescale , CLOCK_FREQ );
if( p_track->fmt.i_cat == VIDEO_ES && !( p_trun->i_flags & MP4_TRUN_ SAMPLE_TIME_OFFSET ) ) if( p_track->fmt.i_cat == VIDEO_ES && !( p_trun->i_flags & MP4_TRUN_ SAMPLE_TIME_OFFSET ) )
p_block->i_pts = VLC_TS_INVALID; p_block->i_pts = VLC_TS_INVALID;
else else
p_block->i_pts = VLC_TS_0 + MP4_rescale( i_pts, p_track->i_times cale, CLOCK_FREQ ); p_block->i_pts = VLC_TS_0 + MP4_rescale( i_pts, p_track->i_times cale, CLOCK_FREQ );
p_block->i_length = MP4_rescale( dur, p_track->i_timescale, CLOCK_FR EQ ); p_block->i_length = MP4_rescale( dur, p_track->i_timescale, CLOCK_FR EQ );
MP4_Block_Send( p_demux, p_track, p_block ); MP4_Block_Send( p_demux, p_track, p_block );
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)