From 4101e821334d43fc8c7667e17300cfd264d557b1 Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Mon, 19 Apr 2021 08:56:40 +0800
Subject: [PATCH] audio: separate the spatial audio and WNR block

Bug: 186801118
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I38be2bfd58e864e7f17bc58109d5b4a77df5704b
---
 .../config/audio_platform_configuration.xml       | 15 ++++++++-------
 .../raven/config/audio_platform_configuration.xml | 15 ++++++++-------
 .../config/audio_platform_configuration.xml       | 15 ++++++++-------
 .../config/audio_platform_configuration.xml       | 15 ++++++++-------
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml
index 70fd649..6dbcdbc 100644
--- a/audio/oriole/config/audio_platform_configuration.xml
+++ b/audio/oriole/config/audio_platform_configuration.xml
@@ -34,7 +34,7 @@
         <!--intf id="BE_HW_RX_INTF_3" name="BT_RX"/-->
         <intf id="BE_VIRTUAL_VOICE_RX_TUNING" block_id="19"/>
         <intf id="BE_VIRTUAL_VOICE_TX_TUNING" block_id="19"/>
-        <intf id="BE_HW_TX_INTF_3" name="Camcorder" block_id="128"/>
+        <intf id="BE_HW_TX_INTF_0" block_id="134,128"/>
     </hw_intf>
 
     <product_lists>
@@ -173,12 +173,12 @@
         <cfg id="IN_USB_TTY_HCO_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic"/>
         <cfg id="IN_HANDSET_MIC_BE_CFG" intf_id="BE_HW_TX_INTF_0" mux="HW_MUX_GP_0" tuning_id="10" codec_path="handset-mic" be_path="NULL"/>
         <cfg id="IN_SPK_VI_BE_CFG" codec_path="NULL" be_path="spk-vi"/>
-        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="70"/>
-        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" intf_name="Camcorder" tuning_id="72"/>
-        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="73"/>
-        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="74"/>
-        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" intf_name="Camcorder" tuning_id="75"/>
+        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="70"/>
+        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" tuning_id="72"/>
+        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" tuning_id="73"/>
+        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" tuning_id="74"/>
+        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" tuning_id="75"/>
     </cfg_attr>
 
     <xlate_id>
@@ -205,5 +205,6 @@
         <module libname="audio_fortemedia_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
+        <module libname="audio_bluenote_aoc.so"/>
     </external_module>
 </audio_platform_configuration>
diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml
index 70fd649..6dbcdbc 100644
--- a/audio/raven/config/audio_platform_configuration.xml
+++ b/audio/raven/config/audio_platform_configuration.xml
@@ -34,7 +34,7 @@
         <!--intf id="BE_HW_RX_INTF_3" name="BT_RX"/-->
         <intf id="BE_VIRTUAL_VOICE_RX_TUNING" block_id="19"/>
         <intf id="BE_VIRTUAL_VOICE_TX_TUNING" block_id="19"/>
-        <intf id="BE_HW_TX_INTF_3" name="Camcorder" block_id="128"/>
+        <intf id="BE_HW_TX_INTF_0" block_id="134,128"/>
     </hw_intf>
 
     <product_lists>
@@ -173,12 +173,12 @@
         <cfg id="IN_USB_TTY_HCO_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic"/>
         <cfg id="IN_HANDSET_MIC_BE_CFG" intf_id="BE_HW_TX_INTF_0" mux="HW_MUX_GP_0" tuning_id="10" codec_path="handset-mic" be_path="NULL"/>
         <cfg id="IN_SPK_VI_BE_CFG" codec_path="NULL" be_path="spk-vi"/>
-        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="70"/>
-        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" intf_name="Camcorder" tuning_id="72"/>
-        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="73"/>
-        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="74"/>
-        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" intf_name="Camcorder" tuning_id="75"/>
+        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="70"/>
+        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" tuning_id="72"/>
+        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" tuning_id="73"/>
+        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" tuning_id="74"/>
+        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" tuning_id="75"/>
     </cfg_attr>
 
     <xlate_id>
@@ -205,5 +205,6 @@
         <module libname="audio_fortemedia_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
+        <module libname="audio_bluenote_aoc.so"/>
     </external_module>
 </audio_platform_configuration>
diff --git a/audio/slider/config/audio_platform_configuration.xml b/audio/slider/config/audio_platform_configuration.xml
index fa14105..74e3852 100644
--- a/audio/slider/config/audio_platform_configuration.xml
+++ b/audio/slider/config/audio_platform_configuration.xml
@@ -34,7 +34,7 @@
         <!--intf id="BE_HW_RX_INTF_3" name="BT_RX"/-->
         <intf id="BE_VIRTUAL_VOICE_RX_TUNING" block_id="19"/>
         <intf id="BE_VIRTUAL_VOICE_TX_TUNING" block_id="19"/>
-        <intf id="BE_HW_TX_INTF_3" name="Camcorder" block_id="128"/>
+        <intf id="BE_HW_TX_INTF_0" block_id="134,128"/>
     </hw_intf>
 
     <product_lists>
@@ -173,12 +173,12 @@
         <cfg id="IN_USB_TTY_HCO_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic"/>
         <cfg id="IN_HANDSET_MIC_BE_CFG" intf_id="BE_HW_TX_INTF_0" mux="HW_MUX_GP_0" tuning_id="10" codec_path="handset-mic" be_path="NULL"/>
         <cfg id="IN_SPK_VI_BE_CFG" codec_path="NULL" be_path="spk-vi"/>
-        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" tuning_id="71"/>
     </cfg_attr>
 
     <xlate_id>
@@ -205,5 +205,6 @@
         <module libname="audio_fortemedia_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
+        <module libname="audio_bluenote_aoc.so"/>
     </external_module>
 </audio_platform_configuration>
diff --git a/audio/whitefin/config/audio_platform_configuration.xml b/audio/whitefin/config/audio_platform_configuration.xml
index fa14105..74e3852 100644
--- a/audio/whitefin/config/audio_platform_configuration.xml
+++ b/audio/whitefin/config/audio_platform_configuration.xml
@@ -34,7 +34,7 @@
         <!--intf id="BE_HW_RX_INTF_3" name="BT_RX"/-->
         <intf id="BE_VIRTUAL_VOICE_RX_TUNING" block_id="19"/>
         <intf id="BE_VIRTUAL_VOICE_TX_TUNING" block_id="19"/>
-        <intf id="BE_HW_TX_INTF_3" name="Camcorder" block_id="128"/>
+        <intf id="BE_HW_TX_INTF_0" block_id="134,128"/>
     </hw_intf>
 
     <product_lists>
@@ -173,12 +173,12 @@
         <cfg id="IN_USB_TTY_HCO_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic"/>
         <cfg id="IN_HANDSET_MIC_BE_CFG" intf_id="BE_HW_TX_INTF_0" mux="HW_MUX_GP_0" tuning_id="10" codec_path="handset-mic" be_path="NULL"/>
         <cfg id="IN_SPK_VI_BE_CFG" codec_path="NULL" be_path="spk-vi"/>
-        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" intf_name="Camcorder" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
+        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" tuning_id="71"/>
     </cfg_attr>
 
     <xlate_id>
@@ -205,5 +205,6 @@
         <module libname="audio_fortemedia_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
+        <module libname="audio_bluenote_aoc.so"/>
     </external_module>
 </audio_platform_configuration>