Merge "Spatializer default implementatoin with VTS" into main am: 6eea2ff346
am: a0d4f148a8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2871083 Change-Id: Ice4a5a02093601ab748806fae2ef6837b2262298 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
255e0fc7b5
8 changed files with 534 additions and 4 deletions
|
@ -51,5 +51,10 @@
|
|||
{
|
||||
"name": "VtsHalNSTargetTest"
|
||||
}
|
||||
],
|
||||
"postsubmit": [
|
||||
{
|
||||
"name": "VtsHalSpatializerTargetTest"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
@ -47,6 +47,7 @@
|
|||
<library name="visualizer" path="libvisualizeraidl.so"/>
|
||||
<library name="volumesw" path="libvolumesw.so"/>
|
||||
<library name="extensioneffect" path="libextensioneffect.so"/>
|
||||
<library name="spatializersw" path="libspatializersw.so"/>
|
||||
</libraries>
|
||||
|
||||
<!-- list of effects to load.
|
||||
|
@ -98,6 +99,7 @@
|
|||
<effect name="extension_effect" library="extensioneffect" uuid="fa81dd00-588b-11ed-9b6a-0242ac120002" type="fa81de0e-588b-11ed-9b6a-0242ac120002"/>
|
||||
<effect name="acoustic_echo_canceler" library="pre_processing" uuid="bb392ec0-8d4d-11e0-a896-0002a5d5c51b"/>
|
||||
<effect name="noise_suppression" library="pre_processing" uuid="c06c8400-8e06-11e0-9cb6-0002a5d5c51b"/>
|
||||
<effect name="spatializer" library="spatializersw" uuid="fa81a880-588b-11ed-9b6a-0242ac120002"/>
|
||||
</effects>
|
||||
|
||||
<preprocess>
|
||||
|
|
41
audio/aidl/default/spatializer/Android.bp
Normal file
41
audio/aidl/default/spatializer/Android.bp
Normal file
|
@ -0,0 +1,41 @@
|
|||
/*
|
||||
* Copyright (C) 2023 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.
|
||||
*/
|
||||
|
||||
package {
|
||||
// See: http://go/android-license-faq
|
||||
// A large-scale-change added 'default_applicable_licenses' to import
|
||||
// all of the 'license_kinds' from "hardware_interfaces_license"
|
||||
// to get the below license kinds:
|
||||
// SPDX-license-identifier-Apache-2.0
|
||||
default_applicable_licenses: ["hardware_interfaces_license"],
|
||||
}
|
||||
|
||||
cc_library_shared {
|
||||
name: "libspatializersw",
|
||||
defaults: [
|
||||
"aidlaudioeffectservice_defaults",
|
||||
"latest_android_media_audio_common_types_ndk_shared",
|
||||
"latest_android_hardware_audio_effect_ndk_shared",
|
||||
],
|
||||
srcs: [
|
||||
"SpatializerSw.cpp",
|
||||
":effectCommonFile",
|
||||
],
|
||||
relative_install_path: "soundfx",
|
||||
visibility: [
|
||||
"//hardware/interfaces/audio/aidl/default",
|
||||
],
|
||||
}
|
211
audio/aidl/default/spatializer/SpatializerSw.cpp
Normal file
211
audio/aidl/default/spatializer/SpatializerSw.cpp
Normal file
|
@ -0,0 +1,211 @@
|
|||
/*
|
||||
* Copyright (C) 2023 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.
|
||||
*/
|
||||
|
||||
#define LOG_TAG "AHAL_SpatializerSw"
|
||||
|
||||
#include "SpatializerSw.h"
|
||||
|
||||
#include <android-base/logging.h>
|
||||
#include <system/audio_effects/effect_uuid.h>
|
||||
|
||||
#include <optional>
|
||||
|
||||
using aidl::android::hardware::audio::common::getChannelCount;
|
||||
using aidl::android::hardware::audio::effect::Descriptor;
|
||||
using aidl::android::hardware::audio::effect::getEffectImplUuidSpatializerSw;
|
||||
using aidl::android::hardware::audio::effect::getEffectTypeUuidSpatializer;
|
||||
using aidl::android::hardware::audio::effect::IEffect;
|
||||
using aidl::android::hardware::audio::effect::SpatializerSw;
|
||||
using aidl::android::hardware::audio::effect::State;
|
||||
using aidl::android::media::audio::common::AudioChannelLayout;
|
||||
using aidl::android::media::audio::common::AudioUuid;
|
||||
using aidl::android::media::audio::common::HeadTracking;
|
||||
using aidl::android::media::audio::common::Spatialization;
|
||||
|
||||
extern "C" binder_exception_t createEffect(const AudioUuid* in_impl_uuid,
|
||||
std::shared_ptr<IEffect>* instanceSpp) {
|
||||
if (!in_impl_uuid || *in_impl_uuid != getEffectImplUuidSpatializerSw()) {
|
||||
LOG(ERROR) << __func__ << "uuid not supported";
|
||||
return EX_ILLEGAL_ARGUMENT;
|
||||
}
|
||||
if (!instanceSpp) {
|
||||
LOG(ERROR) << __func__ << " invalid input parameter!";
|
||||
return EX_ILLEGAL_ARGUMENT;
|
||||
}
|
||||
|
||||
*instanceSpp = ndk::SharedRefBase::make<SpatializerSw>();
|
||||
LOG(DEBUG) << __func__ << " instance " << instanceSpp->get() << " created";
|
||||
return EX_NONE;
|
||||
}
|
||||
|
||||
extern "C" binder_exception_t queryEffect(const AudioUuid* in_impl_uuid, Descriptor* _aidl_return) {
|
||||
if (!in_impl_uuid || *in_impl_uuid != getEffectImplUuidSpatializerSw()) {
|
||||
LOG(ERROR) << __func__ << "uuid not supported";
|
||||
return EX_ILLEGAL_ARGUMENT;
|
||||
}
|
||||
*_aidl_return = SpatializerSw::kDescriptor;
|
||||
return EX_NONE;
|
||||
}
|
||||
|
||||
namespace aidl::android::hardware::audio::effect {
|
||||
|
||||
const std::string SpatializerSw::kEffectName = "SpatializerSw";
|
||||
|
||||
const std::vector<Range::SpatializerRange> SpatializerSw::kRanges = {
|
||||
MAKE_RANGE(Spatializer, supportedChannelLayout, std::vector<AudioChannelLayout>{},
|
||||
std::vector<AudioChannelLayout>{}),
|
||||
MAKE_RANGE(Spatializer, spatializationLevel, Spatialization::Level::NONE,
|
||||
Spatialization::Level::BED_PLUS_OBJECTS),
|
||||
MAKE_RANGE(Spatializer, spatializationMode, Spatialization::Mode::BINAURAL,
|
||||
Spatialization::Mode::TRANSAURAL),
|
||||
MAKE_RANGE(Spatializer, headTrackingSensorId, std::numeric_limits<int>::min(),
|
||||
std::numeric_limits<int>::max()),
|
||||
MAKE_RANGE(Spatializer, headTrackingMode, HeadTracking::Mode::OTHER,
|
||||
HeadTracking::Mode::RELATIVE_SCREEN),
|
||||
MAKE_RANGE(Spatializer, headTrackingConnectionMode,
|
||||
HeadTracking::ConnectionMode::FRAMEWORK_PROCESSED,
|
||||
HeadTracking::ConnectionMode::DIRECT_TO_SENSOR_TUNNEL)};
|
||||
const Capability SpatializerSw::kCapability = {.range = {SpatializerSw::kRanges}};
|
||||
const Descriptor SpatializerSw::kDescriptor = {
|
||||
.common = {.id = {.type = getEffectTypeUuidSpatializer(),
|
||||
.uuid = getEffectImplUuidSpatializerSw()},
|
||||
.flags = {.type = Flags::Type::INSERT,
|
||||
.insert = Flags::Insert::FIRST,
|
||||
.hwAcceleratorMode = Flags::HardwareAccelerator::NONE},
|
||||
.name = SpatializerSw::kEffectName,
|
||||
.implementor = "The Android Open Source Project"},
|
||||
.capability = SpatializerSw::kCapability};
|
||||
|
||||
ndk::ScopedAStatus SpatializerSw::getDescriptor(Descriptor* _aidl_return) {
|
||||
LOG(DEBUG) << __func__ << kDescriptor.toString();
|
||||
*_aidl_return = kDescriptor;
|
||||
return ndk::ScopedAStatus::ok();
|
||||
}
|
||||
|
||||
ndk::ScopedAStatus SpatializerSw::setParameterSpecific(const Parameter::Specific& specific) {
|
||||
RETURN_IF(Parameter::Specific::spatializer != specific.getTag(), EX_ILLEGAL_ARGUMENT,
|
||||
"EffectNotSupported");
|
||||
RETURN_IF(!mContext, EX_NULL_POINTER, "nullContext");
|
||||
|
||||
auto& param = specific.get<Parameter::Specific::spatializer>();
|
||||
RETURN_IF(!inRange(param, kRanges), EX_ILLEGAL_ARGUMENT, "outOfRange");
|
||||
|
||||
return mContext->setParam(param.getTag(), param);
|
||||
}
|
||||
|
||||
ndk::ScopedAStatus SpatializerSw::getParameterSpecific(const Parameter::Id& id,
|
||||
Parameter::Specific* specific) {
|
||||
auto tag = id.getTag();
|
||||
RETURN_IF(Parameter::Id::spatializerTag != tag, EX_ILLEGAL_ARGUMENT, "wrongIdTag");
|
||||
auto spatializerId = id.get<Parameter::Id::spatializerTag>();
|
||||
auto spatializerTag = spatializerId.getTag();
|
||||
switch (spatializerTag) {
|
||||
case Spatializer::Id::commonTag: {
|
||||
auto specificTag = spatializerId.get<Spatializer::Id::commonTag>();
|
||||
std::optional<Spatializer> param = mContext->getParam(specificTag);
|
||||
if (!param.has_value()) {
|
||||
return ndk::ScopedAStatus::fromExceptionCodeWithMessage(
|
||||
EX_ILLEGAL_ARGUMENT, "SpatializerTagNotSupported");
|
||||
}
|
||||
specific->set<Parameter::Specific::spatializer>(param.value());
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
LOG(ERROR) << __func__ << " unsupported tag: " << toString(tag);
|
||||
return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT,
|
||||
"SpatializerTagNotSupported");
|
||||
}
|
||||
}
|
||||
return ndk::ScopedAStatus::ok();
|
||||
}
|
||||
|
||||
std::shared_ptr<EffectContext> SpatializerSw::createContext(const Parameter::Common& common) {
|
||||
if (mContext) {
|
||||
LOG(DEBUG) << __func__ << " context already exist";
|
||||
} else {
|
||||
mContext = std::make_shared<SpatializerSwContext>(1 /* statusFmqDepth */, common);
|
||||
}
|
||||
return mContext;
|
||||
}
|
||||
|
||||
std::shared_ptr<EffectContext> SpatializerSw::getContext() {
|
||||
return mContext;
|
||||
}
|
||||
|
||||
RetCode SpatializerSw::releaseContext() {
|
||||
if (mContext) {
|
||||
mContext.reset();
|
||||
}
|
||||
return RetCode::SUCCESS;
|
||||
}
|
||||
|
||||
SpatializerSw::~SpatializerSw() {
|
||||
cleanUp();
|
||||
LOG(DEBUG) << __func__;
|
||||
}
|
||||
|
||||
// Processing method running in EffectWorker thread.
|
||||
IEffect::Status SpatializerSw::effectProcessImpl(float* in, float* out, int samples) {
|
||||
RETURN_VALUE_IF(!mContext, (IEffect::Status{EX_NULL_POINTER, 0, 0}), "nullContext");
|
||||
return mContext->process(in, out, samples);
|
||||
}
|
||||
|
||||
SpatializerSwContext::SpatializerSwContext(int statusDepth, const Parameter::Common& common)
|
||||
: EffectContext(statusDepth, common) {
|
||||
LOG(DEBUG) << __func__;
|
||||
}
|
||||
|
||||
SpatializerSwContext::~SpatializerSwContext() {
|
||||
LOG(DEBUG) << __func__;
|
||||
}
|
||||
|
||||
template <typename TAG>
|
||||
std::optional<Spatializer> SpatializerSwContext::getParam(TAG tag) {
|
||||
if (mParamsMap.find(tag) != mParamsMap.end()) {
|
||||
return mParamsMap.at(tag);
|
||||
}
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
template <typename TAG>
|
||||
ndk::ScopedAStatus SpatializerSwContext::setParam(TAG tag, Spatializer spatializer) {
|
||||
mParamsMap[tag] = spatializer;
|
||||
return ndk::ScopedAStatus::ok();
|
||||
}
|
||||
|
||||
IEffect::Status SpatializerSwContext::process(float* in, float* out, int samples) {
|
||||
LOG(DEBUG) << __func__ << " in " << in << " out " << out << " samples " << samples;
|
||||
IEffect::Status status = {EX_ILLEGAL_ARGUMENT, 0, 0};
|
||||
|
||||
const auto inputChannelCount = getChannelCount(mCommon.input.base.channelMask);
|
||||
const auto outputChannelCount = getChannelCount(mCommon.output.base.channelMask);
|
||||
if (outputChannelCount < 2 || inputChannelCount < outputChannelCount) {
|
||||
LOG(ERROR) << __func__ << " invalid channel count, in: " << inputChannelCount
|
||||
<< " out: " << outputChannelCount;
|
||||
return status;
|
||||
}
|
||||
|
||||
int iFrames = samples / inputChannelCount;
|
||||
for (int i = 0; i < iFrames; i++) {
|
||||
std::memcpy(out, in, outputChannelCount);
|
||||
in += inputChannelCount;
|
||||
out += outputChannelCount;
|
||||
}
|
||||
return {STATUS_OK, static_cast<int32_t>(iFrames * inputChannelCount),
|
||||
static_cast<int32_t>(iFrames * outputChannelCount)};
|
||||
}
|
||||
|
||||
} // namespace aidl::android::hardware::audio::effect
|
68
audio/aidl/default/spatializer/SpatializerSw.h
Normal file
68
audio/aidl/default/spatializer/SpatializerSw.h
Normal file
|
@ -0,0 +1,68 @@
|
|||
/*
|
||||
* Copyright (C) 2023 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.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "effect-impl/EffectContext.h"
|
||||
#include "effect-impl/EffectImpl.h"
|
||||
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
namespace aidl::android::hardware::audio::effect {
|
||||
|
||||
class SpatializerSwContext final : public EffectContext {
|
||||
public:
|
||||
SpatializerSwContext(int statusDepth, const Parameter::Common& common);
|
||||
~SpatializerSwContext();
|
||||
|
||||
template <typename TAG>
|
||||
std::optional<Spatializer> getParam(TAG tag);
|
||||
template <typename TAG>
|
||||
ndk::ScopedAStatus setParam(TAG tag, Spatializer spatializer);
|
||||
|
||||
IEffect::Status process(float* in, float* out, int samples);
|
||||
|
||||
private:
|
||||
std::unordered_map<Spatializer::Tag, Spatializer> mParamsMap;
|
||||
};
|
||||
|
||||
class SpatializerSw final : public EffectImpl {
|
||||
public:
|
||||
static const std::string kEffectName;
|
||||
static const Capability kCapability;
|
||||
static const Descriptor kDescriptor;
|
||||
~SpatializerSw();
|
||||
|
||||
ndk::ScopedAStatus getDescriptor(Descriptor* _aidl_return) override;
|
||||
ndk::ScopedAStatus setParameterSpecific(const Parameter::Specific& specific) override;
|
||||
ndk::ScopedAStatus getParameterSpecific(const Parameter::Id& id,
|
||||
Parameter::Specific* specific) override;
|
||||
|
||||
std::shared_ptr<EffectContext> createContext(const Parameter::Common& common) override;
|
||||
std::shared_ptr<EffectContext> getContext() override;
|
||||
RetCode releaseContext() override;
|
||||
|
||||
std::string getEffectName() override { return kEffectName; };
|
||||
IEffect::Status effectProcessImpl(float* in, float* out, int samples) override;
|
||||
|
||||
private:
|
||||
static const std::vector<Range::SpatializerRange> kRanges;
|
||||
std::shared_ptr<SpatializerSwContext> mContext = nullptr;
|
||||
};
|
||||
} // namespace aidl::android::hardware::audio::effect
|
|
@ -169,3 +169,9 @@ cc_test {
|
|||
defaults: ["VtsHalAudioTargetTestDefaults"],
|
||||
srcs: ["VtsHalNSTargetTest.cpp"],
|
||||
}
|
||||
|
||||
cc_test {
|
||||
name: "VtsHalSpatializerTargetTest",
|
||||
defaults: ["VtsHalAudioTargetTestDefaults"],
|
||||
srcs: ["VtsHalSpatializerTargetTest.cpp"],
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include <string>
|
||||
#include <type_traits>
|
||||
#include <unordered_map>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include <Utils.h>
|
||||
|
@ -263,12 +264,11 @@ class EffectHelper {
|
|||
return s;
|
||||
}
|
||||
|
||||
template <typename T, typename S, Range::Tag R, typename T::Tag tag, typename Functor>
|
||||
template <typename T, typename S, Range::Tag R, typename T::Tag tag>
|
||||
static std::set<S> getTestValueSet(
|
||||
std::vector<std::pair<std::shared_ptr<IFactory>, Descriptor>> kFactoryDescList,
|
||||
Functor functor) {
|
||||
std::vector<std::pair<std::shared_ptr<IFactory>, Descriptor>> descList) {
|
||||
std::set<S> result;
|
||||
for (const auto& [_, desc] : kFactoryDescList) {
|
||||
for (const auto& [_, desc] : descList) {
|
||||
if (desc.capability.range.getTag() == R) {
|
||||
const auto& ranges = desc.capability.range.get<R>();
|
||||
for (const auto& range : ranges) {
|
||||
|
@ -281,6 +281,14 @@ class EffectHelper {
|
|||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename T, typename S, Range::Tag R, typename T::Tag tag, typename Functor>
|
||||
static std::set<S> getTestValueSet(
|
||||
std::vector<std::pair<std::shared_ptr<IFactory>, Descriptor>> descList,
|
||||
Functor functor) {
|
||||
auto result = getTestValueSet<T, S, R, tag>(descList);
|
||||
return functor(result);
|
||||
}
|
||||
|
||||
|
|
189
audio/aidl/vts/VtsHalSpatializerTargetTest.cpp
Normal file
189
audio/aidl/vts/VtsHalSpatializerTargetTest.cpp
Normal file
|
@ -0,0 +1,189 @@
|
|||
/*
|
||||
* Copyright (C) 2023 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 <aidl/Vintf.h>
|
||||
|
||||
#define LOG_TAG "VtsHalSpatializerTest"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include "EffectHelper.h"
|
||||
|
||||
using namespace android;
|
||||
|
||||
using aidl::android::hardware::audio::effect::Descriptor;
|
||||
using aidl::android::hardware::audio::effect::getEffectTypeUuidSpatializer;
|
||||
using aidl::android::hardware::audio::effect::IEffect;
|
||||
using aidl::android::hardware::audio::effect::IFactory;
|
||||
using aidl::android::hardware::audio::effect::Parameter;
|
||||
using aidl::android::hardware::audio::effect::Range;
|
||||
using aidl::android::hardware::audio::effect::Spatializer;
|
||||
using aidl::android::media::audio::common::HeadTracking;
|
||||
using aidl::android::media::audio::common::Spatialization;
|
||||
using android::hardware::audio::common::testing::detail::TestExecutionTracer;
|
||||
using ::android::internal::ToString;
|
||||
|
||||
enum ParamName {
|
||||
PARAM_INSTANCE_NAME,
|
||||
PARAM_SPATIALIZATION_LEVEL,
|
||||
PARAM_SPATIALIZATION_MODE,
|
||||
PARAM_HEADTRACK_SENSORID,
|
||||
PARAM_HEADTRACK_MODE,
|
||||
PARAM_HEADTRACK_CONNECTION_MODE
|
||||
};
|
||||
|
||||
using SpatializerParamTestParam =
|
||||
std::tuple<std::pair<std::shared_ptr<IFactory>, Descriptor>, Spatialization::Level,
|
||||
Spatialization::Mode, int /* sensor ID */, HeadTracking::Mode,
|
||||
HeadTracking::ConnectionMode>;
|
||||
|
||||
class SpatializerParamTest : public ::testing::TestWithParam<SpatializerParamTestParam>,
|
||||
public EffectHelper {
|
||||
public:
|
||||
SpatializerParamTest()
|
||||
: mSpatializerParams([&]() {
|
||||
Spatialization::Level level = std::get<PARAM_SPATIALIZATION_LEVEL>(GetParam());
|
||||
Spatialization::Mode mode = std::get<PARAM_SPATIALIZATION_MODE>(GetParam());
|
||||
int sensorId = std::get<PARAM_HEADTRACK_SENSORID>(GetParam());
|
||||
HeadTracking::Mode htMode = std::get<PARAM_HEADTRACK_MODE>(GetParam());
|
||||
HeadTracking::ConnectionMode htConnectMode =
|
||||
std::get<PARAM_HEADTRACK_CONNECTION_MODE>(GetParam());
|
||||
std::map<Spatializer::Tag, Spatializer> params;
|
||||
params[Spatializer::spatializationLevel] =
|
||||
Spatializer::make<Spatializer::spatializationLevel>(level);
|
||||
params[Spatializer::spatializationMode] =
|
||||
Spatializer::make<Spatializer::spatializationMode>(mode);
|
||||
params[Spatializer::headTrackingSensorId] =
|
||||
Spatializer::make<Spatializer::headTrackingSensorId>(sensorId);
|
||||
params[Spatializer::headTrackingMode] =
|
||||
Spatializer::make<Spatializer::headTrackingMode>(htMode);
|
||||
params[Spatializer::headTrackingConnectionMode] =
|
||||
Spatializer::make<Spatializer::headTrackingConnectionMode>(htConnectMode);
|
||||
return params;
|
||||
}()) {
|
||||
std::tie(mFactory, mDescriptor) = std::get<PARAM_INSTANCE_NAME>(GetParam());
|
||||
}
|
||||
|
||||
void SetUp() override {
|
||||
ASSERT_NE(nullptr, mFactory);
|
||||
ASSERT_NO_FATAL_FAILURE(create(mFactory, mEffect, mDescriptor));
|
||||
|
||||
Parameter::Specific specific = getDefaultParamSpecific();
|
||||
Parameter::Common common = EffectHelper::createParamCommon(
|
||||
0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */,
|
||||
kInputFrameCount /* iFrameCount */, kOutputFrameCount /* oFrameCount */);
|
||||
IEffect::OpenEffectReturn ret;
|
||||
ASSERT_NO_FATAL_FAILURE(open(mEffect, common, specific, &ret, EX_NONE));
|
||||
ASSERT_NE(nullptr, mEffect);
|
||||
}
|
||||
|
||||
void TearDown() override {
|
||||
ASSERT_NO_FATAL_FAILURE(close(mEffect));
|
||||
ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));
|
||||
}
|
||||
|
||||
Parameter::Specific getDefaultParamSpecific() {
|
||||
Spatializer spatializer = Spatializer::make<Spatializer::headTrackingSensorId>(0);
|
||||
Parameter::Specific specific =
|
||||
Parameter::Specific::make<Parameter::Specific::spatializer>(spatializer);
|
||||
return specific;
|
||||
}
|
||||
|
||||
static const long kInputFrameCount = 0x100, kOutputFrameCount = 0x100;
|
||||
std::shared_ptr<IFactory> mFactory;
|
||||
std::shared_ptr<IEffect> mEffect;
|
||||
Descriptor mDescriptor;
|
||||
const std::map<Spatializer::Tag, Spatializer> mSpatializerParams;
|
||||
};
|
||||
|
||||
TEST_P(SpatializerParamTest, SetAndGetParam) {
|
||||
for (const auto& it : mSpatializerParams) {
|
||||
auto& tag = it.first;
|
||||
auto& spatializer = it.second;
|
||||
|
||||
// validate parameter
|
||||
Descriptor desc;
|
||||
ASSERT_STATUS(EX_NONE, mEffect->getDescriptor(&desc));
|
||||
const bool valid = isParameterValid<Spatializer, Range::spatializer>(it.second, desc);
|
||||
const binder_exception_t expected = valid ? EX_NONE : EX_ILLEGAL_ARGUMENT;
|
||||
|
||||
// set parameter
|
||||
Parameter expectParam;
|
||||
Parameter::Specific specific;
|
||||
specific.set<Parameter::Specific::spatializer>(spatializer);
|
||||
expectParam.set<Parameter::specific>(specific);
|
||||
EXPECT_STATUS(expected, mEffect->setParameter(expectParam)) << expectParam.toString();
|
||||
|
||||
// only get if parameter in range and set success
|
||||
if (expected == EX_NONE) {
|
||||
Parameter getParam;
|
||||
Parameter::Id id;
|
||||
Spatializer::Id spatializerId;
|
||||
spatializerId.set<Spatializer::Id::commonTag>(tag);
|
||||
id.set<Parameter::Id::spatializerTag>(spatializerId);
|
||||
// if set success, then get should match
|
||||
EXPECT_STATUS(expected, mEffect->getParameter(id, &getParam));
|
||||
EXPECT_EQ(expectParam, getParam);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<std::pair<std::shared_ptr<IFactory>, Descriptor>> kDescPair;
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
SpatializerTest, SpatializerParamTest,
|
||||
::testing::Combine(
|
||||
testing::ValuesIn(kDescPair = EffectFactoryHelper::getAllEffectDescriptors(
|
||||
IFactory::descriptor, getEffectTypeUuidSpatializer())),
|
||||
testing::ValuesIn(EffectHelper::getTestValueSet<
|
||||
Spatializer, Spatialization::Level, Range::spatializer,
|
||||
Spatializer::spatializationLevel>(kDescPair)),
|
||||
testing::ValuesIn(EffectHelper::getTestValueSet<
|
||||
Spatializer, Spatialization::Mode, Range::spatializer,
|
||||
Spatializer::spatializationMode>(kDescPair)),
|
||||
testing::ValuesIn(
|
||||
EffectHelper::getTestValueSet<Spatializer, int, Range::spatializer,
|
||||
Spatializer::headTrackingSensorId>(
|
||||
kDescPair, EffectHelper::expandTestValueBasic<int>)),
|
||||
testing::ValuesIn(EffectHelper::getTestValueSet<
|
||||
Spatializer, HeadTracking::Mode, Range::spatializer,
|
||||
Spatializer::headTrackingMode>(kDescPair)),
|
||||
testing::ValuesIn(EffectHelper::getTestValueSet<
|
||||
Spatializer, HeadTracking::ConnectionMode, Range::spatializer,
|
||||
Spatializer::headTrackingConnectionMode>(kDescPair))),
|
||||
[](const testing::TestParamInfo<SpatializerParamTest::ParamType>& info) {
|
||||
auto descriptor = std::get<PARAM_INSTANCE_NAME>(info.param).second;
|
||||
std::string level = ToString(std::get<PARAM_SPATIALIZATION_LEVEL>(info.param));
|
||||
std::string mode = ToString(std::get<PARAM_SPATIALIZATION_MODE>(info.param));
|
||||
std::string sensorId = ToString(std::get<PARAM_HEADTRACK_SENSORID>(info.param));
|
||||
std::string htMode = ToString(std::get<PARAM_HEADTRACK_MODE>(info.param));
|
||||
std::string htConnectMode =
|
||||
ToString(std::get<PARAM_HEADTRACK_CONNECTION_MODE>(info.param));
|
||||
std::string name = getPrefix(descriptor) + "_sensorID_" + level + "_mode_" + mode +
|
||||
"_sensorID_" + sensorId + "_HTMode_" + htMode +
|
||||
"_HTConnectionMode_" + htConnectMode;
|
||||
std::replace_if(
|
||||
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
|
||||
return name;
|
||||
});
|
||||
|
||||
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SpatializerParamTest);
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
::testing::UnitTest::GetInstance()->listeners().Append(new TestExecutionTracer());
|
||||
ABinderProcess_setThreadPoolMaxThreadCount(1);
|
||||
ABinderProcess_startThreadPool();
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
Loading…
Reference in a new issue