commit faaffde5294858b903942dcd4b50f05f5eefa797
author Aniket Kumar Lata <alata@codeaurora.org> Wed Mar 22 19:18:15 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 05 02:36:32 2017 -0700
tree 0b9cbb2c6b16472d64d6135f998d947e9b2534d8
parent 653aaefa4f0a3b503976aa6f0bfd59a8cacfea42

hal: Use cached value of bt encoder format for encoder latency

Fixes device switch from A2dp to speaker taking 10+ seconds.
Communication from audio hal to bt ipc lib results in multiple
socket failures with host as BT is disconnecting. Use cached
encoder format rather than querying again, this will avoid adding
additional latency due to encoder latency checks.

CRs-Fixed: 2028982
Change-Id: I91bd8060660efa0ab163c70112eae59b9a594377

hal/audio_extn/a2dp.c

diff --git a/hal/audio_extn/a2dp.c b/hal/audio_extn/a2dp.c
index 659d72c..fba7e6c 100644
--- a/hal/audio_extn/a2dp.c
+++ b/hal/audio_extn/a2dp.c
@@ -832,23 +832,11 @@
 
 uint32_t audio_extn_a2dp_get_encoder_latency()
 {
-    void *codec_info = NULL;
-    uint8_t multi_cast = 0, num_dev = 1;
-    audio_format_t codec_type = AUDIO_FORMAT_INVALID;
     uint32_t latency = 0;
     int avsync_runtime_prop = 0;
     int sbc_offset = 0, aptx_offset = 0, aptxhd_offset = 0, aac_offset = 0;
     char value[PROPERTY_VALUE_MAX];
 
-    if (!a2dp.audio_get_codec_config) {
-        ALOGE(" a2dp handle is not identified");
-        return latency;
-    }
-
-    if (a2dp.a2dp_started)
-        codec_info = a2dp.audio_get_codec_config(&multi_cast, &num_dev,
-                               &codec_type);
-
     memset(value, '\0', sizeof(char)*PROPERTY_VALUE_MAX);
     avsync_runtime_prop = property_get("audio.a2dp.codec.latency", value, NULL);
     if (avsync_runtime_prop > 0) {
@@ -859,7 +847,7 @@
         }
     }
 
-    switch(codec_type) {
+    switch(a2dp.bt_encoder_format) {
         case AUDIO_FORMAT_SBC:
             latency = (avsync_runtime_prop > 0) ? sbc_offset : 150;
             break;