From d5b19ea384f359997d574b80f5a9c127040d3d18 Mon Sep 17 00:00:00 2001 From: Shunkai Yao Date: Fri, 17 Nov 2023 00:25:06 +0000 Subject: [PATCH] Add Headtracking connection mode for Spatializer AIDL Bug: 311474218 Test: m android.hardware.audio.effect-update-api Test: m Change-Id: I2578cc37f55000d881211048a10256e67aa26532 --- .../hardware/audio/effect/Spatializer.aidl | 9 ++--- .../hardware/audio/effect/Spatializer.aidl | 36 +++++++++++-------- 2 files changed, 27 insertions(+), 18 deletions(-) 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 9f97de0cc2..98ecee061a 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 @@ -35,12 +35,13 @@ package android.hardware.audio.effect; @VintfStability union Spatializer { android.hardware.audio.effect.VendorExtension vendor; - android.media.audio.common.Spatialization.Level spatializationLevel; - android.media.audio.common.HeadTracking.Mode headTrackingMode; android.media.audio.common.AudioChannelLayout[] supportedChannelLayout; + android.media.audio.common.Spatialization.Level spatializationLevel; android.media.audio.common.Spatialization.Mode spatializationMode; - float[6] headToStage; - const int HEAD_TO_STAGE_VEC_SIZE = 6; + int headTrackingSensorId; + android.media.audio.common.HeadTracking.Mode headTrackingMode; + android.media.audio.common.HeadTracking.ConnectionMode headTrackingConnectionMode; + android.media.audio.common.HeadTracking.SensorData headTrackingSensorData; @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 4edb2e8556..6ebe0d58c0 100644 --- a/audio/aidl/android/hardware/audio/effect/Spatializer.aidl +++ b/audio/aidl/android/hardware/audio/effect/Spatializer.aidl @@ -51,30 +51,38 @@ union Spatializer { */ VendorExtension vendor; - /** - * Level of spatialization. - */ - Spatialization.Level spatializationLevel; - - /** - * Head tracking mode for spatialization. - */ - HeadTracking.Mode headTrackingMode; - /** * List of supported input channel layouts. */ AudioChannelLayout[] supportedChannelLayout; + /** + * Level of spatialization. + */ + Spatialization.Level spatializationLevel; + /** * Spatialization mode, Binaural or Transaural for example. */ Spatialization.Mode spatializationMode; /** - * Vector representing of the head-to-stage pose with six floats: first three are a translation - * vector, and the last three are a rotation vector. + * Head tracking sensor ID. */ - const int HEAD_TO_STAGE_VEC_SIZE = 6; - float[HEAD_TO_STAGE_VEC_SIZE] headToStage; + int headTrackingSensorId; + + /** + * Head tracking mode for spatialization. + */ + HeadTracking.Mode headTrackingMode; + + /** + * Head tracking sensor connection mode for spatialization. + */ + HeadTracking.ConnectionMode headTrackingConnectionMode; + + /** + * Headtracking sensor data. + */ + HeadTracking.SensorData headTrackingSensorData; }