commit ff61315a1b4c1c4033e775789af33367ecaed2b8
author Aniket Kumar Lata <alata@codeaurora.org> Tue Jul 18 18:19:21 2017 -0700
committer Shiv Maliyappanahalli <smaliyap@codeaurora.org> Tue Aug 15 15:02:27 2017 -0700
tree 3bda51aa0144f608feb171736494b93e186d6d73
parent 761ce6cdda6ebcebba56b4f6230a33adeac5d861

hal: AV sync latency adjustment for non direct profiles

Presentation position calculation for signed_frames does not
account for encoder/sink device latencies. Adjust frames for
non direct profiles based on BT codec in use.

CRs-Fixed: 2078710
Change-Id: Ic3328326f941380b0ae48534ac5d7be22095da23

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index af3a6c5..9e7b1ce 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3254,7 +3254,7 @@
            (out->config.rate);
     }
 
-    if ((AUDIO_DEVICE_OUT_BLUETOOTH_A2DP == out->devices) &&
+    if ((AUDIO_DEVICE_OUT_ALL_A2DP & out->devices) &&
             !(out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD))
         latency += audio_extn_a2dp_get_encoder_latency();
 
@@ -3717,6 +3717,13 @@
                 signed_frames -=
                     (platform_render_latency(out->usecase) * out->sample_rate / 1000000LL);
 
+                // Adjustment accounts for A2dp encoder latency with non offload usecases
+                // Note: Encoder latency is returned in ms, while platform_render_latency in us.
+                if (AUDIO_DEVICE_OUT_ALL_A2DP & out->devices) {
+                    signed_frames -=
+                        (audio_extn_a2dp_get_encoder_latency() * out->sample_rate / 1000);
+                }
+
                 // It would be unusual for this value to be negative, but check just in case ...
                 if (signed_frames >= 0) {
                     *frames = signed_frames;