From 4db0307c1de6caf16a1d65d5d791f139e2964ba5 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Tue, 30 Jan 2024 16:33:06 +0800
Subject: [PATCH] audio: fix record tuning

- remove VOICE_RECOGNITION source for spatial capture
- move Mic Spatial Module Enable to audio hal control

Bug: 322926141
Test: manual test - camcorder/voice record with bluenote

Change-Id: I5057762e172ca35367a1929c67f3d364feece00c
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 audio/caiman/aidl_config/audio_platform_configuration.xml | 2 --
 audio/caiman/aidl_config/mixer_paths_aidl.xml             | 8 +++++---
 audio/komodo/aidl_config/audio_platform_configuration.xml | 2 --
 audio/komodo/aidl_config/mixer_paths_aidl.xml             | 8 +++++---
 audio/tokay/aidl_config/audio_platform_configuration.xml  | 2 --
 audio/tokay/aidl_config/mixer_paths_aidl.xml              | 8 +++++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/audio/caiman/aidl_config/audio_platform_configuration.xml b/audio/caiman/aidl_config/audio_platform_configuration.xml
index 6dbabfe2..a91e70c6 100644
--- a/audio/caiman/aidl_config/audio_platform_configuration.xml
+++ b/audio/caiman/aidl_config/audio_platform_configuration.xml
@@ -102,12 +102,10 @@
     <enablement useCase="primary-capture" deviceInterface="microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
     <enablement useCase="primary-capture" deviceInterface="back-microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
   </spatialCapture>
 
diff --git a/audio/caiman/aidl_config/mixer_paths_aidl.xml b/audio/caiman/aidl_config/mixer_paths_aidl.xml
index a23073bb..682842e3 100644
--- a/audio/caiman/aidl_config/mixer_paths_aidl.xml
+++ b/audio/caiman/aidl_config/mixer_paths_aidl.xml
@@ -260,10 +260,14 @@
 
   <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" />
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
-  <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
   <ctl name="Hotword Tap Enable" value="0" />
 
+  <!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc"     -->
+  <!-- crashing since speicifc order is needed between dsp mode and"        -->
+  <!-- spatial module."                                                     -->
+  <ctl name="Mic Spatial Module Enable" value="0" />
+
   <!-- audio PDM mic default state -->
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
@@ -1313,7 +1317,6 @@
 
   <path name="microphones">
     <path name="builtin-mic-id-capture-list" />
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
@@ -1347,7 +1350,6 @@
 
   <path name="microphones (CAMCORDER)">
     <path name="builtin-mic-id-capture-list" />
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
diff --git a/audio/komodo/aidl_config/audio_platform_configuration.xml b/audio/komodo/aidl_config/audio_platform_configuration.xml
index 6dbabfe2..a91e70c6 100644
--- a/audio/komodo/aidl_config/audio_platform_configuration.xml
+++ b/audio/komodo/aidl_config/audio_platform_configuration.xml
@@ -102,12 +102,10 @@
     <enablement useCase="primary-capture" deviceInterface="microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
     <enablement useCase="primary-capture" deviceInterface="back-microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
   </spatialCapture>
 
diff --git a/audio/komodo/aidl_config/mixer_paths_aidl.xml b/audio/komodo/aidl_config/mixer_paths_aidl.xml
index a23073bb..682842e3 100644
--- a/audio/komodo/aidl_config/mixer_paths_aidl.xml
+++ b/audio/komodo/aidl_config/mixer_paths_aidl.xml
@@ -260,10 +260,14 @@
 
   <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" />
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
-  <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
   <ctl name="Hotword Tap Enable" value="0" />
 
+  <!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc"     -->
+  <!-- crashing since speicifc order is needed between dsp mode and"        -->
+  <!-- spatial module."                                                     -->
+  <ctl name="Mic Spatial Module Enable" value="0" />
+
   <!-- audio PDM mic default state -->
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
@@ -1313,7 +1317,6 @@
 
   <path name="microphones">
     <path name="builtin-mic-id-capture-list" />
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
@@ -1347,7 +1350,6 @@
 
   <path name="microphones (CAMCORDER)">
     <path name="builtin-mic-id-capture-list" />
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
diff --git a/audio/tokay/aidl_config/audio_platform_configuration.xml b/audio/tokay/aidl_config/audio_platform_configuration.xml
index 6dbabfe2..a91e70c6 100644
--- a/audio/tokay/aidl_config/audio_platform_configuration.xml
+++ b/audio/tokay/aidl_config/audio_platform_configuration.xml
@@ -102,12 +102,10 @@
     <enablement useCase="primary-capture" deviceInterface="microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
     <enablement useCase="primary-capture" deviceInterface="back-microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
   </spatialCapture>
 
diff --git a/audio/tokay/aidl_config/mixer_paths_aidl.xml b/audio/tokay/aidl_config/mixer_paths_aidl.xml
index a23073bb..682842e3 100644
--- a/audio/tokay/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tokay/aidl_config/mixer_paths_aidl.xml
@@ -260,10 +260,14 @@
 
   <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" />
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
-  <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
   <ctl name="Hotword Tap Enable" value="0" />
 
+  <!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc"     -->
+  <!-- crashing since speicifc order is needed between dsp mode and"        -->
+  <!-- spatial module."                                                     -->
+  <ctl name="Mic Spatial Module Enable" value="0" />
+
   <!-- audio PDM mic default state -->
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
@@ -1313,7 +1317,6 @@
 
   <path name="microphones">
     <path name="builtin-mic-id-capture-list" />
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
@@ -1347,7 +1350,6 @@
 
   <path name="microphones (CAMCORDER)">
     <path name="builtin-mic-id-capture-list" />
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>