Merge "Add Headtracking connection mode for Spatializer AIDL" into main am: 17017a2aa4 am: a3c120c31a

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

Change-Id: I2aabc9fbc70fb8eeb1a8ac4a6b54b03ba65743de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shunkai Yao
2023-11-18 02:03:41 +00:00
committed by Automerger Merge Worker
2 changed files with 27 additions and 18 deletions

View File

@@ -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;

View File

@@ -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;
}