Merge "Spatializer AIDL: add spatializedSpeakerLayout" into main am: dd54edac0a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3453779
Change-Id: I2a28d69546dc4c0b6ce747bfc2dbed8c7e6635ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Spatializer.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Spatializer.aidl
index 98ecee0..efc1ab2 100644
--- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Spatializer.aidl
+++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Spatializer.aidl
@@ -42,6 +42,7 @@
android.media.audio.common.HeadTracking.Mode headTrackingMode;
android.media.audio.common.HeadTracking.ConnectionMode headTrackingConnectionMode;
android.media.audio.common.HeadTracking.SensorData headTrackingSensorData;
+ android.media.audio.common.AudioChannelLayout[] spatializedChannelLayout;
@VintfStability
union Id {
android.hardware.audio.effect.VendorExtension vendorExtensionTag;
diff --git a/audio/aidl/android/hardware/audio/effect/Spatializer.aidl b/audio/aidl/android/hardware/audio/effect/Spatializer.aidl
index 71e3ffe..e86452d 100644
--- a/audio/aidl/android/hardware/audio/effect/Spatializer.aidl
+++ b/audio/aidl/android/hardware/audio/effect/Spatializer.aidl
@@ -86,4 +86,20 @@
* Headtracking sensor data.
*/
HeadTracking.SensorData headTrackingSensorData;
+
+ /**
+ * Spatialized channel layouts.
+ * A spatialized channel layout is one where each virtual speaker position is rendered
+ * at its corresponding virtual position, and is not downmixed with any other.
+ * For instance if a spatializer is only capable of distinct positions for 5.1, it would only
+ * return 5.1:
+ * - the list wouldn't include 4.0, because that mask is "contained" within 5.1
+ * - the list wouldn't include 7.1 (and so on) because the side and rear channels would be
+ * downmixed together.
+ * Another example is a spatializer that can only spatialize up to 9 channels (not counting .1)
+ * and that supports 5.1.4, and 7.1.2, the list should include both.
+ * The values must also be part of the values reported by supportedChannelLayout.
+ * The array containing the values cannot be empty.
+ */
+ AudioChannelLayout[] spatializedChannelLayout;
}