Spatializer: return supportedChannelLayout as part of parameter am: 759c9cb28b am: 7932707660
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2977815
Change-Id: I3635e160f06afcedc0614ce917466e66232397e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/default/spatializer/SpatializerSw.cpp b/audio/aidl/default/spatializer/SpatializerSw.cpp
index ef86ddb..ab4a53e 100644
--- a/audio/aidl/default/spatializer/SpatializerSw.cpp
+++ b/audio/aidl/default/spatializer/SpatializerSw.cpp
@@ -65,8 +65,6 @@
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 @@
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();
}