From 0932277fe07f43657ad8fe5b3ea74a3bad2a2827 Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Mon, 19 Jun 2023 19:47:57 +0800
Subject: [PATCH] audio: enable apmg3 feature

Bug: 292144567
Test: verified on test build
Change-Id: I7898494cfe8b52b901d4d61de7a17234cc8a579a
Signed-off-by: Carter Hsu <carterhsu@google.com>
---
 .../config/audio_platform_configuration.xml         | 13 +++++++++++--
 audio/tangorpro/config/mixer_paths.xml              |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/audio/tangorpro/config/audio_platform_configuration.xml b/audio/tangorpro/config/audio_platform_configuration.xml
index 76c4136..77f6f53 100644
--- a/audio/tangorpro/config/audio_platform_configuration.xml
+++ b/audio/tangorpro/config/audio_platform_configuration.xml
@@ -199,7 +199,7 @@
         <usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
         <usecase id="UC_HOSTLESS_UL" dev1="15"/>
         <!-- for VOIP input, 4 * 10ms buffer -->
-        <usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="2"/>
+        <usecase id="UC_VOIP_RECORD" dev1="20" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="2" pcm_ch="4"/>
         <!-- for input wit AUDIO_INPUT_FLAG_FAST  480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes-->
         <usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/>
         <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
@@ -245,10 +245,15 @@
         </usecase>
     </dsp_latency>
 
+    <usecase_effect>
+        <usecase id="UC_VOIP_RECORD" effect_lib="audio_speech_enhancer_aoc.so"/>
+    </usecase_effect>
+
     <soundcard_name name="google,aoc-snd-card" />
     <features>
         <feature name="SoundTriggerDockTuning"/>
         <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:WholeSpeaker"/>
+        <feature name="Apmg3"/>
     </features>
 
     <cfg_attr>
@@ -301,9 +306,13 @@
     <external_module>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1,USB_DOCK:4,USB_HP:4"/>
         <module libname="audio_spk_35l41.so" argu="SpeakerNum=4,Rotation"/>
-        <module libname="audio_fortemedia_aoc.so" argu="RTN_SUP=y DOCK_CHARGER_MONITOR=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so" argu="SpeakerNum=4" />
         <module libname="audio_bluenote_aoc.so"/>
+        <module libname="audio_apmg3_aoc.so"/>
     </external_module>
+
+    <hal_effect>
+        <module libname="audio_speech_enhancer_aoc.so"/>
+    </hal_effect>
 </audio_platform_configuration>
diff --git a/audio/tangorpro/config/mixer_paths.xml b/audio/tangorpro/config/mixer_paths.xml
index 4d5fc66..44cf0ea 100644
--- a/audio/tangorpro/config/mixer_paths.xml
+++ b/audio/tangorpro/config/mixer_paths.xml
@@ -610,14 +610,17 @@
     </path>
 
     <path name="voip-recordC">
+        <ctl name="Incall Capture Stream0" value="3MIC"/>
         <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1"/>
     </path>
 
     <path name="voip-recordC usb-headset-mic">
+        <ctl name="Incall Capture Stream0" value="3MIC"/>
         <ctl name="VOIP TX Mixer USB_TX" value="1"/>
     </path>
 
     <path name="voip-recordC bt-mic">
+        <ctl name="Incall Capture Stream0" value="3MIC"/>
         <ctl name="VOIP TX Mixer BT_TX" value="1"/>
     </path>