diff options
| author | Shunkai Yao <yaoshunkai@google.com> | 2023-03-06 18:41:27 +0000 |
|---|---|---|
| committer | Shunkai Yao <yaoshunkai@google.com> | 2023-03-20 01:48:10 +0000 |
| commit | 4b3434f96efab51e863e9133336a49f30a859575 (patch) | |
| tree | d996a124e41c2053705e39d43bdeee368b4793dd /audio/aidl/default/EffectFactory.cpp | |
| parent | 2da977681b96a0b64924bc010bc1fc26981221c8 (diff) | |
Update EffectUUID initialization
Avoid dynamic initialization global UUID variables
Bug: 271500140
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I7574c1fe1ba0aaff1d9d29a9eed10de1aef33806
Diffstat (limited to 'audio/aidl/default/EffectFactory.cpp')
| -rw-r--r-- | audio/aidl/default/EffectFactory.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/audio/aidl/default/EffectFactory.cpp b/audio/aidl/default/EffectFactory.cpp index 638fa7fbb8..c1ac3f2d41 100644 --- a/audio/aidl/default/EffectFactory.cpp +++ b/audio/aidl/default/EffectFactory.cpp @@ -14,20 +14,19 @@ * limitations under the License. */ +#include <dlfcn.h> #include <iterator> #include <memory> #include <tuple> -#include "include/effect-impl/EffectTypes.h" -#define LOG_TAG "AHAL_EffectFactory" -#include <dlfcn.h> #include <unordered_set> +#define LOG_TAG "AHAL_EffectFactory" #include <android-base/logging.h> #include <android/binder_ibinder_platform.h> +#include <system/audio_effects/effect_uuid.h> #include <system/thread_defs.h> #include "effect-impl/EffectTypes.h" -#include "effect-impl/EffectUUID.h" #include "effectFactory-impl/EffectFactory.h" using aidl::android::media::audio::common::AudioUuid; @@ -214,8 +213,8 @@ void Factory::createIdentityWithConfig(const EffectConfig::LibraryUuid& configLi void Factory::loadEffectLibs() { const auto& configEffectsMap = mConfig.getEffectsMap(); for (const auto& configEffects : configEffectsMap) { - if (auto typeUuid = kUuidNameTypeMap.find(configEffects.first /* effect name */); - typeUuid != kUuidNameTypeMap.end()) { + if (AudioUuid uuid; + EffectConfig::findUuid(configEffects.first /* xml effect name */, &uuid)) { const auto& configLibs = configEffects.second; std::optional<AudioUuid> proxyUuid; if (configLibs.proxyLibrary.has_value()) { @@ -223,7 +222,7 @@ void Factory::loadEffectLibs() { proxyUuid = proxyLib.uuid; } for (const auto& configLib : configLibs.libraries) { - createIdentityWithConfig(configLib, typeUuid->second, proxyUuid); + createIdentityWithConfig(configLib, uuid, proxyUuid); } } else { LOG(ERROR) << __func__ << ": can not find type UUID for effect " << configEffects.first |