From 4ff8698a25025ed1bfa1d70f7d9046893c2342e2 Mon Sep 17 00:00:00 2001
From: Shraddha Basantwani <shraddha.basantwani@ittiam.com>
Date: Tue, 13 Dec 2022 16:31:49 +0530
Subject: [PATCH] Audio AIDL : Add libeffects downmix implementation uuid

Bug: 258124419
Test: atest VtsHalDownmixTargetTest

Change-Id: I32d415d83e0a068efbea93ef4c2af3403db0f0a5
---
 audio/aidl/default/Android.bp                       | 2 +-
 audio/aidl/default/audio_effects_config.xml         | 4 ++--
 audio/aidl/default/include/effect-impl/EffectUUID.h | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/audio/aidl/default/Android.bp b/audio/aidl/default/Android.bp
index 803880f85a..88cd601c1a 100644
--- a/audio/aidl/default/Android.bp
+++ b/audio/aidl/default/Android.bp
@@ -128,7 +128,7 @@ cc_binary {
     shared_libs: [
         "libbassboostsw",
         "libbundleaidl",
-        "libdownmixsw",
+        "libdownmixaidl",
         "libdynamicsprocessingsw",
         "libenvreverbsw",
         "libequalizersw",
diff --git a/audio/aidl/default/audio_effects_config.xml b/audio/aidl/default/audio_effects_config.xml
index c08f913fd2..c292851c1d 100644
--- a/audio/aidl/default/audio_effects_config.xml
+++ b/audio/aidl/default/audio_effects_config.xml
@@ -30,7 +30,7 @@
     <libraries>
         <library name="bassboostsw" path="libbassboostsw.so"/>
         <library name="bundle" path="libbundleaidl.so"/>
-        <library name="downmixsw" path="libdownmixsw.so"/>
+        <library name="downmix" path="libdownmixaidl.so"/>
         <library name="dynamics_processingsw" path="libdynamicsprocessingsw.so"/>
         <library name="equalizersw" path="libequalizersw.so"/>
         <library name="haptic_generatorsw" path="libhapticgeneratorsw.so"/>
@@ -66,7 +66,7 @@
             <libsw library="bassboostsw" uuid="fa8181f2-588b-11ed-9b6a-0242ac120002"/>
             <libsw library="bundle" uuid="8631f300-72e2-11df-b57e-0002a5d5c51b"/>
         </effectProxy>
-        <effect name="downmix" library="downmixsw" uuid="fa8187ba-588b-11ed-9b6a-0242ac120002"/>
+        <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
         <effect name="dynamics_processing" library="dynamics_processingsw" uuid="fa818d78-588b-11ed-9b6a-0242ac120002"/>
         <effect name="haptic_generator" library="haptic_generatorsw" uuid="fa819110-588b-11ed-9b6a-0242ac120002"/>
         <effect name="loudness_enhancer" library="loudness_enhancersw" uuid="fa819610-588b-11ed-9b6a-0242ac120002"/>
diff --git a/audio/aidl/default/include/effect-impl/EffectUUID.h b/audio/aidl/default/include/effect-impl/EffectUUID.h
index d3c76669be..4f66bf3000 100644
--- a/audio/aidl/default/include/effect-impl/EffectUUID.h
+++ b/audio/aidl/default/include/effect-impl/EffectUUID.h
@@ -69,6 +69,12 @@ static const AudioUuid kDownmixSwImplUUID = {static_cast<int32_t>(0xfa8187ba),
                                              0x11ed,
                                              0x9b6a,
                                              {0x02, 0x42, 0xac, 0x12, 0x00, 0x02}};
+// 93f04452-e4fe-41cc-91f9-e475b6d1d69f
+static const AudioUuid kDownmixImplUUID = {static_cast<int32_t>(0x93f04452),
+                                           0xe4fe,
+                                           0x41cc,
+                                           0x91f9,
+                                           {0xe4, 0x75, 0xb6, 0xd1, 0xd6, 0x9f}};
 // 0bed4300-ddd6-11db-8f34-0002a5d5c51b.
 static const AudioUuid kEqualizerTypeUUID = {static_cast<int32_t>(0x0bed4300),
                                              0xddd6,