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

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

Merge changes from topic "processing_effects" am: a46044e8 am: 76331671 am: 1abc850c 

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



Change-Id: Id64b34e3f338a8f44b694d662b6778344b49c2ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce4f43b7 1abc850c

audio/aidl/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -223,6 +223,8 @@ aidl_interface { 
        "android.hardware.audio_defaults",

    ],

    srcs: [

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

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

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

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

        "android/hardware/audio/effect/CommandId.aidl",
@@ -236,6 +238,7 @@ aidl_interface { 
        "android/hardware/audio/effect/IEffect.aidl",

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

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

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

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

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

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

audio/aidl/TEST_MAPPING

+9 −0
Original line number Diff line number Diff line
@@ -23,6 +23,15 @@ 
    },

    {

      "name": "VtsHalVisualizerTargetTest"

    },

    {

      "name": "VtsHalAECTargetTest"

    },

    {

      "name": "VtsHalAGCTargetTest"

    },

    {

      "name": "VtsHalNSTargetTest"

    }

  ]

}

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

0 → 100644
+51 −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 AcousticEchoCanceler {

  android.hardware.audio.effect.VendorExtension vendor;

  int echoDelayUs;

  boolean mobileMode;

  @VintfStability

  union Id {

    int vendorExtensionTag;

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

  }

  @VintfStability

  parcelable Capability {

    ParcelableHolder extension;

    int maxEchoDelayUs;

    boolean supportMobileMode;

  }

}

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

0 → 100644
+57 −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 AutomaticGainControl {

  android.hardware.audio.effect.VendorExtension vendor;

  int fixedDigitalGainMb;

  android.hardware.audio.effect.AutomaticGainControl.LevelEstimator levelEstimator;

  int saturationMarginMb;

  @VintfStability

  union Id {

    int vendorExtensionTag;

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

  }

  @VintfStability

  parcelable Capability {

    ParcelableHolder extension;

    int maxFixedDigitalGainMb;

    int maxSaturationMarginMb;

  }

  @Backing(type="int") @VintfStability

  enum LevelEstimator {

    RMS = 0,

    PEAK = 1,

  }

}

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

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

union Capability {

  android.hardware.audio.effect.VendorExtension vendorExtension;

  android.hardware.audio.effect.AcousticEchoCanceler.Capability acousticEchoCanceler;

  android.hardware.audio.effect.AutomaticGainControl.Capability automaticGainControl;

  android.hardware.audio.effect.BassBoost.Capability bassBoost;

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

  android.hardware.audio.effect.DynamicsProcessing.Capability dynamicsProcessing;
@@ -42,6 +44,7 @@ union Capability { 
  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.NoiseSuppression.Capability noiseSuppression;

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

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

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