From a10a9d85f2ff4dcd254beeb2516c299bb83e0f42 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Wed, 5 May 2021 10:54:31 +0800
Subject: [PATCH] audio: replace audio_pre_process with offload_effect and
 remove audio_pre_process

Move AEC and NS to the liboffloadeffect

Bug: 187153996
Test: make -j128
Test: run cts --include-filter "CtsMediaTestCases android.media.cts.AudioPreProcessingTest"
Change-Id: Ic4b7260b483b776ca917dc3694b7d66ba7eefde7
---
 audio/oriole/config/audio_effects.xml   | 5 ++---
 audio/raven/config/audio_effects.xml    | 5 ++---
 audio/slider/config/audio_effects.xml   | 5 ++---
 audio/whitefin/config/audio_effects.xml | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/audio/oriole/config/audio_effects.xml b/audio/oriole/config/audio_effects.xml
index 62e1679..9777468 100644
--- a/audio/oriole/config/audio_effects.xml
+++ b/audio/oriole/config/audio_effects.xml
@@ -9,7 +9,6 @@
         <library name="loudness_enhancer" path="libldnhncr.so"/>
         <library name="proxy" path="libeffectproxy.so"/>
         <library name="offload_effect" path="liboffloadeffect.so"/>
-        <library name="audio_pre_process" path="libdsp_aecns.so"/>
         <library name="haptic_generator" path="libhapticgenerator.so"/>
     </libraries>
     <effects>
@@ -48,8 +47,8 @@
         </effectProxy>
         <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
         <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
-        <effect name="aec" library="audio_pre_process" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
-        <effect name="ns" library="audio_pre_process" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
+        <effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
+        <effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
         <effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
     </effects>
     <postprocess>
diff --git a/audio/raven/config/audio_effects.xml b/audio/raven/config/audio_effects.xml
index 62e1679..9777468 100644
--- a/audio/raven/config/audio_effects.xml
+++ b/audio/raven/config/audio_effects.xml
@@ -9,7 +9,6 @@
         <library name="loudness_enhancer" path="libldnhncr.so"/>
         <library name="proxy" path="libeffectproxy.so"/>
         <library name="offload_effect" path="liboffloadeffect.so"/>
-        <library name="audio_pre_process" path="libdsp_aecns.so"/>
         <library name="haptic_generator" path="libhapticgenerator.so"/>
     </libraries>
     <effects>
@@ -48,8 +47,8 @@
         </effectProxy>
         <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
         <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
-        <effect name="aec" library="audio_pre_process" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
-        <effect name="ns" library="audio_pre_process" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
+        <effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
+        <effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
         <effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
     </effects>
     <postprocess>
diff --git a/audio/slider/config/audio_effects.xml b/audio/slider/config/audio_effects.xml
index 62e1679..9777468 100644
--- a/audio/slider/config/audio_effects.xml
+++ b/audio/slider/config/audio_effects.xml
@@ -9,7 +9,6 @@
         <library name="loudness_enhancer" path="libldnhncr.so"/>
         <library name="proxy" path="libeffectproxy.so"/>
         <library name="offload_effect" path="liboffloadeffect.so"/>
-        <library name="audio_pre_process" path="libdsp_aecns.so"/>
         <library name="haptic_generator" path="libhapticgenerator.so"/>
     </libraries>
     <effects>
@@ -48,8 +47,8 @@
         </effectProxy>
         <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
         <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
-        <effect name="aec" library="audio_pre_process" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
-        <effect name="ns" library="audio_pre_process" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
+        <effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
+        <effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
         <effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
     </effects>
     <postprocess>
diff --git a/audio/whitefin/config/audio_effects.xml b/audio/whitefin/config/audio_effects.xml
index 62e1679..9777468 100644
--- a/audio/whitefin/config/audio_effects.xml
+++ b/audio/whitefin/config/audio_effects.xml
@@ -9,7 +9,6 @@
         <library name="loudness_enhancer" path="libldnhncr.so"/>
         <library name="proxy" path="libeffectproxy.so"/>
         <library name="offload_effect" path="liboffloadeffect.so"/>
-        <library name="audio_pre_process" path="libdsp_aecns.so"/>
         <library name="haptic_generator" path="libhapticgenerator.so"/>
     </libraries>
     <effects>
@@ -48,8 +47,8 @@
         </effectProxy>
         <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
         <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
-        <effect name="aec" library="audio_pre_process" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
-        <effect name="ns" library="audio_pre_process" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
+        <effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
+        <effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
         <effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
     </effects>
     <postprocess>