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

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

Merge "Add audio eraser effect AIDL and placeholder implementation" into main

parents 4c5ab8db 922576ff

audio/aidl/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ aidl_interface { 
        "android.hardware.audio_defaults",

        "latest_android_hardware_audio_common_import_interface",

        "latest_android_media_audio_common_types_import_interface",

        "latest_android_media_audio_eraser_types_import_interface",

    ],

    srcs: [

        "android/hardware/audio/effect/AcousticEchoCanceler.aidl",
@@ -324,6 +325,7 @@ aidl_interface { 
        "android/hardware/audio/effect/DynamicsProcessing.aidl",

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

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

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

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

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ parcelable Descriptor { 
  const String EFFECT_TYPE_UUID_DYNAMICS_PROCESSING = "7261676f-6d75-7369-6364-28e2fd3ac39e";

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

  const String EFFECT_TYPE_UUID_EQUALIZER = "0bed4300-ddd6-11db-8f34-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_ERASER = "fa81a9ac-588b-11ed-9b6a-0242ac120002";

  const String EFFECT_TYPE_UUID_HAPTIC_GENERATOR = "1411e6d6-aecd-4021-a1cf-a6aceb0d71e5";

  const String EFFECT_TYPE_UUID_LOUDNESS_ENHANCER = "fe3199be-aed0-413f-87bb-11260eb63cf1";

  const String EFFECT_TYPE_UUID_NS = "58b4b260-8e06-11e0-aa8e-0002a5d5c51b";

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

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

 * Copyright (C) 2024 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 Eraser {

  android.hardware.audio.effect.VendorExtension vendor;

  android.media.audio.eraser.Capability capability;

  android.media.audio.eraser.Configuration configuration;

  @VintfStability

  union Id {

    android.hardware.audio.effect.VendorExtension vendorExtensionTag;

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

  }

}

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
@@ -63,6 +63,7 @@ union Parameter { 
    android.hardware.audio.effect.Volume.Id volumeTag;

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

    android.hardware.audio.effect.Spatializer.Id spatializerTag;

    android.hardware.audio.effect.Eraser.Id eraserTag;

  }

  @VintfStability

  parcelable Common {
@@ -95,5 +96,6 @@ union Parameter { 
    android.hardware.audio.effect.Visualizer visualizer;

    android.hardware.audio.effect.Volume volume;

    android.hardware.audio.effect.Spatializer spatializer;

    android.hardware.audio.effect.Eraser eraser;

  }

}

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

+4 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ parcelable Descriptor { 
     * UUID for equalizer effect type.

     */

    const String EFFECT_TYPE_UUID_EQUALIZER = "0bed4300-ddd6-11db-8f34-0002a5d5c51b";

    /**

     * UUID for Audio eraser effect type.

     */

    const String EFFECT_TYPE_UUID_ERASER = "fa81a9ac-588b-11ed-9b6a-0242ac120002";

    /**

     * UUID for Haptic Generator type.

     */