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

Commit bc71b029 authored by Shunkai Yao's avatar Shunkai Yao Committed by Gerrit Code Review
Browse files

Merge changes from topic "aidl_audio_effect3" 

* changes:
  AIDL effect: Add effect AIDL implementationi and vts test
  AIDL effect: Add effect AIDL definition
parents eac52437 ea24c1a1

audio/aidl/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -148,11 +148,19 @@ aidl_interface { 
    name: "android.hardware.audio.effect",

    vendor_available: true,

    srcs: [

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

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

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

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

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

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

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

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

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

    ],

    imports: [

        "android.hardware.common-V2",

        "android.hardware.common.fmq-V1",

        "android.hardware.audio.common-V1",

        "android.media.audio.common.types-V2",

    ],

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

0 → 100644
+43 −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 Capability {

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

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

  @VintfStability

  parcelable VendorEffectCapability {

    ParcelableHolder extension;

  }

}

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

0 → 100644
+50 −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;

@Backing(type="int") @VintfStability

enum CommandId {

  START = 0,

  STOP = 1,

  RESET = 2,

  VENDOR_COMMAND_0 = 256,

  VENDOR_COMMAND_1 = 257,

  VENDOR_COMMAND_2 = 258,

  VENDOR_COMMAND_3 = 259,

  VENDOR_COMMAND_4 = 260,

  VENDOR_COMMAND_5 = 261,

  VENDOR_COMMAND_6 = 262,

  VENDOR_COMMAND_7 = 263,

  VENDOR_COMMAND_8 = 264,

  VENDOR_COMMAND_9 = 265,

}

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

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ package android.hardware.audio.effect; 
@VintfStability

parcelable Descriptor {

  android.hardware.audio.effect.Descriptor.Common common;

  android.hardware.audio.effect.Capability capability;

  const String EFFECT_TYPE_UUID_ENV_REVERB = "c2e5d5f0-94bd-4763-9cac-4e234d06839e";

  const String EFFECT_TYPE_UUID_PRESET_REVERB = "47382d60-ddd8-11db-bf3a-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_EQUALIZER = "0bed4300-ddd6-11db-8f34-0002a5d5c51b";
@@ -56,5 +57,6 @@ parcelable Descriptor { 
  @VintfStability

  parcelable Common {

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

    android.hardware.audio.effect.Flags flags;

  }

}

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

0 → 100644
+46 −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 Equalizer {

  android.hardware.audio.effect.Equalizer.VendorExtension vendor;

  @VintfStability

  parcelable Capability {

    ParcelableHolder extension;

  }

  @VintfStability

  parcelable VendorExtension {

    ParcelableHolder extension;

  }

}