vlc | branch: master | Steve Lhomme <[email protected]> | Fri Jun 8 13:43:44 2018 +0200| [d3154e77506e8b918a302ce707c04d39726e3819] | committer: Steve Lhomme
demux:mp4: separate the vlc_tick_t and scaled time values in MP4_TrackGetDTS() To avoid confusion, conversion issues, readability. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d3154e77506e8b918a302ce707c04d39726e3819 --- modules/demux/mp4/mp4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index bf934970f8..dea92d54b4 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -321,25 +321,25 @@ static inline vlc_tick_t MP4_TrackGetDTS( demux_t *p_demux, mp4_track_t *p_track unsigned int i_index = 0; unsigned int i_sample = p_track->i_sample - p_chunk->i_sample_first; - int64_t i_dts = p_chunk->i_first_dts; + int64_t sdts = p_chunk->i_first_dts; while( i_sample > 0 && i_index < p_chunk->i_entries_dts ) { if( i_sample > p_chunk->p_sample_count_dts[i_index] ) { - i_dts += p_chunk->p_sample_count_dts[i_index] * + sdts += p_chunk->p_sample_count_dts[i_index] * p_chunk->p_sample_delta_dts[i_index]; i_sample -= p_chunk->p_sample_count_dts[i_index]; i_index++; } else { - i_dts += i_sample * p_chunk->p_sample_delta_dts[i_index]; + sdts += i_sample * p_chunk->p_sample_delta_dts[i_index]; break; } } - i_dts = MP4_rescale( i_dts, p_track->i_timescale, CLOCK_FREQ ); + vlc_tick_t i_dts = MP4_rescale( sdts, p_track->i_timescale, CLOCK_FREQ ); /* now handle elst */ if( p_track->p_elst && p_track->BOXDATA(p_elst)->i_entry_count ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
