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

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

Merge changes from topic "dynamics_processing_aidl" am: cb3081e5 am: f17943b3 

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



Change-Id: I5ffc4ff58b48a2855a760524d1dcad0aa5b1971a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cedd7bc2 f17943b3

audio/aidl/TEST_MAPPING

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

      "name": "VtsHalDownmixTargetTest"

    },

    {

      "name": "VtsHalDynamicProcessingTargetTest"

    },

    {

      "name": "VtsHalEnvironmentalReverbTargetTest"

    },

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

+10 −10
Original line number Diff line number Diff line
@@ -37,14 +37,14 @@ 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,

  VENDOR_COMMAND_0 = 0x100,

  VENDOR_COMMAND_1,

  VENDOR_COMMAND_2,

  VENDOR_COMMAND_3,

  VENDOR_COMMAND_4,

  VENDOR_COMMAND_5,

  VENDOR_COMMAND_6,

  VENDOR_COMMAND_7,

  VENDOR_COMMAND_8,

  VENDOR_COMMAND_9,

}

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

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ union Downmix { 
  }

  @VintfStability

  enum Type {

    STRIP = 0,

    FOLD = 1,

    STRIP,

    FOLD,

  }

}

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

+26 −21
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ package android.hardware.audio.effect; 
union DynamicsProcessing {

  android.hardware.audio.effect.VendorExtension vendorExtension;

  android.hardware.audio.effect.DynamicsProcessing.EngineArchitecture engineArchitecture;

  android.hardware.audio.effect.DynamicsProcessing.BandChannelConfig preEq;

  android.hardware.audio.effect.DynamicsProcessing.BandChannelConfig postEq;

  android.hardware.audio.effect.DynamicsProcessing.EqBandConfig preEqBand;

  android.hardware.audio.effect.DynamicsProcessing.EqBandConfig postEqBand;

  android.hardware.audio.effect.DynamicsProcessing.BandChannelConfig mbc;

  android.hardware.audio.effect.DynamicsProcessing.MbcBandConfig mbcBand;

  android.hardware.audio.effect.DynamicsProcessing.LimiterConfig limiter;

  float inputGainDb;

  android.hardware.audio.effect.DynamicsProcessing.ChannelConfig[] preEq;

  android.hardware.audio.effect.DynamicsProcessing.ChannelConfig[] postEq;

  android.hardware.audio.effect.DynamicsProcessing.EqBandConfig[] preEqBand;

  android.hardware.audio.effect.DynamicsProcessing.EqBandConfig[] postEqBand;

  android.hardware.audio.effect.DynamicsProcessing.ChannelConfig[] mbc;

  android.hardware.audio.effect.DynamicsProcessing.MbcBandConfig[] mbcBand;

  android.hardware.audio.effect.DynamicsProcessing.LimiterConfig[] limiter;

  android.hardware.audio.effect.DynamicsProcessing.InputGain[] inputGain;

  @VintfStability

  union Id {

    int vendorExtensionTag;
@@ -52,37 +52,39 @@ union DynamicsProcessing { 
  @VintfStability

  parcelable Capability {

    ParcelableHolder extension;

    float minCutOffFreq;

    float maxCutOffFreq;

  }

  enum ResolutionPreference {

    FAVOR_FREQUENCY_RESOLUTION = 0,

    FAVOR_TIME_RESOLUTION = 1,

    FAVOR_FREQUENCY_RESOLUTION,

    FAVOR_TIME_RESOLUTION,

  }

  @VintfStability

  parcelable BandEnablement {

  parcelable StageEnablement {

    boolean inUse;

    int bandCount;

  }

  @VintfStability

  parcelable EngineArchitecture {

    android.hardware.audio.effect.DynamicsProcessing.ResolutionPreference resolutionPreference = android.hardware.audio.effect.DynamicsProcessing.ResolutionPreference.FAVOR_FREQUENCY_RESOLUTION;

    float preferredFrameDurationMs;

    android.hardware.audio.effect.DynamicsProcessing.BandEnablement preEqBand;

    android.hardware.audio.effect.DynamicsProcessing.BandEnablement postEqBand;

    android.hardware.audio.effect.DynamicsProcessing.BandEnablement mbcBand;

    float preferredProcessingDurationMs;

    android.hardware.audio.effect.DynamicsProcessing.StageEnablement preEqStage;

    android.hardware.audio.effect.DynamicsProcessing.StageEnablement postEqStage;

    android.hardware.audio.effect.DynamicsProcessing.StageEnablement mbcStage;

    boolean limiterInUse;

  }

  @VintfStability

  parcelable BandChannelConfig {

  parcelable ChannelConfig {

    int channel;

    android.hardware.audio.effect.DynamicsProcessing.BandEnablement enablement;

    boolean enable;

  }

  @VintfStability

  parcelable EqBandConfig {

    int channel;

    int band;

    boolean enable;

    float cutoffFrequency;

    float gain;

    float cutoffFrequencyHz;

    float gainDb;

  }

  @VintfStability

  parcelable MbcBandConfig {
@@ -90,7 +92,6 @@ union DynamicsProcessing { 
    int band;

    boolean enable;

    float cutoffFrequencyHz;

    float gainDb;

    float attackTimeMs;

    float releaseTimeMs;

    float ratio;
@@ -105,7 +106,6 @@ union DynamicsProcessing { 
  parcelable LimiterConfig {

    int channel;

    boolean enable;

    boolean inUse;

    int linkGroup;

    float attackTimeMs;

    float releaseTimeMs;
@@ -113,4 +113,9 @@ union DynamicsProcessing { 
    float thresholdDb;

    float postGainDb;

  }

  @VintfStability

  parcelable InputGain {

    int channel;

    float gainDb;

  }

}

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

+3 −3
Original line number Diff line number Diff line
@@ -44,15 +44,15 @@ union EnvironmentalReverb { 
  int diffusionPm;

  int densityPm;

  boolean bypass;

  const int MIN_ROOM_LEVEL_MB = -6000;

  const int MIN_ROOM_LEVEL_MB = (-6000);

  const int MAX_ROOM_LEVEL_MB = 0;

  const int MIN_ROOM_HF_LEVEL_MB = -4000;

  const int MIN_ROOM_HF_LEVEL_MB = (-4000);

  const int MAX_ROOM_HF_LEVEL_MB = 0;

  const int MIN_DECAY_TIME_MS = 100;

  const int MAX_DECAY_TIME_MS = 20000;

  const int MIN_DECAY_HF_RATIO_PM = 100;

  const int MAX_DECAY_HF_RATIO_PM = 1000;

  const int MIN_LEVEL_MB = -6000;

  const int MIN_LEVEL_MB = (-6000);

  const int MAX_LEVEL_MB = 0;

  const int MIN_DELAY_MS = 0;

  const int MAX_DELAY_MS = 65;