Spatializer: return supportedChannelLayout as part of parameter am: 759c9cb28b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2977815

Change-Id: Iba2078f7781bbe1b54771c955ca927cd57fdc6b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shunkai Yao
2024-02-27 03:04:03 +00:00
committed by Automerger Merge Worker

View File

@@ -65,8 +65,6 @@ 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,
@@ -175,11 +173,19 @@ std::optional<Spatializer> SpatializerSwContext::getParam(TAG tag) {
if (mParamsMap.find(tag) != mParamsMap.end()) {
return mParamsMap.at(tag);
}
if (tag == Spatializer::supportedChannelLayout) {
return Spatializer::make<Spatializer::supportedChannelLayout>(
{AudioChannelLayout::make<AudioChannelLayout::layoutMask>(
AudioChannelLayout::LAYOUT_5POINT1)});
}
return std::nullopt;
}
template <typename TAG>
ndk::ScopedAStatus SpatializerSwContext::setParam(TAG tag, Spatializer spatializer) {
RETURN_IF(tag == Spatializer::supportedChannelLayout, EX_ILLEGAL_ARGUMENT,
"supportedChannelLayoutGetOnly");
mParamsMap[tag] = spatializer;
return ndk::ScopedAStatus::ok();
}