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

Commit aca1e4fc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Audio AIDL : Add placeholder implementation and VTS test case for AGC1"... 

Merge "Audio AIDL : Add placeholder implementation and VTS test case for AGC1" am: adce82f9 am: 1d7b1df1

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



Change-Id: I5241a56edf803d14fcaf715d090beb5b7059d643
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c36d527 1d7b1df1

audio/aidl/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
    {

      "name": "VtsHalAECTargetTest"

    },

    {

      "name": "VtsHalAGC1TargetTest"

    },

    {

      "name": "VtsHalAGC2TargetTest"

    },

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
@@ -41,6 +41,7 @@ parcelable Descriptor { 
  const String EFFECT_TYPE_UUID_EQUALIZER = "0bed4300-ddd6-11db-8f34-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_BASS_BOOST = "0634f220-ddd4-11db-a0fc-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_VIRTUALIZER = "37cc2c00-dddd-11db-8577-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_AGC1 = "0a8abfe0-654c-11e0-ba26-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_AGC2 = "ae3c653b-be18-4ab8-8938-418f0a7f06ac";

  const String EFFECT_TYPE_UUID_AEC = "7b491460-8d4d-11e0-bd61-0002a5d5c51b";

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

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
@@ -44,6 +44,7 @@ union Parameter { 
  union Id {

    int vendorEffectTag;

    android.hardware.audio.effect.AcousticEchoCanceler.Id acousticEchoCancelerTag;

    android.hardware.audio.effect.AutomaticGainControlV1.Id automaticGainControlV1Tag;

    android.hardware.audio.effect.AutomaticGainControlV2.Id automaticGainControlV2Tag;

    android.hardware.audio.effect.BassBoost.Id bassBoostTag;

    android.hardware.audio.effect.Downmix.Id downmixTag;
@@ -75,6 +76,7 @@ union Parameter { 
  union Specific {

    android.hardware.audio.effect.VendorExtension vendorEffect;

    android.hardware.audio.effect.AcousticEchoCanceler acousticEchoCanceler;

    android.hardware.audio.effect.AutomaticGainControlV1 automaticGainControlV1;

    android.hardware.audio.effect.AutomaticGainControlV2 automaticGainControlV2;

    android.hardware.audio.effect.BassBoost bassBoost;

    android.hardware.audio.effect.Downmix downmix;

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

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

     */

    const String EFFECT_TYPE_UUID_VIRTUALIZER = "37cc2c00-dddd-11db-8577-0002a5d5c51b";

    /**

     * UUID for Automatic Gain Control V1 (AGC1) type.

     */

    const String EFFECT_TYPE_UUID_AGC1 = "0a8abfe0-654c-11e0-ba26-0002a5d5c51b";

    /**

     * UUID for Automatic Gain Control V2 (AGC2) type.

     */

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

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.hardware.audio.effect;



import android.hardware.audio.effect.AcousticEchoCanceler;

import android.hardware.audio.effect.AutomaticGainControlV1;

import android.hardware.audio.effect.AutomaticGainControlV2;

import android.hardware.audio.effect.BassBoost;

import android.hardware.audio.effect.Downmix;
@@ -83,6 +84,7 @@ union Parameter { 
         *

         */

        AcousticEchoCanceler.Id acousticEchoCancelerTag;

        AutomaticGainControlV1.Id automaticGainControlV1Tag;

        AutomaticGainControlV2.Id automaticGainControlV2Tag;

        BassBoost.Id bassBoostTag;

        Downmix.Id downmixTag;
@@ -165,6 +167,7 @@ union Parameter { 
    union Specific {

        VendorExtension vendorEffect;

        AcousticEchoCanceler acousticEchoCanceler;

        AutomaticGainControlV1 automaticGainControlV1;

        AutomaticGainControlV2 automaticGainControlV2;

        BassBoost bassBoost;

        Downmix downmix;