diff options
author | Mikhail Naganov <mnaganov@google.com> | 2021-01-15 19:05:04 +0000 |
---|---|---|
committer | Mikhail Naganov <mnaganov@google.com> | 2021-02-03 01:28:38 +0000 |
commit | a9ac889b9626f14e1a6310f4ca04a87cedf87d18 (patch) | |
tree | 5ccbbcfd29cbf4306f394f6180eae55b3e35aa31 /audio/effect/all-versions/default/Conversions.cpp | |
parent | 39059ed17f8fef43fee286cc0eacbb910ee2b772 (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
Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
Diffstat (limited to 'audio/effect/all-versions/default/Conversions.cpp')
-rw-r--r-- | audio/effect/all-versions/default/Conversions.cpp | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/audio/effect/all-versions/default/Conversions.cpp b/audio/effect/all-versions/default/Conversions.cpp deleted file mode 100644 index 0cc8767e8d..0000000000 --- a/audio/effect/all-versions/default/Conversions.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "Conversions.h" -#include "UuidUtils.h" - -#include <memory.h> -#include <stdio.h> - -#include <common/all-versions/VersionUtils.h> - -using ::android::hardware::audio::common::utils::EnumBitfield; - -namespace android { -namespace hardware { -namespace audio { -namespace effect { -namespace CPP_VERSION { -namespace implementation { - -using ::android::hardware::audio::common::CPP_VERSION::implementation::UuidUtils; - -void effectDescriptorFromHal(const effect_descriptor_t& halDescriptor, - EffectDescriptor* descriptor) { - UuidUtils::uuidFromHal(halDescriptor.type, &descriptor->type); - UuidUtils::uuidFromHal(halDescriptor.uuid, &descriptor->uuid); - descriptor->flags = EnumBitfield<EffectFlags>(halDescriptor.flags); - descriptor->cpuLoad = halDescriptor.cpuLoad; - descriptor->memoryUsage = halDescriptor.memoryUsage; - memcpy(descriptor->name.data(), halDescriptor.name, descriptor->name.size()); - memcpy(descriptor->implementor.data(), halDescriptor.implementor, - descriptor->implementor.size()); -} - -std::string uuidToString(const effect_uuid_t& halUuid) { - char str[64]; - snprintf(str, sizeof(str), "%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x", halUuid.timeLow, - halUuid.timeMid, halUuid.timeHiAndVersion, halUuid.clockSeq, halUuid.node[0], - halUuid.node[1], halUuid.node[2], halUuid.node[3], halUuid.node[4], halUuid.node[5]); - return str; -} - -} // namespace implementation -} // namespace CPP_VERSION -} // namespace effect -} // namespace audio -} // namespace hardware -} // namespace android |