commit 1e1ebbf3ec5f7d288579c2e1ae7a9df582e4188c
author carter_hsu <carter_hsu@htc.com> Tue Aug 15 11:39:55 2017 +0800
committer David Lin <dtwlin@google.com> Tue Sep 05 10:49:12 2017 -0700
tree 331194559beeedae34cdd4fc0dec0372996c3cc4
parent c76a53531ca2a2429b794cba9709804c7ad7faea

audio: fix device pair for VOIP case

Since the dedicated VOIP output has been enabled, to select
VOIP device pair by primary output may not be solid.

To check the voip output first in VOIP case in case the wrong output device
is passed to get_snd_input_device function.

Bug: 64774724
Test: manual audio test
Change-Id: If7efbb40fe28d1b9ac1435406b2693cfb3be8ed8
Signed-off-by: carter_hsu <carter_hsu@htc.com>

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index ad5d1f1..c27042e 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1206,13 +1206,20 @@
             usecase->devices = usecase->stream.out->devices;
             in_snd_device = SND_DEVICE_NONE;
             if (out_snd_device == SND_DEVICE_NONE) {
+                struct stream_out *voip_out = adev->primary_output;
+                struct audio_usecase *voip_usecase = get_usecase_from_list(adev,
+                                                         USECASE_AUDIO_PLAYBACK_VOIP);
+
                 out_snd_device = platform_get_output_snd_device(adev->platform,
                                             usecase->stream.out->devices);
-                if (usecase->stream.out == adev->primary_output &&
+
+                if (voip_usecase)
+                    voip_out = voip_usecase->stream.out;
+
+                if (usecase->stream.out == voip_out &&
                         adev->active_input &&
                         (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||
-                            adev->mode == AUDIO_MODE_IN_COMMUNICATION) &&
-                        out_snd_device != usecase->out_snd_device) {
+                            adev->mode == AUDIO_MODE_IN_COMMUNICATION)) {
                     select_devices(adev, adev->active_input->usecase);
                 }
             }
@@ -1224,9 +1231,15 @@
                 if (adev->active_input &&
                         (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||
                             adev->mode == AUDIO_MODE_IN_COMMUNICATION)) {
+
+                    struct audio_usecase *voip_usecase = get_usecase_from_list(adev,
+                                                             USECASE_AUDIO_PLAYBACK_VOIP);
+
                     platform_set_echo_reference(adev, false, AUDIO_DEVICE_NONE);
                     if (usecase->id == USECASE_AUDIO_RECORD_AFE_PROXY) {
                         out_device = AUDIO_DEVICE_OUT_TELEPHONY_TX;
+                    } else if (voip_usecase) {
+                        out_device = voip_usecase->stream.out->devices;
                     } else if (adev->primary_output) {
                         out_device = adev->primary_output->devices;
                     }