commit 872acb95ba1f98e59b7f7dc5888edbe6a6418475
author Linux Build Service Account <lnxbuild@localhost> Mon Sep 30 00:37:09 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 30 00:37:10 2019 -0700
tree 3ca361bc52036c53684174d8378c67a7548edce9
parent 06e2b9a20a78f5d4fb04fd7745e0a4299120a081
parent a556d3a222a471bd8633f4b33811d2a58256264b

Merge "configs:sdm429: Add mixer ctl for Headphone and WSA combo" into audio-hal.lnx.5.0.c5

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index c99b449..dca98ad 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -7244,7 +7244,8 @@
 
 #ifndef COMPRESS_VOIP_ENABLED
     if (valid_rate && valid_ch &&
-        in->dev->mode == AUDIO_MODE_IN_COMMUNICATION) {
+        (in->dev->mode == AUDIO_MODE_IN_COMMUNICATION ||
+         in->source == AUDIO_SOURCE_VOICE_COMMUNICATION)) {
         in->usecase = USECASE_AUDIO_RECORD_VOIP;
         in->config = default_pcm_config_voip_copp;
         in->config.period_size = VOIP_IO_BUF_SIZE(in->sample_rate,
@@ -7260,8 +7261,9 @@
 #else
     //XXX needed for voice_extn_compress_voip_open_input_stream
     in->config.rate = config->sample_rate;
-    if ((in->dev->mode == AUDIO_MODE_IN_COMMUNICATION ||
-         voice_extn_compress_voip_is_active(in->dev)) &&
+    if((in->dev->mode == AUDIO_MODE_IN_COMMUNICATION ||
+        in->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||
+        voice_extn_compress_voip_is_active(in->dev)) &&
         (voice_extn_compress_voip_is_format_supported(in->format)) &&
         valid_rate && valid_ch) {
         voice_extn_compress_voip_open_input_stream(in);
@@ -7362,13 +7364,6 @@
     in->bit_width = 16;
     in->af_period_multiplier = 1;
 
-    /* Update config params with the requested sample rate and channels */
-    if ((in->device == AUDIO_DEVICE_IN_TELEPHONY_RX) &&
-          (adev->mode != AUDIO_MODE_IN_CALL)) {
-        ret = -EINVAL;
-        goto err_open;
-    }
-
     if (is_usb_dev && may_use_hifi_record) {
         /* HiFi record selects an appropriate format, channel, rate combo
            depending on sink capabilities*/