commit 841cb5f27eca0358f8b6e9692877bc47e4f833d5
author Xiaojun Sang <xsang@codeaurora.org> Tue Nov 06 19:37:44 2018 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 15 17:56:17 2018 -0800
tree 4bc7f09d0cd02e2d6f085b8ec9ac4251ce6d2ca0
parent 36fc0e3052a042cc3e6113f1e34400b245ea829e

Revert "hal: set backend channel number to one for mono speaker"

This reverts commit bd55e0be3b4a2747e96ee240ec794f1c432fdbea.
Removal of HAL access to channel mixer ctrl fixes the issue
as a better approach.

Change-Id: I5457bbc2e5185047289f440cbea222a6592f71b1

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index bdc8925..8c26f5d 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3364,22 +3364,6 @@
     return ret;
 }
 
-static bool check_snd_device_is_speaker(snd_device_t snd_device)
-{
-    bool ret = false;
-
-    if (snd_device == SND_DEVICE_OUT_SPEAKER ||
-        snd_device == SND_DEVICE_OUT_SPEAKER_WSA ||
-        snd_device == SND_DEVICE_OUT_SPEAKER_VBAT ||
-        snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED ||
-        snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT ||
-        snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED_RAS ||
-        snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT_RAS) {
-        ret = true;
-    }
-    return ret;
-}
-
 int check_hdset_combo_device(snd_device_t snd_device)
 {
     int ret = false;
@@ -6673,12 +6657,7 @@
         backend_cfg.bit_width = usecase->stream.out->bit_width;
         backend_cfg.sample_rate = usecase->stream.out->sample_rate;
         backend_cfg.format = usecase->stream.out->format;
-        if (!(hw_info_is_stereo_spkr(my_data->hw_info)) &&
-             check_snd_device_is_speaker(snd_device))
-            backend_cfg.channels = 1;
-        else
-            backend_cfg.channels =
-                audio_channel_count_from_out_mask(usecase->stream.out->channel_mask);
+        backend_cfg.channels = audio_channel_count_from_out_mask(usecase->stream.out->channel_mask);
     }
     if (audio_extn_is_dsp_bit_width_enforce_mode_supported(usecase->stream.out->flags) &&
                 (adev->dsp_bit_width_enforce_mode > backend_cfg.bit_width))