From 2cac090b40dfff81e861aae88d1e3effede65024 Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Wed, 1 Mar 2023 06:41:52 +0000
Subject: [PATCH] soundtrigger: aidl table for P22

Test: verify with test build.
Bug: 206738138
Change-Id: Ie3624b037b07b3384b97ca89eed3c018f752b6de
---
 audio/cheetah/aidl_config/audio_policy_configuration.xml | 6 ++++++
 audio/cheetah/aidl_config/mixer_paths_aidl.xml           | 3 +++
 audio/panther/aidl_config/audio_policy_configuration.xml | 6 ++++++
 audio/panther/aidl_config/mixer_paths_aidl.xml           | 3 +++
 4 files changed, 18 insertions(+)

diff --git a/audio/cheetah/aidl_config/audio_policy_configuration.xml b/audio/cheetah/aidl_config/audio_policy_configuration.xml
index 121c3fe..941c9f0 100644
--- a/audio/cheetah/aidl_config/audio_policy_configuration.xml
+++ b/audio/cheetah/aidl_config/audio_policy_configuration.xml
@@ -71,6 +71,11 @@
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
+                <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="16000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
             </mixPorts>
             <devicePorts>
                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
@@ -157,6 +162,7 @@
                 <route type="mix" sink="fast input"
                        sources="Built-In Mic,Built-In Back Mic"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback" />
+                <route type="mix" sink="hotword input" sources="Built-In Mic"/>
             </routes>
         </module>
     </modules>
diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
index 502ca17..aab517f 100644
--- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml
+++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
@@ -587,6 +587,9 @@
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
+  <path name="microphones -> sound-trigger-capture-0">
+  </path>
+
   <path name="audio-recordC usb-headset-mic">
     <ctl name="EP1 TX Mixer USB_TX" value="1" />
   </path>
diff --git a/audio/panther/aidl_config/audio_policy_configuration.xml b/audio/panther/aidl_config/audio_policy_configuration.xml
index 121c3fe..941c9f0 100644
--- a/audio/panther/aidl_config/audio_policy_configuration.xml
+++ b/audio/panther/aidl_config/audio_policy_configuration.xml
@@ -71,6 +71,11 @@
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
+                <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="16000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
             </mixPorts>
             <devicePorts>
                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
@@ -157,6 +162,7 @@
                 <route type="mix" sink="fast input"
                        sources="Built-In Mic,Built-In Back Mic"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback" />
+                <route type="mix" sink="hotword input" sources="Built-In Mic"/>
             </routes>
         </module>
     </modules>
diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml
index 502ca17..aab517f 100644
--- a/audio/panther/aidl_config/mixer_paths_aidl.xml
+++ b/audio/panther/aidl_config/mixer_paths_aidl.xml
@@ -587,6 +587,9 @@
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
+  <path name="microphones -> sound-trigger-capture-0">
+  </path>
+
   <path name="audio-recordC usb-headset-mic">
     <ctl name="EP1 TX Mixer USB_TX" value="1" />
   </path>