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/automaticGainControlV2/AutomaticGainControlV2Sw.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/automaticGainControlV2/AutomaticGainControlV2Sw.cpp')
| -rw-r--r-- | audio/aidl/default/automaticGainControlV2/AutomaticGainControlV2Sw.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/audio/aidl/default/automaticGainControlV2/AutomaticGainControlV2Sw.cpp b/audio/aidl/default/automaticGainControlV2/AutomaticGainControlV2Sw.cpp index 50712a4f5b..1e336ac012 100644 --- a/audio/aidl/default/automaticGainControlV2/AutomaticGainControlV2Sw.cpp +++ b/audio/aidl/default/automaticGainControlV2/AutomaticGainControlV2Sw.cpp @@ -17,22 +17,24 @@ #include <algorithm> #include <cstddef> #include <memory> - #define LOG_TAG "AHAL_AutomaticGainControlV2Sw" + #include <android-base/logging.h> #include <fmq/AidlMessageQueue.h> +#include <system/audio_effects/effect_uuid.h> #include "AutomaticGainControlV2Sw.h" using aidl::android::hardware::audio::effect::AutomaticGainControlV2Sw; using aidl::android::hardware::audio::effect::Descriptor; +using aidl::android::hardware::audio::effect::getEffectImplUuidAutomaticGainControlV2Sw; +using aidl::android::hardware::audio::effect::getEffectTypeUuidAutomaticGainControlV2; using aidl::android::hardware::audio::effect::IEffect; -using aidl::android::hardware::audio::effect::kAutomaticGainControlV2SwImplUUID; using aidl::android::media::audio::common::AudioUuid; extern "C" binder_exception_t createEffect(const AudioUuid* in_impl_uuid, std::shared_ptr<IEffect>* instanceSpp) { - if (!in_impl_uuid || *in_impl_uuid != kAutomaticGainControlV2SwImplUUID) { + if (!in_impl_uuid || *in_impl_uuid != getEffectImplUuidAutomaticGainControlV2Sw()) { LOG(ERROR) << __func__ << "uuid not supported"; return EX_ILLEGAL_ARGUMENT; } @@ -47,7 +49,7 @@ extern "C" binder_exception_t createEffect(const AudioUuid* in_impl_uuid, } extern "C" binder_exception_t queryEffect(const AudioUuid* in_impl_uuid, Descriptor* _aidl_return) { - if (!in_impl_uuid || *in_impl_uuid != kAutomaticGainControlV2SwImplUUID) { + if (!in_impl_uuid || *in_impl_uuid != getEffectImplUuidAutomaticGainControlV2Sw()) { LOG(ERROR) << __func__ << "uuid not supported"; return EX_ILLEGAL_ARGUMENT; } @@ -67,8 +69,8 @@ const Capability AutomaticGainControlV2Sw::kCapability = { .range = AutomaticGainControlV2Sw::kRanges}; const Descriptor AutomaticGainControlV2Sw::kDescriptor = { - .common = {.id = {.type = kAutomaticGainControlV2TypeUUID, - .uuid = kAutomaticGainControlV2SwImplUUID, + .common = {.id = {.type = getEffectTypeUuidAutomaticGainControlV2(), + .uuid = getEffectImplUuidAutomaticGainControlV2Sw(), .proxy = std::nullopt}, .flags = {.type = Flags::Type::INSERT, .insert = Flags::Insert::FIRST, |