diff options
| author | Shunkai Yao <yaoshunkai@google.com> | 2023-05-01 18:04:36 +0000 |
|---|---|---|
| committer | Shunkai Yao <yaoshunkai@google.com> | 2023-05-01 19:07:05 +0000 |
| commit | db026a8ca091e8d14cba2a80ad562e7c47ee6816 (patch) | |
| tree | 3fbbbdd44a32619a550823a5484790ace78597e8 | |
| parent | 91dc5573f260feb1c75d704dda92a77ebdef1367 (diff) | |
Remove Descriptor proxy field from individual effect
This field should be filled by IFactory implementation
Bug: 271500140
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I96203b8cd037fd81b0b1d88fc5ca9915df02a919
| -rw-r--r-- | audio/aidl/default/bassboost/BassBoostSw.cpp | 3 | ||||
| -rw-r--r-- | audio/aidl/default/equalizer/EqualizerSw.cpp | 18 | ||||
| -rw-r--r-- | audio/aidl/default/virtualizer/VirtualizerSw.cpp | 4 |
3 files changed, 11 insertions, 14 deletions
diff --git a/audio/aidl/default/bassboost/BassBoostSw.cpp b/audio/aidl/default/bassboost/BassBoostSw.cpp index dbf2e15c7d..6072d896d9 100644 --- a/audio/aidl/default/bassboost/BassBoostSw.cpp +++ b/audio/aidl/default/bassboost/BassBoostSw.cpp @@ -68,8 +68,7 @@ const std::vector<Range::BassBoostRange> BassBoostSw::kRanges = { const Capability BassBoostSw::kCapability = {.range = {BassBoostSw::kRanges}}; const Descriptor BassBoostSw::kDescriptor = { .common = {.id = {.type = getEffectTypeUuidBassBoost(), - .uuid = getEffectImplUuidBassBoostSw(), - .proxy = getEffectImplUuidBassBoostProxy()}, + .uuid = getEffectImplUuidBassBoostSw()}, .flags = {.type = Flags::Type::INSERT, .insert = Flags::Insert::FIRST, .volume = Flags::Volume::CTRL}, diff --git a/audio/aidl/default/equalizer/EqualizerSw.cpp b/audio/aidl/default/equalizer/EqualizerSw.cpp index 97699249fc..b2add3113c 100644 --- a/audio/aidl/default/equalizer/EqualizerSw.cpp +++ b/audio/aidl/default/equalizer/EqualizerSw.cpp @@ -88,16 +88,14 @@ const std::vector<Range::EqualizerRange> EqualizerSw::kRanges = { MAKE_RANGE(Equalizer, centerFreqMh, std::vector<int>({1}), std::vector<int>({0}))}; const Capability EqualizerSw::kEqCap = {.range = EqualizerSw::kRanges}; -const Descriptor EqualizerSw::kDesc = { - .common = {.id = {.type = getEffectTypeUuidEqualizer(), - .uuid = getEffectImplUuidEqualizerSw(), - .proxy = getEffectImplUuidEqualizerProxy()}, - .flags = {.type = Flags::Type::INSERT, - .insert = Flags::Insert::FIRST, - .volume = Flags::Volume::CTRL}, - .name = EqualizerSw::kEffectName, - .implementor = "The Android Open Source Project"}, - .capability = EqualizerSw::kEqCap}; +const Descriptor EqualizerSw::kDesc = {.common = {.id = {.type = getEffectTypeUuidEqualizer(), + .uuid = getEffectImplUuidEqualizerSw()}, + .flags = {.type = Flags::Type::INSERT, + .insert = Flags::Insert::FIRST, + .volume = Flags::Volume::CTRL}, + .name = EqualizerSw::kEffectName, + .implementor = "The Android Open Source Project"}, + .capability = EqualizerSw::kEqCap}; ndk::ScopedAStatus EqualizerSw::getDescriptor(Descriptor* _aidl_return) { LOG(DEBUG) << __func__ << kDesc.toString(); diff --git a/audio/aidl/default/virtualizer/VirtualizerSw.cpp b/audio/aidl/default/virtualizer/VirtualizerSw.cpp index e34464f460..0e8435ef82 100644 --- a/audio/aidl/default/virtualizer/VirtualizerSw.cpp +++ b/audio/aidl/default/virtualizer/VirtualizerSw.cpp @@ -16,6 +16,7 @@ #include <algorithm> #include <cstddef> +#include <optional> #define LOG_TAG "AHAL_VirtualizerSw" #include <Utils.h> @@ -76,8 +77,7 @@ const Capability VirtualizerSw::kCapability = { const Descriptor VirtualizerSw::kDescriptor = { .common = {.id = {.type = getEffectTypeUuidVirtualizer(), - .uuid = getEffectImplUuidVirtualizerSw(), - .proxy = getEffectImplUuidVirtualizerProxy()}, + .uuid = getEffectImplUuidVirtualizerSw()}, .flags = {.type = Flags::Type::INSERT, .insert = Flags::Insert::FIRST, .volume = Flags::Volume::CTRL}, |