commit 94f6d57b84675922d018df1ed2c1ceaf16141e04
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 30 02:36:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 30 02:36:05 2020 +0000
tree 18536acb2763142b78a407daab4ea32e5f38e087
parent ad06ba7d4c790e3f53d770d535516ac3598c8cd8
parent 16d62912f3ed88ca948c2a1da33d6731844cff87

Merge "audio: support more channel condition for stereo recording" into rvc-dev am: d1fcbb752c am: 129fa9a43d am: 16d62912f3

Change-Id: Icffb9b858e509fc92859c4265c71d823c7f82fd2

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 8a2fc18..d8ec06a 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3370,7 +3370,9 @@
                         snd_device = SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE;
                 }
                 in->enable_ec_port = true;
-            } else if ((channel_mask == AUDIO_CHANNEL_IN_FRONT_BACK) &&
+            } else if (((channel_mask == AUDIO_CHANNEL_IN_FRONT_BACK) ||
+                       (channel_mask == AUDIO_CHANNEL_IN_STEREO) ||
+                       (channel_mask == AUDIO_CHANNEL_INDEX_MASK_2)) &&
                        (my_data->source_mic_type & SOURCE_DUAL_MIC)) {
                 snd_device = SND_DEVICE_IN_VOICE_REC_DMIC_STEREO;
             } else if ((channel_mask == AUDIO_CHANNEL_INDEX_MASK_3) &&
@@ -3401,7 +3403,8 @@
     } else if (source == AUDIO_SOURCE_UNPROCESSED) {
         if (in_device & AUDIO_DEVICE_IN_BUILTIN_MIC) {
             if (((channel_mask == AUDIO_CHANNEL_IN_FRONT_BACK) ||
-                 (channel_mask == AUDIO_CHANNEL_IN_STEREO)) &&
+                 (channel_mask == AUDIO_CHANNEL_IN_STEREO) ||
+                 (channel_mask == AUDIO_CHANNEL_INDEX_MASK_2)) &&
                        (my_data->source_mic_type & SOURCE_DUAL_MIC)) {
                 snd_device = SND_DEVICE_IN_UNPROCESSED_STEREO_MIC;
             } else if ((channel_mask == AUDIO_CHANNEL_INDEX_MASK_3) &&