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

Commit 20e5c173 authored by Shunkai Yao's avatar Shunkai Yao
Browse files

Effect AIDL: update IFactory.queryEffects to return Descriptor 

Add queryEffect for effect libraries.
Change Descriptor in each effect implementation to be static so
extern C function can access.

Bug: 261646550
Test: atest VtsHalAudioEffectTargetTest
Change-Id: Id7badec592becf37b27be6022106f443e5976880
parent 72a39648

audio/aidl/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ aidl_interface { 
        "android/hardware/audio/effect/Descriptor.aidl",

        "android/hardware/audio/effect/Downmix.aidl",

        "android/hardware/audio/effect/DynamicsProcessing.aidl",

        "android/hardware/audio/effect/EnvironmentalReverb.aidl",

        "android/hardware/audio/effect/Equalizer.aidl",

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

        "android/hardware/audio/effect/HapticGenerator.aidl",
@@ -184,8 +185,8 @@ aidl_interface { 
        "android/hardware/audio/effect/IFactory.aidl",

        "android/hardware/audio/effect/LoudnessEnhancer.aidl",

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

        "android/hardware/audio/effect/PresetReverb.aidl",

        "android/hardware/audio/effect/Processing.aidl",

        "android/hardware/audio/effect/Reverb.aidl",

        "android/hardware/audio/effect/State.aidl",

        "android/hardware/audio/effect/VendorExtension.aidl",

        "android/hardware/audio/effect/Virtualizer.aidl",

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

+2 −1
Original line number Diff line number Diff line
@@ -38,10 +38,11 @@ union Capability { 
  android.hardware.audio.effect.BassBoost.Capability bassBoost;

  android.hardware.audio.effect.Downmix.Capability downmix;

  android.hardware.audio.effect.DynamicsProcessing.Capability dynamicsProcessing;

  android.hardware.audio.effect.EnvironmentalReverb.Capability environmentalReverb;

  android.hardware.audio.effect.Equalizer.Capability equalizer;

  android.hardware.audio.effect.HapticGenerator.Capability hapticGenerator;

  android.hardware.audio.effect.LoudnessEnhancer.Capability loudnessEnhancer;

  android.hardware.audio.effect.Reverb.Capability reverb;

  android.hardware.audio.effect.PresetReverb.Capability presetReverb;

  android.hardware.audio.effect.Virtualizer.Capability virtualizer;

  android.hardware.audio.effect.Visualizer.Capability visualizer;

  android.hardware.audio.effect.Volume.Capability volume;

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Reverb.aidl→audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/EnvironmentalReverb.aidl

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


package android.hardware.audio.effect;

@VintfStability

union Reverb {

union EnvironmentalReverb {

  android.hardware.audio.effect.VendorExtension vendor;

  int roomLevelMb;

  int roomHfLevelMb;
@@ -47,7 +47,7 @@ union Reverb { 
  @VintfStability

  union Id {

    int vendorExtensionTag;

    android.hardware.audio.effect.Reverb.Tag commonTag;

    android.hardware.audio.effect.EnvironmentalReverb.Tag commonTag;

  }

  @VintfStability

  parcelable Capability {

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.audio.effect;

@VintfStability

interface IFactory {

  android.hardware.audio.effect.Descriptor.Identity[] queryEffects(in @nullable android.media.audio.common.AudioUuid type, in @nullable android.media.audio.common.AudioUuid implementation, in @nullable android.media.audio.common.AudioUuid proxy);

  android.hardware.audio.effect.Descriptor[] queryEffects(in @nullable android.media.audio.common.AudioUuid type, in @nullable android.media.audio.common.AudioUuid implementation, in @nullable android.media.audio.common.AudioUuid proxy);

  android.hardware.audio.effect.Processing[] queryProcessing(in @nullable android.hardware.audio.effect.Processing.Type type);

  android.hardware.audio.effect.IEffect createEffect(in android.media.audio.common.AudioUuid implUuid);

  void destroyEffect(in android.hardware.audio.effect.IEffect handle);

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

+5 −3
Original line number Diff line number Diff line
@@ -46,10 +46,11 @@ union Parameter { 
    android.hardware.audio.effect.BassBoost.Id bassBoostTag;

    android.hardware.audio.effect.Downmix.Id downmixTag;

    android.hardware.audio.effect.DynamicsProcessing.Id dynamicsProcessingTag;

    android.hardware.audio.effect.EnvironmentalReverb.Id environmentalReverbTag;

    android.hardware.audio.effect.Equalizer.Id equalizerTag;

    android.hardware.audio.effect.HapticGenerator.Id hapticGeneratorTag;

    android.hardware.audio.effect.LoudnessEnhancer.Id loudnessEnhancerTag;

    android.hardware.audio.effect.Reverb.Id reverbTag;

    android.hardware.audio.effect.PresetReverb.Id presetReverbTag;

    android.hardware.audio.effect.Virtualizer.Id virtualizerTag;

    android.hardware.audio.effect.Visualizer.Id visualizerTag;

    android.hardware.audio.effect.Volume.Id volumeTag;
@@ -73,10 +74,11 @@ union Parameter { 
    android.hardware.audio.effect.BassBoost bassBoost;

    android.hardware.audio.effect.Downmix downmix;

    android.hardware.audio.effect.DynamicsProcessing dynamicsProcessing;

    android.hardware.audio.effect.EnvironmentalReverb environmentalReverb;

    android.hardware.audio.effect.Equalizer equalizer;

    android.hardware.audio.effect.LoudnessEnhancer loudnessEnhancer;

    android.hardware.audio.effect.HapticGenerator hapticGenerator;

    android.hardware.audio.effect.Reverb reverb;

    android.hardware.audio.effect.LoudnessEnhancer loudnessEnhancer;

    android.hardware.audio.effect.PresetReverb presetReverb;

    android.hardware.audio.effect.Virtualizer virtualizer;

    android.hardware.audio.effect.Visualizer visualizer;

    android.hardware.audio.effect.Volume volume;