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

Commit 5c2af2b8 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Effect AIDL: add AudioTrack metadata as a common parameter for effects"... 

Merge "Effect AIDL: add AudioTrack metadata as a common parameter for effects" into main am: 4181e7db

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



Change-Id: I63caa44ae1c4c016a668968de456dabb75cf01dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60cfde22 4181e7db

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

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ parcelable Flags { 
  boolean audioModeIndication;

  boolean audioSourceIndication;

  boolean bypass;

  boolean sinkMetadataIndication;

  boolean sourceMetadataIndication;

  @Backing(type="byte") @VintfStability

  enum Type {

    INSERT = 0,

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

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ union Parameter { 
  boolean offload;

  android.hardware.audio.effect.Parameter.VolumeStereo volumeStereo;

  android.hardware.audio.effect.Parameter.Specific specific;

  android.hardware.audio.common.SinkMetadata sinkMetadata;

  android.hardware.audio.common.SourceMetadata sourceMetadata;

  @VintfStability

  union Id {

    android.hardware.audio.effect.VendorExtension vendorEffectTag;

audio/aidl/android/hardware/audio/effect/Flags.aidl

+14 −0
Original line number Diff line number Diff line
@@ -144,4 +144,18 @@ parcelable Flags { 
     * Set to true if the effect instance bypass audio data (no processing).

     */

    boolean bypass;



    /**

     * Effect instance sets this flag to true if it requires record AudioTrack metadata update. In

     * this case the framework must call IEffect.setParameter to notify effect instance when there

     * is a change in sinkMetadata.

     */

    boolean sinkMetadataIndication;



    /**

     * Effect instance sets this flag to true if it requires playback AudioTrack metadata update. In

     * this case the framework must call IEffect.setParameter to notify effect instance when there

     * is a change in sourceMetadata.

     */

    boolean sourceMetadataIndication;

}

audio/aidl/android/hardware/audio/effect/Parameter.aidl

+18 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.hardware.audio.effect;



import android.hardware.audio.common.SinkMetadata;

import android.hardware.audio.common.SourceMetadata;

import android.hardware.audio.effect.AcousticEchoCanceler;

import android.hardware.audio.effect.AutomaticGainControlV1;

import android.hardware.audio.effect.AutomaticGainControlV2;
@@ -198,4 +200,20 @@ union Parameter { 
        Spatializer spatializer;

    }

    Specific specific;



    /**

     * SinkMetadata defines the metadata of record AudioTracks which the effect instance associate

     * with.

     * The effect engine is required to set Flags.sinkMetadataIndication to true if it wants to

     * receive sinkMetadata update from the audio framework.

     */

    SinkMetadata sinkMetadata;



    /**

     * SourceMetadata defines the metadata of playback AudioTracks which the effect instance

     * associate with.

     * The effect engine is required to set Flags.sourceMetadataIndication to true if it wants to

     * receive sourceMetadata update from the audio framework.

     */

    SourceMetadata sourceMetadata;

}