commit ba8e52b1968d0896a242add8e3c199b370b74f12
author Andy Hung <hunga@google.com> Thu May 11 14:33:03 2023 -0700
committer Andy Hung <hunga@google.com> Thu May 11 19:17:48 2023 -0700
tree 8a8573d833cb930d321808c9eb40cd0decae8b2e
parent 9f896f2fef74c235785d011d8a2afe0445962250

AudioFlinger: remove float and multichannel shim for AIDL

Test: Validate AudioEffects with AIDL mode on and off.
Test: atest android.media.audio.cts.AudioEffectTest \
  android.media.audio.cts.AudioPreProcessingTest \
  android.media.audio.cts.BassBoostTest \
  android.media.audio.cts.EnvReverbTest \
  android.media.audio.cts.EqualizerTest \
  android.media.audio.cts.LoudnessEnhancerTest \
  android.media.audio.cts.PresetReverbTest \
  android.media.audio.cts.VirtualizerTest \
  android.media.audio.cts.VisualizerTest
Bug: 282066693
Change-Id: I08ab707f56d4e7c445306dc1532e887bbbb276c7

services/audioflinger/DeviceEffectManager.cpp

diff --git a/services/audioflinger/DeviceEffectManager.cpp b/services/audioflinger/DeviceEffectManager.cpp
index 2f61a01..4fb6138 100644
--- a/services/audioflinger/DeviceEffectManager.cpp
+++ b/services/audioflinger/DeviceEffectManager.cpp
@@ -23,6 +23,7 @@
 #include <audio_utils/primitives.h>
 
 #include "AudioFlinger.h"
+#include "EffectConfiguration.h"
 #include <media/audiohal/EffectsFactoryHalInterface.h>
 
 // ----------------------------------------------------------------------------
@@ -111,14 +112,16 @@
 
 status_t AudioFlinger::DeviceEffectManager::checkEffectCompatibility(
         const effect_descriptor_t *desc) {
-    sp<EffectsFactoryHalInterface> effectsFactory = mAudioFlinger.getEffectsFactory();
+    const sp<EffectsFactoryHalInterface> effectsFactory =
+            audioflinger::EffectConfiguration::getEffectsFactoryHal();
     if (effectsFactory == nullptr) {
         return BAD_VALUE;
     }
 
-    static AudioHalVersionInfo sMinDeviceEffectHalVersion =
+    static const AudioHalVersionInfo sMinDeviceEffectHalVersion =
             AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 6, 0);
-    AudioHalVersionInfo halVersion = effectsFactory->getHalVersion();
+    static const AudioHalVersionInfo halVersion =
+            audioflinger::EffectConfiguration::getAudioHalVersionInfo();
 
     // We can trust AIDL generated AudioHalVersionInfo comparison operator (based on std::tie) as
     // long as the type, major and minor sequence doesn't change in the definition.
@@ -137,7 +140,8 @@
         const effect_uuid_t *pEffectUuid, int32_t sessionId, int32_t deviceId,
         sp<EffectHalInterface> *effect) {
     status_t status = NO_INIT;
-    sp<EffectsFactoryHalInterface> effectsFactory = mAudioFlinger.getEffectsFactory();
+    const sp<EffectsFactoryHalInterface> effectsFactory =
+            audioflinger::EffectConfiguration::getEffectsFactoryHal();
     if (effectsFactory != 0) {
         status = effectsFactory->createEffect(
                 pEffectUuid, sessionId, AUDIO_IO_HANDLE_NONE, deviceId, effect);