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/dynamicProcessing/DynamicsProcessingSw.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/dynamicProcessing/DynamicsProcessingSw.cpp')
| -rw-r--r-- | audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp b/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp index 1dda6d1183..ed6cfa0b39 100644 --- a/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp +++ b/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp @@ -22,19 +22,21 @@ #define LOG_TAG "AHAL_DynamicsProcessingSw" #include <android-base/logging.h> #include <fmq/AidlMessageQueue.h> +#include <system/audio_effects/effect_uuid.h> #include "DynamicsProcessingSw.h" using aidl::android::hardware::audio::effect::Descriptor; using aidl::android::hardware::audio::effect::DynamicsProcessingSw; +using aidl::android::hardware::audio::effect::getEffectImplUuidDynamicsProcessingSw; +using aidl::android::hardware::audio::effect::getEffectTypeUuidDynamicsProcessing; using aidl::android::hardware::audio::effect::IEffect; -using aidl::android::hardware::audio::effect::kDynamicsProcessingSwImplUUID; using aidl::android::hardware::audio::effect::State; 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 != kDynamicsProcessingSwImplUUID) { + if (!in_impl_uuid || *in_impl_uuid != getEffectImplUuidDynamicsProcessingSw()) { LOG(ERROR) << __func__ << "uuid not supported"; return EX_ILLEGAL_ARGUMENT; } @@ -49,7 +51,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 != kDynamicsProcessingSwImplUUID) { + if (!in_impl_uuid || *in_impl_uuid != getEffectImplUuidDynamicsProcessingSw()) { LOG(ERROR) << __func__ << "uuid not supported"; return EX_ILLEGAL_ARGUMENT; } @@ -88,8 +90,8 @@ const std::vector<Range::DynamicsProcessingRange> DynamicsProcessingSw::kRanges const Capability DynamicsProcessingSw::kCapability = {.range = DynamicsProcessingSw::kRanges}; const Descriptor DynamicsProcessingSw::kDescriptor = { - .common = {.id = {.type = kDynamicsProcessingTypeUUID, - .uuid = kDynamicsProcessingSwImplUUID, + .common = {.id = {.type = getEffectTypeUuidDynamicsProcessing(), + .uuid = getEffectImplUuidDynamicsProcessingSw(), .proxy = std::nullopt}, .flags = {.type = Flags::Type::INSERT, .insert = Flags::Insert::FIRST, |