From 052c18b3e03641e4809f3302d6b3572430f50181 Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Fri, 14 Jul 2023 06:57:41 +0000
Subject: [PATCH 1/2] aidl: sthal: add support for aec record in mixer table

note: This table is only used by AIDL Sthal.

Bug: 291186942
Test: end-to-end enable path by quick phrase.
Change-Id: I3b9e6ca77b70e3a95456c5553d91dbebf4c0ef17
---
 audio/husky/aidl_config/mixer_paths_aidl.xml | 22 ++++++++++----------
 audio/shiba/aidl_config/mixer_paths_aidl.xml | 22 ++++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml
index b04805d..de79b5f 100644
--- a/audio/husky/aidl_config/mixer_paths_aidl.xml
+++ b/audio/husky/aidl_config/mixer_paths_aidl.xml
@@ -787,6 +787,17 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (SOUND_TRIGGER_AEC)">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="Audio Capture Mic Source" value="ERASER" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
+
   <path name="back-microphones">
     <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
@@ -830,17 +841,6 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="voice-recog-aec-mic">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="Audio Capture Mic Source" value="ERASER" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
-
   <path name="unprocessed-mic">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml
index b04805d..de79b5f 100644
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -787,6 +787,17 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (SOUND_TRIGGER_AEC)">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="Audio Capture Mic Source" value="ERASER" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
+
   <path name="back-microphones">
     <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
@@ -830,17 +841,6 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="voice-recog-aec-mic">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="Audio Capture Mic Source" value="ERASER" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
-
   <path name="unprocessed-mic">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />

From 2e2c31cea81afceb534aa15dcb88b41152fbd7bf Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Tue, 11 Jul 2023 16:35:55 +0800
Subject: [PATCH 2/2] audio: sync cca setting from hidl

Bug: 289859350
Test: build pass

Change-Id: I66c28ced092189fce199eb8c8250c2bf836ac4af
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 audio/husky/aidl_config/audio_platform_configuration_aidl.xml | 2 +-
 audio/shiba/aidl_config/audio_platform_configuration_aidl.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/audio/husky/aidl_config/audio_platform_configuration_aidl.xml b/audio/husky/aidl_config/audio_platform_configuration_aidl.xml
index ef8fe23..64e6593 100644
--- a/audio/husky/aidl_config/audio_platform_configuration_aidl.xml
+++ b/audio/husky/aidl_config/audio_platform_configuration_aidl.xml
@@ -70,7 +70,7 @@
   <!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. -->
   <tuner_builder>
     <tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" />
-    <tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=y" />
+    <tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
     <tuner type="capture" name="gs_capture" />
   </tuner_builder>
 </audio_platform_configuration>
diff --git a/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml b/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml
index ef8fe23..64e6593 100644
--- a/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml
+++ b/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml
@@ -70,7 +70,7 @@
   <!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. -->
   <tuner_builder>
     <tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" />
-    <tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=y" />
+    <tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
     <tuner type="capture" name="gs_capture" />
   </tuner_builder>
 </audio_platform_configuration>