vlc/vlc-3.0 | branch: master | Thomas Guillem <[email protected]> | Fri Aug 16 10:00:46 2019 +0200| [aa50fe7ca7985fcfea0783b85176f866ec502ffc] | committer: Thomas Guillem
coreaudio: add the HostTimeToTick() helper And use the VLC_TICK_FROM_NS() helper. (cherry picked from commit 3249915c5794647ee3b2c62dcc0a973654ccdb74) Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=aa50fe7ca7985fcfea0783b85176f866ec502ffc --- modules/audio_output/coreaudio_common.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/audio_output/coreaudio_common.c b/modules/audio_output/coreaudio_common.c index 223bf41ed3..0861660c33 100644 --- a/modules/audio_output/coreaudio_common.c +++ b/modules/audio_output/coreaudio_common.c @@ -48,6 +48,13 @@ FramesToUs(struct aout_sys_common *p_sys, uint64_t i_nb_frames) return i_nb_frames * CLOCK_FREQ / p_sys->i_rate; } +static inline mdate_t +HostTimeToTick(uint64_t i_host_time) +{ + assert(tinfo.denom != 0); + return i_host_time * tinfo.numer / tinfo.denom / 1000; +} + static void ca_ClearOutBuffers(audio_output_t *p_aout) { @@ -217,8 +224,7 @@ ca_TimeGet(audio_output_t *p_aout, mtime_t *delay) return -1; } - const uint64_t i_render_time_us = p_sys->i_render_host_time - * tinfo.numer / tinfo.denom / 1000; + const mtime_t i_render_time_us = HostTimeToTick(p_sys->i_render_host_time); const mtime_t i_render_delay = i_render_time_us - mdate(); const int64_t i_out_frames = BytesToFrames(p_sys, p_sys->i_out_size); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
