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/virtualizer/VirtualizerSw.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/virtualizer/VirtualizerSw.cpp')
| -rw-r--r-- | audio/aidl/default/virtualizer/VirtualizerSw.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/audio/aidl/default/virtualizer/VirtualizerSw.cpp b/audio/aidl/default/virtualizer/VirtualizerSw.cpp index c5a0e8d335..e34464f460 100644 --- a/audio/aidl/default/virtualizer/VirtualizerSw.cpp +++ b/audio/aidl/default/virtualizer/VirtualizerSw.cpp @@ -21,12 +21,14 @@ #include <Utils.h> #include <android-base/logging.h> #include <fmq/AidlMessageQueue.h> +#include <system/audio_effects/effect_uuid.h> #include "VirtualizerSw.h" using aidl::android::hardware::audio::effect::Descriptor; +using aidl::android::hardware::audio::effect::getEffectImplUuidVirtualizerSw; +using aidl::android::hardware::audio::effect::getEffectTypeUuidVirtualizer; using aidl::android::hardware::audio::effect::IEffect; -using aidl::android::hardware::audio::effect::kVirtualizerSwImplUUID; using aidl::android::hardware::audio::effect::State; using aidl::android::hardware::audio::effect::VirtualizerSw; using aidl::android::media::audio::common::AudioChannelLayout; @@ -36,7 +38,7 @@ 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 != kVirtualizerSwImplUUID) { + if (!in_impl_uuid || *in_impl_uuid != getEffectImplUuidVirtualizerSw()) { LOG(ERROR) << __func__ << "uuid not supported"; return EX_ILLEGAL_ARGUMENT; } @@ -51,7 +53,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 != kVirtualizerSwImplUUID) { + if (!in_impl_uuid || *in_impl_uuid != getEffectImplUuidVirtualizerSw()) { LOG(ERROR) << __func__ << "uuid not supported"; return EX_ILLEGAL_ARGUMENT; } @@ -73,9 +75,9 @@ const Capability VirtualizerSw::kCapability = { .range = Range::make<Range::virtualizer>(VirtualizerSw::kRanges)}; const Descriptor VirtualizerSw::kDescriptor = { - .common = {.id = {.type = kVirtualizerTypeUUID, - .uuid = kVirtualizerSwImplUUID, - .proxy = kVirtualizerProxyUUID}, + .common = {.id = {.type = getEffectTypeUuidVirtualizer(), + .uuid = getEffectImplUuidVirtualizerSw(), + .proxy = getEffectImplUuidVirtualizerProxy()}, .flags = {.type = Flags::Type::INSERT, .insert = Flags::Insert::FIRST, .volume = Flags::Volume::CTRL}, |