commit bd55e0be3b4a2747e96ee240ec794f1c432fdbea
author Xiaojun Sang <xsang@codeaurora.org> Mon Sep 17 17:18:31 2018 +0800
committer Xiaojun Sang <xsang@codeaurora.org> Tue Sep 18 15:58:28 2018 +0800
tree 3b855a30e8076d088dddbb7666b5c1fc91f6ab3d
parent 0dd741a11928a9a4564797d0945089ef163e54b7

hal: set backend channel number to one for mono speaker

Channel number is set incorreclty without consideration of
actual number of speakers. Set backend channel number to one
for mono speaker.

Change-Id: I93970337fb86d0805f4c4c1e1961a928095f3ba8

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index fab7034..46f31fc 100755
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3218,6 +3218,22 @@
     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;
@@ -6371,7 +6387,12 @@
         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;
-        backend_cfg.channels = audio_channel_count_from_out_mask(usecase->stream.out->channel_mask);
+        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);
     }
     if (audio_extn_is_dsp_bit_width_enforce_mode_supported(usecase->stream.out->flags) &&
                 (adev->dsp_bit_width_enforce_mode > backend_cfg.bit_width))