diff options
author | Mikhail Naganov <mnaganov@google.com> | 2021-01-15 19:05:04 +0000 |
---|---|---|
committer | Mikhail Naganov <mnaganov@google.com> | 2021-02-02 18:17:26 +0000 |
commit | 5ec48c2d4d7a8ccdea489ad4b34a7cf75480ffcc (patch) | |
tree | e1458ca90fba3abd0f427da2f65fc0d52ecc5d35 /audio/effect/all-versions/default/EffectsFactory.cpp | |
parent | 4f5cb710b92fd58338630e2f54f03cac0468b3f8 (diff) |
audio: Create libraries for data types in core and effect
Add 'CoreUtils' library similar to 'HidlUtils' for the types
specific to the core HAL. Add 'EffectUtils' library similar to
'HidlUtils' for the types specific to the effects HAL. Move into
them and de-duplicate code previously scattered across the
default HAL implementation and libaudiohal. Add unit tests.
Removed 'AUDIO_{INPUT|OUTPUT}_FLAG_NONE' from the list of
values in the XSD file to avoid additional complexity due to
equivalence of this value to an empty list of flags.
Bug: 142480271
Test: m android.hardware.audio@X.0-impl
Test: m android.hardware.audio.effect@X.0-impl
Test: atest android.hardware.audio@7.0-util_tests
Test: atest android.hardware.audio.common@7.0-util_tests
Test: atest android.hardware.audio.effect@7.0-util_tests
Change-Id: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
Diffstat (limited to 'audio/effect/all-versions/default/EffectsFactory.cpp')
-rw-r--r-- | audio/effect/all-versions/default/EffectsFactory.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/audio/effect/all-versions/default/EffectsFactory.cpp b/audio/effect/all-versions/default/EffectsFactory.cpp index 1ea990b3b6..eb1cb4971c 100644 --- a/audio/effect/all-versions/default/EffectsFactory.cpp +++ b/audio/effect/all-versions/default/EffectsFactory.cpp @@ -19,7 +19,6 @@ #include "AcousticEchoCancelerEffect.h" #include "AutomaticGainControlEffect.h" #include "BassBoostEffect.h" -#include "Conversions.h" #include "DownmixEffect.h" #include "Effect.h" #include "EnvironmentalReverbEffect.h" @@ -27,11 +26,11 @@ #include "LoudnessEnhancerEffect.h" #include "NoiseSuppressionEffect.h" #include "PresetReverbEffect.h" -#include "UuidUtils.h" #include "VirtualizerEffect.h" #include "VisualizerEffect.h" #include "common/all-versions/default/EffectMap.h" +#include <UuidUtils.h> #include <android/log.h> #include <media/EffectsFactoryApi.h> #include <system/audio_effects/effect_aec.h> @@ -45,6 +44,7 @@ #include <system/audio_effects/effect_presetreverb.h> #include <system/audio_effects/effect_virtualizer.h> #include <system/audio_effects/effect_visualizer.h> +#include <util/EffectUtils.h> namespace android { namespace hardware { @@ -107,7 +107,7 @@ restart: effect_descriptor_t halDescriptor; status = EffectQueryEffect(i, &halDescriptor); if (status == OK) { - effectDescriptorFromHal(halDescriptor, &result[i]); + EffectUtils::effectDescriptorFromHal(halDescriptor, &result[i]); } else { ALOGE("Error querying effect at position %d / %d: %s", i, numEffects, strerror(-status)); @@ -141,11 +141,11 @@ Return<void> EffectsFactory::getDescriptor(const Uuid& uuid, getDescriptor_cb _h effect_descriptor_t halDescriptor; status_t status = EffectGetDescriptor(&halUuid, &halDescriptor); EffectDescriptor descriptor; - effectDescriptorFromHal(halDescriptor, &descriptor); + EffectUtils::effectDescriptorFromHal(halDescriptor, &descriptor); Result retval(Result::OK); if (status != OK) { - ALOGE("Error querying effect descriptor for %s: %s", uuidToString(halUuid).c_str(), - strerror(-status)); + ALOGE("Error querying effect descriptor for %s: %s", + UuidUtils::uuidToString(halUuid).c_str(), strerror(-status)); if (status == -ENOENT) { retval = Result::INVALID_ARGUMENTS; } else { @@ -191,13 +191,14 @@ Return<void> EffectsFactory::createEffectImpl(const Uuid& uuid, int32_t session, effect = dispatchEffectInstanceCreation(halDescriptor, handle); effectId = EffectMap::getInstance().add(handle); } else { - ALOGE("Error querying effect descriptor for %s: %s", uuidToString(halUuid).c_str(), - strerror(-status)); + ALOGE("Error querying effect descriptor for %s: %s", + UuidUtils::uuidToString(halUuid).c_str(), strerror(-status)); EffectRelease(handle); } } if (status != OK) { - ALOGE("Error creating effect %s: %s", uuidToString(halUuid).c_str(), strerror(-status)); + ALOGE("Error creating effect %s: %s", UuidUtils::uuidToString(halUuid).c_str(), + strerror(-status)); if (status == -ENOENT) { retval = Result::INVALID_ARGUMENTS; } else { |