Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40181c1e authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Add Headtracking connection mode for Spatializer AIDL" into main am:... 

Merge "Add Headtracking connection mode for Spatializer AIDL" into main am: 17017a2a am: a3c120c3

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



Change-Id: I2aabc9fbc70fb8eeb1a8ac4a6b54b03ba65743de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73c67e57 a3c120c3

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Spatializer.aidl

+5 −4
Original line number Diff line number Diff line
@@ -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;

audio/aidl/android/hardware/audio/effect/Spatializer.aidl

+18 −10
Original line number Diff line number Diff line
@@ -51,30 +51,38 @@ union Spatializer { 
     */

    VendorExtension vendor;



    /**

     * List of supported input channel layouts.

     */

    AudioChannelLayout[] supportedChannelLayout;



    /**

     * Level of spatialization.

     */

    Spatialization.Level spatializationLevel;



    /**

     * Head tracking mode for spatialization.

     * Spatialization mode, Binaural or Transaural for example.

     */

    HeadTracking.Mode headTrackingMode;

    Spatialization.Mode spatializationMode;



    /**

     * List of supported input channel layouts.

     * Head tracking sensor ID.

     */

    AudioChannelLayout[] supportedChannelLayout;

    int headTrackingSensorId;



    /**

     * Spatialization mode, Binaural or Transaural for example.

     * Head tracking mode for spatialization.

     */

    Spatialization.Mode spatializationMode;

    HeadTracking.Mode headTrackingMode;



    /**

     * Head tracking sensor connection mode for spatialization.

     */

    HeadTracking.ConnectionMode headTrackingConnectionMode;



    /**

     * 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.

     * Headtracking sensor data.

     */

    const int HEAD_TO_STAGE_VEC_SIZE = 6;

    float[HEAD_TO_STAGE_VEC_SIZE] headToStage;

    HeadTracking.SensorData headTrackingSensorData;

}