[vlc-commits] coreaudio: use the dev latency for the deferred calculation

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Oct 22 14:02:58 2019 +0200| [39db676c13735f09d60d192a2c2fcaef10638ca7] | committer: Thomas Guillem

coreaudio: use the dev latency for the deferred calculation

Tested on iOS (where this variable can be different than 0).

(cherry picked from commit 3d02229ab60feef625ffd7dd5beb9fc0d59be8ea)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=39db676c13735f09d60d192a2c2fcaef10638ca7
---

 modules/audio_output/coreaudio_common.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/audio_output/coreaudio_common.c b/modules/audio_output/coreaudio_common.c
index d727b02134..781f711e31 100644
--- a/modules/audio_output/coreaudio_common.c
+++ b/modules/audio_output/coreaudio_common.c
@@ -263,7 +263,8 @@ ca_GetLatencyLocked(audio_output_t *p_aout)
     struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys;
 
     const int64_t i_out_frames = BytesToFrames(p_sys, p_sys->i_out_size);
-    return FramesToUs(p_sys, i_out_frames + p_sys->i_render_frames);
+    return FramesToUs(p_sys, i_out_frames + p_sys->i_render_frames)
+           + p_sys->i_dev_latency_us;
 }
 
 int
@@ -286,8 +287,7 @@ ca_TimeGet(audio_output_t *p_aout, mtime_t *delay)
     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();
 
-    *delay = ca_GetLatencyLocked(p_aout) + i_render_delay
-           + p_sys->i_dev_latency_us;
+    *delay = ca_GetLatencyLocked(p_aout) + i_render_delay;
     lock_unlock(p_sys);
     return 0;
 }