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

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

Merge changes from topic "aidl_audio_effect_6" am: 6acc2e59 am: 317b28bf am: 6021bf58 

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



Change-Id: Ia664d19358388969507502d1e4fb1f68c62417de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac96e58a 6021bf58

audio/aidl/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -148,16 +148,26 @@ aidl_interface { 
    name: "android.hardware.audio.effect",

    vendor_available: true,

    srcs: [

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

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

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

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

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

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

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

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

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

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

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

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

        "android/hardware/audio/effect/Parameter.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",

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

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

    ],

    imports: [

        "android.hardware.common-V2",

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

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.audio.effect;

@VintfStability

union BassBoost {

  android.hardware.audio.effect.VendorExtension vendor;

  int strengthPm;

  @VintfStability

  union Id {

    int vendorExtensionTag;

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

  }

  @VintfStability

  parcelable Capability {

    ParcelableHolder extension;

    boolean strengthSupported;

  }

}

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

+10 −5
Original line number Diff line number Diff line
@@ -34,10 +34,15 @@ 
package android.hardware.audio.effect;

@VintfStability

union Capability {

  android.hardware.audio.effect.Capability.VendorEffectCapability vendor;

  android.hardware.audio.effect.VendorExtension vendorExtension;

  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.Equalizer.Capability equalizer;

  @VintfStability

  parcelable VendorEffectCapability {

    ParcelableHolder extension;

  }

  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.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/Descriptor.aidl

+1 −1
Original line number Diff line number Diff line
@@ -54,11 +54,11 @@ parcelable Descriptor { 
    android.media.audio.common.AudioUuid type;

    android.media.audio.common.AudioUuid uuid;

    @nullable android.media.audio.common.AudioUuid proxy;

    android.hardware.audio.effect.Flags flags;

  }

  @VintfStability

  parcelable Common {

    android.hardware.audio.effect.Descriptor.Identity id;

    android.hardware.audio.effect.Flags flags;

    int cpuLoad;

    int memoryUsage;

    @utf8InCpp String name;

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

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.audio.effect;

@VintfStability

union Downmix {

  android.hardware.audio.effect.VendorExtension vendor;

  android.hardware.audio.effect.Downmix.Type type;

  @VintfStability

  union Id {

    int vendorExtensionTag;

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

  }

  @VintfStability

  parcelable Capability {

    ParcelableHolder extension;

  }

  @VintfStability

  enum Type {

    STRIP = 0,

    FOLD = 1,

  }

}