commit 3ff768954a8d1ac1effc3a745f842b231f58a93c
author Vignesh Kulothungan <vigneshk@codeaurora.org> Wed Jun 05 11:49:28 2019 -0700
committer Bubble Fang <bubblefang@google.com> Sun Jun 09 15:56:18 2019 +0000
tree 25ea1dcd7af56e8927861ba43c41fce789242cc1
parent b0c9148b009e4488f4a8b2ae3d009cb46ce2bc04

audio: Add support for DSDS for incall music feature

Add support for incall-music-uplink2 usecase to enable Dual Sim
Dual Standby (DSDS) voice scenarios

Bug: 132080107
Test: Local test
Change-Id: I26206b1887f002bb58fcfb3378600ef81e111662
Signed-off-by: BubbleFang <bubblefang@google.com>

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 2113c7d..5d611c6 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -315,6 +315,7 @@
     [USECASE_AUDIO_RECORD_VOIP] = "audio-record-voip",
 
     [USECASE_INCALL_MUSIC_UPLINK] = "incall-music-uplink",
+    [USECASE_INCALL_MUSIC_UPLINK2] = "incall-music-uplink2",
 
     [USECASE_AUDIO_A2DP_ABR_FEEDBACK] = "a2dp-abr-feedback",
 };
@@ -1725,7 +1726,8 @@
             out_snd_device = SND_DEVICE_OUT_SPEAKER;
     }
 
-    if (usecase->id == USECASE_INCALL_MUSIC_UPLINK) {
+    if (usecase->id == USECASE_INCALL_MUSIC_UPLINK ||
+        usecase->id == USECASE_INCALL_MUSIC_UPLINK2) {
         out_snd_device = SND_DEVICE_OUT_VOICE_MUSIC_TX;
     }
 
@@ -2338,8 +2340,10 @@
         audio_low_latency_hint_end();
     }
 
-    if (out->usecase == USECASE_INCALL_MUSIC_UPLINK)
+    if (out->usecase == USECASE_INCALL_MUSIC_UPLINK ||
+        out->usecase == USECASE_INCALL_MUSIC_UPLINK2) {
         voice_set_device_mute_flag(adev, false);
+    }
 
     /* 1. Get and set stream specific mixer controls */
     disable_audio_route(adev, uc_info);
@@ -2444,6 +2448,16 @@
         goto error_config;
     }
 
+    //Update incall music usecase to reflect correct voice session
+    if (out->flags & AUDIO_OUTPUT_FLAG_INCALL_MUSIC) {
+        ret = voice_extn_check_and_set_incall_music_usecase(adev, out);
+        if (ret != 0) {
+            ALOGE("%s: Incall music delivery usecase cannot be set error:%d",
+                __func__, ret);
+            goto error_config;
+        }
+    }
+
     if (out->devices & AUDIO_DEVICE_OUT_ALL_A2DP) {
         if (!audio_extn_a2dp_is_ready()) {
             if (out->devices & (AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
@@ -2506,8 +2520,10 @@
 
     audio_extn_extspk_update(adev->extspk);
 
-    if (out->usecase == USECASE_INCALL_MUSIC_UPLINK)
+    if (out->usecase == USECASE_INCALL_MUSIC_UPLINK ||
+        out->usecase == USECASE_INCALL_MUSIC_UPLINK2) {
         voice_set_device_mute_flag(adev, true);
+    }
 
     ALOGV("%s: Opening PCM device card_id(%d) device_id(%d) format(%#x)",
           __func__, adev->snd_card, out->pcm_device_id, out->config.format);
@@ -3502,7 +3518,9 @@
             if (out->muted)
                 memset((void *)buffer, 0, bytes);
             // FIXME: this can be removed once audio flinger mixer supports mono output
-            if (out->usecase == USECASE_AUDIO_PLAYBACK_VOIP || out->usecase == USECASE_INCALL_MUSIC_UPLINK) {
+            if (out->usecase == USECASE_AUDIO_PLAYBACK_VOIP ||
+                out->usecase == USECASE_INCALL_MUSIC_UPLINK ||
+                out->usecase == USECASE_INCALL_MUSIC_UPLINK2) {
                 size_t channel_count = audio_channel_count_from_out_mask(out->channel_mask);
                 int16_t *src = (int16_t *)buffer;
                 int16_t *dst = (int16_t *)buffer;