From b2325e55e935edefa20445687977e0aa9f64cd44 Mon Sep 17 00:00:00 2001 From: Shunkai Yao Date: Fri, 3 Mar 2023 19:34:47 +0000 Subject: [PATCH] Add vendor extension effect example Update Parameter.id from int to ParcelableHolder Bug: 271601435 Test: Build, atest VtsHalAudioEffectTargetTest Change-Id: I5450fa90e95bdebe931c222f6bb177dbdef35c69 --- .../hardware/audio/effect/AcousticEchoCanceler.aidl | 2 +- .../hardware/audio/effect/AutomaticGainControlV1.aidl | 2 +- .../hardware/audio/effect/AutomaticGainControlV2.aidl | 2 +- .../android/hardware/audio/effect/BassBoost.aidl | 2 +- .../android/hardware/audio/effect/Downmix.aidl | 2 +- .../hardware/audio/effect/DynamicsProcessing.aidl | 4 ++-- .../hardware/audio/effect/EnvironmentalReverb.aidl | 2 +- .../android/hardware/audio/effect/Equalizer.aidl | 4 ++-- .../hardware/audio/effect/HapticGenerator.aidl | 4 ++-- .../hardware/audio/effect/LoudnessEnhancer.aidl | 2 +- .../hardware/audio/effect/NoiseSuppression.aidl | 2 +- .../android/hardware/audio/effect/Parameter.aidl | 2 +- .../android/hardware/audio/effect/PresetReverb.aidl | 2 +- .../android/hardware/audio/effect/Virtualizer.aidl | 2 +- .../android/hardware/audio/effect/Visualizer.aidl | 2 +- .../current/android/hardware/audio/effect/Volume.aidl | 2 +- .../hardware/audio/effect/AcousticEchoCanceler.aidl | 2 +- .../hardware/audio/effect/AutomaticGainControlV1.aidl | 2 +- .../hardware/audio/effect/AutomaticGainControlV2.aidl | 2 +- .../aidl/android/hardware/audio/effect/BassBoost.aidl | 2 +- audio/aidl/android/hardware/audio/effect/Downmix.aidl | 2 +- .../hardware/audio/effect/DynamicsProcessing.aidl | 4 ++-- .../hardware/audio/effect/EnvironmentalReverb.aidl | 2 +- .../aidl/android/hardware/audio/effect/Equalizer.aidl | 4 ++-- .../hardware/audio/effect/HapticGenerator.aidl | 4 ++-- .../hardware/audio/effect/LoudnessEnhancer.aidl | 2 +- .../hardware/audio/effect/NoiseSuppression.aidl | 2 +- .../aidl/android/hardware/audio/effect/Parameter.aidl | 6 +++--- .../android/hardware/audio/effect/PresetReverb.aidl | 2 +- .../android/hardware/audio/effect/Virtualizer.aidl | 2 +- .../android/hardware/audio/effect/Visualizer.aidl | 2 +- audio/aidl/android/hardware/audio/effect/Volume.aidl | 2 +- .../dynamicProcessing/DynamicsProcessingSw.cpp | 4 ++-- audio/aidl/default/extension/ExtensionEffect.cpp | 11 ++++++++--- audio/aidl/default/extension/ExtensionEffect.h | 2 +- audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp | 2 +- 36 files changed, 52 insertions(+), 47 deletions(-) diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AcousticEchoCanceler.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AcousticEchoCanceler.aidl index 1ec7dad3e1..16367c0b80 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AcousticEchoCanceler.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AcousticEchoCanceler.aidl @@ -39,7 +39,7 @@ union AcousticEchoCanceler { boolean mobileMode; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.AcousticEchoCanceler.Tag commonTag; } } diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AutomaticGainControlV1.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AutomaticGainControlV1.aidl index 57d44182d3..e69e2bd81d 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AutomaticGainControlV1.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AutomaticGainControlV1.aidl @@ -40,7 +40,7 @@ union AutomaticGainControlV1 { boolean enableLimiter; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.AutomaticGainControlV1.Tag commonTag; } } diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AutomaticGainControlV2.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AutomaticGainControlV2.aidl index bdb481c75b..46ffcafb31 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AutomaticGainControlV2.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AutomaticGainControlV2.aidl @@ -40,7 +40,7 @@ union AutomaticGainControlV2 { int saturationMarginMb; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.AutomaticGainControlV2.Tag commonTag; } @Backing(type="int") @VintfStability diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/BassBoost.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/BassBoost.aidl index d09fe548d7..c248ce8a8a 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/BassBoost.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/BassBoost.aidl @@ -38,7 +38,7 @@ union BassBoost { int strengthPm; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.BassBoost.Tag commonTag; } } diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Downmix.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Downmix.aidl index 45a1f28c4b..ce0a7df1ff 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Downmix.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Downmix.aidl @@ -38,7 +38,7 @@ union Downmix { android.hardware.audio.effect.Downmix.Type type; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.Downmix.Tag commonTag; } @VintfStability diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/DynamicsProcessing.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/DynamicsProcessing.aidl index 3e20e336e4..04f627d07b 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/DynamicsProcessing.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/DynamicsProcessing.aidl @@ -34,7 +34,7 @@ package android.hardware.audio.effect; @VintfStability union DynamicsProcessing { - android.hardware.audio.effect.VendorExtension vendorExtension; + android.hardware.audio.effect.VendorExtension vendor; android.hardware.audio.effect.DynamicsProcessing.EngineArchitecture engineArchitecture; android.hardware.audio.effect.DynamicsProcessing.ChannelConfig[] preEq; android.hardware.audio.effect.DynamicsProcessing.ChannelConfig[] postEq; @@ -46,7 +46,7 @@ union DynamicsProcessing { android.hardware.audio.effect.DynamicsProcessing.InputGain[] inputGain; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.DynamicsProcessing.Tag commonTag; } enum ResolutionPreference { diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/EnvironmentalReverb.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/EnvironmentalReverb.aidl index c12ebb805c..00b7d1acfb 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/EnvironmentalReverb.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/EnvironmentalReverb.aidl @@ -48,7 +48,7 @@ union EnvironmentalReverb { boolean bypass; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.EnvironmentalReverb.Tag commonTag; } } diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Equalizer.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Equalizer.aidl index 3e3539f290..80f7c7e952 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Equalizer.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Equalizer.aidl @@ -34,7 +34,7 @@ package android.hardware.audio.effect; @VintfStability union Equalizer { - android.hardware.audio.effect.VendorExtension vendorExtension; + android.hardware.audio.effect.VendorExtension vendor; android.hardware.audio.effect.Equalizer.BandLevel[] bandLevels; int preset; int[] centerFreqMh; @@ -42,7 +42,7 @@ union Equalizer { android.hardware.audio.effect.Equalizer.Preset[] presets; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.Equalizer.Tag commonTag; } @VintfStability diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/HapticGenerator.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/HapticGenerator.aidl index a7dc2657b1..8addab7b5f 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/HapticGenerator.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/HapticGenerator.aidl @@ -34,12 +34,12 @@ package android.hardware.audio.effect; @VintfStability union HapticGenerator { - android.hardware.audio.effect.VendorExtension vendorExtension; + android.hardware.audio.effect.VendorExtension vendor; android.hardware.audio.effect.HapticGenerator.HapticScale[] hapticScales; android.hardware.audio.effect.HapticGenerator.VibratorInformation vibratorInfo; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.HapticGenerator.Tag commonTag; } @Backing(type="int") @VintfStability diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/LoudnessEnhancer.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/LoudnessEnhancer.aidl index 774f45ffac..fc276d67bc 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/LoudnessEnhancer.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/LoudnessEnhancer.aidl @@ -38,7 +38,7 @@ union LoudnessEnhancer { int gainMb; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.LoudnessEnhancer.Tag commonTag; } } diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/NoiseSuppression.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/NoiseSuppression.aidl index f1a34499cb..7f30fe2ab7 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/NoiseSuppression.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/NoiseSuppression.aidl @@ -39,7 +39,7 @@ union NoiseSuppression { android.hardware.audio.effect.NoiseSuppression.Type type; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.NoiseSuppression.Tag commonTag; } @Backing(type="int") @VintfStability diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Parameter.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Parameter.aidl index 14aa1e8df5..b50a2f19b1 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Parameter.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Parameter.aidl @@ -42,7 +42,7 @@ union Parameter { android.hardware.audio.effect.Parameter.Specific specific; @VintfStability union Id { - int vendorEffectTag; + android.hardware.audio.effect.VendorExtension vendorEffectTag; android.hardware.audio.effect.AcousticEchoCanceler.Id acousticEchoCancelerTag; android.hardware.audio.effect.AutomaticGainControlV1.Id automaticGainControlV1Tag; android.hardware.audio.effect.AutomaticGainControlV2.Id automaticGainControlV2Tag; diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/PresetReverb.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/PresetReverb.aidl index 148f79d80e..26d96b54f3 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/PresetReverb.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/PresetReverb.aidl @@ -49,7 +49,7 @@ union PresetReverb { } @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.PresetReverb.Tag commonTag; } } diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Virtualizer.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Virtualizer.aidl index e9611e42b9..6092b140c2 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Virtualizer.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Virtualizer.aidl @@ -40,7 +40,7 @@ union Virtualizer { android.media.audio.common.AudioDeviceDescription device; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.Virtualizer.Tag commonTag; android.hardware.audio.effect.Virtualizer.SpeakerAnglesPayload speakerAnglesPayload; } diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Visualizer.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Visualizer.aidl index d1b1b3e7af..7d319da751 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Visualizer.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Visualizer.aidl @@ -44,7 +44,7 @@ union Visualizer { android.hardware.audio.effect.Visualizer.MeasurementMode measurementMode; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.Visualizer.Tag commonTag; } @VintfStability diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Volume.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Volume.aidl index c2b2df7de1..8227118d72 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Volume.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Volume.aidl @@ -39,7 +39,7 @@ union Volume { boolean mute; @VintfStability union Id { - int vendorExtensionTag; + android.hardware.audio.effect.VendorExtension vendorExtensionTag; android.hardware.audio.effect.Volume.Tag commonTag; } } diff --git a/audio/aidl/android/hardware/audio/effect/AcousticEchoCanceler.aidl b/audio/aidl/android/hardware/audio/effect/AcousticEchoCanceler.aidl index 49377d64f5..bf1f8a2c19 100644 --- a/audio/aidl/android/hardware/audio/effect/AcousticEchoCanceler.aidl +++ b/audio/aidl/android/hardware/audio/effect/AcousticEchoCanceler.aidl @@ -33,7 +33,7 @@ union AcousticEchoCanceler { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; AcousticEchoCanceler.Tag commonTag; } diff --git a/audio/aidl/android/hardware/audio/effect/AutomaticGainControlV1.aidl b/audio/aidl/android/hardware/audio/effect/AutomaticGainControlV1.aidl index 9b2feff53f..e7bf99dc41 100644 --- a/audio/aidl/android/hardware/audio/effect/AutomaticGainControlV1.aidl +++ b/audio/aidl/android/hardware/audio/effect/AutomaticGainControlV1.aidl @@ -35,7 +35,7 @@ union AutomaticGainControlV1 { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; AutomaticGainControlV1.Tag commonTag; } diff --git a/audio/aidl/android/hardware/audio/effect/AutomaticGainControlV2.aidl b/audio/aidl/android/hardware/audio/effect/AutomaticGainControlV2.aidl index 836d6b8caf..8f2afdcc77 100644 --- a/audio/aidl/android/hardware/audio/effect/AutomaticGainControlV2.aidl +++ b/audio/aidl/android/hardware/audio/effect/AutomaticGainControlV2.aidl @@ -36,7 +36,7 @@ union AutomaticGainControlV2 { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; AutomaticGainControlV2.Tag commonTag; } diff --git a/audio/aidl/android/hardware/audio/effect/BassBoost.aidl b/audio/aidl/android/hardware/audio/effect/BassBoost.aidl index d734825c11..479db961ba 100644 --- a/audio/aidl/android/hardware/audio/effect/BassBoost.aidl +++ b/audio/aidl/android/hardware/audio/effect/BassBoost.aidl @@ -32,7 +32,7 @@ union BassBoost { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; BassBoost.Tag commonTag; } diff --git a/audio/aidl/android/hardware/audio/effect/Downmix.aidl b/audio/aidl/android/hardware/audio/effect/Downmix.aidl index f90e3397c9..90fd4c70f9 100644 --- a/audio/aidl/android/hardware/audio/effect/Downmix.aidl +++ b/audio/aidl/android/hardware/audio/effect/Downmix.aidl @@ -31,7 +31,7 @@ union Downmix { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; Downmix.Tag commonTag; } diff --git a/audio/aidl/android/hardware/audio/effect/DynamicsProcessing.aidl b/audio/aidl/android/hardware/audio/effect/DynamicsProcessing.aidl index 486d4f4ba8..5aea2119cc 100644 --- a/audio/aidl/android/hardware/audio/effect/DynamicsProcessing.aidl +++ b/audio/aidl/android/hardware/audio/effect/DynamicsProcessing.aidl @@ -32,14 +32,14 @@ union DynamicsProcessing { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; DynamicsProcessing.Tag commonTag; } /** * Vendor DynamicsProcessing implementation definition for additional parameters. */ - VendorExtension vendorExtension; + VendorExtension vendor; /** * Resolution preference definition. diff --git a/audio/aidl/android/hardware/audio/effect/EnvironmentalReverb.aidl b/audio/aidl/android/hardware/audio/effect/EnvironmentalReverb.aidl index 95d1ff6b77..1d58e50cb6 100644 --- a/audio/aidl/android/hardware/audio/effect/EnvironmentalReverb.aidl +++ b/audio/aidl/android/hardware/audio/effect/EnvironmentalReverb.aidl @@ -33,7 +33,7 @@ union EnvironmentalReverb { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; EnvironmentalReverb.Tag commonTag; } diff --git a/audio/aidl/android/hardware/audio/effect/Equalizer.aidl b/audio/aidl/android/hardware/audio/effect/Equalizer.aidl index 2bce151b9c..e727f705a9 100644 --- a/audio/aidl/android/hardware/audio/effect/Equalizer.aidl +++ b/audio/aidl/android/hardware/audio/effect/Equalizer.aidl @@ -31,14 +31,14 @@ union Equalizer { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; Equalizer.Tag commonTag; } /** * Vendor Equalizer implementation definition for additional parameters. */ - VendorExtension vendorExtension; + VendorExtension vendor; /** * Level setting for each band in millibels. diff --git a/audio/aidl/android/hardware/audio/effect/HapticGenerator.aidl b/audio/aidl/android/hardware/audio/effect/HapticGenerator.aidl index a8e4564d0f..3cc5acb48c 100644 --- a/audio/aidl/android/hardware/audio/effect/HapticGenerator.aidl +++ b/audio/aidl/android/hardware/audio/effect/HapticGenerator.aidl @@ -33,14 +33,14 @@ union HapticGenerator { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; HapticGenerator.Tag commonTag; } /** * Vendor HapticGenerator implementation definition for additional parameters. */ - VendorExtension vendorExtension; + VendorExtension vendor; @VintfStability @Backing(type="int") diff --git a/audio/aidl/android/hardware/audio/effect/LoudnessEnhancer.aidl b/audio/aidl/android/hardware/audio/effect/LoudnessEnhancer.aidl index a7cbe8d3d0..23e1e5a114 100644 --- a/audio/aidl/android/hardware/audio/effect/LoudnessEnhancer.aidl +++ b/audio/aidl/android/hardware/audio/effect/LoudnessEnhancer.aidl @@ -32,7 +32,7 @@ union LoudnessEnhancer { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; LoudnessEnhancer.Tag commonTag; } diff --git a/audio/aidl/android/hardware/audio/effect/NoiseSuppression.aidl b/audio/aidl/android/hardware/audio/effect/NoiseSuppression.aidl index 6c2fb5fb0f..c6bcc43baa 100644 --- a/audio/aidl/android/hardware/audio/effect/NoiseSuppression.aidl +++ b/audio/aidl/android/hardware/audio/effect/NoiseSuppression.aidl @@ -35,7 +35,7 @@ union NoiseSuppression { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; NoiseSuppression.Tag commonTag; } diff --git a/audio/aidl/android/hardware/audio/effect/Parameter.aidl b/audio/aidl/android/hardware/audio/effect/Parameter.aidl index 9f8874bc02..229c621a3d 100644 --- a/audio/aidl/android/hardware/audio/effect/Parameter.aidl +++ b/audio/aidl/android/hardware/audio/effect/Parameter.aidl @@ -66,10 +66,10 @@ union Parameter { @VintfStability union Id { /** - * Parameter tag defined for vendor effects. Use int here so there is flexibility for vendor - * to define different tag. + * Parameter tag defined for vendor effects. Use VendorExtension here so it's possible to + * pass customized information. */ - int vendorEffectTag; + VendorExtension vendorEffectTag; /** * Parameter tag defined for nested parameters. Can be used to get any parameter defined in * nested Union structure. diff --git a/audio/aidl/android/hardware/audio/effect/PresetReverb.aidl b/audio/aidl/android/hardware/audio/effect/PresetReverb.aidl index 87c78b0cc2..a36da2cbe4 100644 --- a/audio/aidl/android/hardware/audio/effect/PresetReverb.aidl +++ b/audio/aidl/android/hardware/audio/effect/PresetReverb.aidl @@ -68,7 +68,7 @@ union PresetReverb { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; PresetReverb.Tag commonTag; } diff --git a/audio/aidl/android/hardware/audio/effect/Virtualizer.aidl b/audio/aidl/android/hardware/audio/effect/Virtualizer.aidl index 37ea2a4d5c..1dbb5094ab 100644 --- a/audio/aidl/android/hardware/audio/effect/Virtualizer.aidl +++ b/audio/aidl/android/hardware/audio/effect/Virtualizer.aidl @@ -34,7 +34,7 @@ union Virtualizer { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; Virtualizer.Tag commonTag; SpeakerAnglesPayload speakerAnglesPayload; } diff --git a/audio/aidl/android/hardware/audio/effect/Visualizer.aidl b/audio/aidl/android/hardware/audio/effect/Visualizer.aidl index 8f2faaab6a..0b3754652e 100644 --- a/audio/aidl/android/hardware/audio/effect/Visualizer.aidl +++ b/audio/aidl/android/hardware/audio/effect/Visualizer.aidl @@ -33,7 +33,7 @@ union Visualizer { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; Visualizer.Tag commonTag; } Id id; diff --git a/audio/aidl/android/hardware/audio/effect/Volume.aidl b/audio/aidl/android/hardware/audio/effect/Volume.aidl index 4a767035b1..15cfdd2c75 100644 --- a/audio/aidl/android/hardware/audio/effect/Volume.aidl +++ b/audio/aidl/android/hardware/audio/effect/Volume.aidl @@ -31,7 +31,7 @@ union Volume { */ @VintfStability union Id { - int vendorExtensionTag; + VendorExtension vendorExtensionTag; Volume.Tag commonTag; } diff --git a/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp b/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp index da6d0c6f5c..5e5c974980 100644 --- a/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp +++ b/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp @@ -170,7 +170,7 @@ ndk::ScopedAStatus DynamicsProcessingSw::setParameterSpecific(const Parameter::S EX_ILLEGAL_ARGUMENT, "inputGainCfgFailed"); return ndk::ScopedAStatus::ok(); } - case DynamicsProcessing::vendorExtension: { + case DynamicsProcessing::vendor: { LOG(ERROR) << __func__ << " unsupported tag: " << toString(tag); return ndk::ScopedAStatus::fromExceptionCodeWithMessage( EX_ILLEGAL_ARGUMENT, "DynamicsProcessingTagNotSupported"); @@ -237,7 +237,7 @@ ndk::ScopedAStatus DynamicsProcessingSw::getParameterDynamicsProcessing( dpParam.set(mContext->getInputGainCfgs()); break; } - case DynamicsProcessing::vendorExtension: { + case DynamicsProcessing::vendor: { LOG(ERROR) << __func__ << " unsupported tag: " << toString(tag); return ndk::ScopedAStatus::fromExceptionCodeWithMessage( EX_ILLEGAL_ARGUMENT, "DynamicsProcessingTagNotSupported"); diff --git a/audio/aidl/default/extension/ExtensionEffect.cpp b/audio/aidl/default/extension/ExtensionEffect.cpp index d2e3ccd92a..c4e49997ca 100644 --- a/audio/aidl/default/extension/ExtensionEffect.cpp +++ b/audio/aidl/default/extension/ExtensionEffect.cpp @@ -88,7 +88,7 @@ ndk::ScopedAStatus ExtensionEffect::setParameterSpecific(const Parameter::Specif std::optional defaultExt; RETURN_IF(STATUS_OK != vendorEffect.extension.getParcelable(&defaultExt), EX_ILLEGAL_ARGUMENT, "getParcelableFailed"); - RETURN_IF(!defaultExt.has_value(), EX_ILLEGAL_ARGUMENT, "parcelableNulld"); + RETURN_IF(!defaultExt.has_value(), EX_ILLEGAL_ARGUMENT, "parcelableNull"); RETURN_IF(mContext->setParams(defaultExt->bytes) != RetCode::SUCCESS, EX_ILLEGAL_ARGUMENT, "paramNotSupported"); @@ -99,10 +99,15 @@ ndk::ScopedAStatus ExtensionEffect::getParameterSpecific(const Parameter::Id& id Parameter::Specific* specific) { auto tag = id.getTag(); RETURN_IF(Parameter::Id::vendorEffectTag != tag, EX_ILLEGAL_ARGUMENT, "wrongIdTag"); - auto specificId = id.get(); + auto extensionId = id.get(); + std::optional defaultIdExt; + RETURN_IF(STATUS_OK != extensionId.extension.getParcelable(&defaultIdExt), EX_ILLEGAL_ARGUMENT, + "getIdParcelableFailed"); + RETURN_IF(!defaultIdExt.has_value(), EX_ILLEGAL_ARGUMENT, "parcelableIdNull"); + VendorExtension extension; DefaultExtension defaultExt; - defaultExt.bytes = mContext->getParams(specificId); + defaultExt.bytes = mContext->getParams(defaultIdExt->bytes); RETURN_IF(STATUS_OK != extension.extension.setParcelable(defaultExt), EX_ILLEGAL_ARGUMENT, "setParcelableFailed"); specific->set(extension); diff --git a/audio/aidl/default/extension/ExtensionEffect.h b/audio/aidl/default/extension/ExtensionEffect.h index 399fa831f7..f432d4096d 100644 --- a/audio/aidl/default/extension/ExtensionEffect.h +++ b/audio/aidl/default/extension/ExtensionEffect.h @@ -37,7 +37,7 @@ class ExtensionEffectContext final : public EffectContext { mParams = params; return RetCode::SUCCESS; } - std::vector getParams(int tag __unused) const { return mParams; } + std::vector getParams(std::vector id __unused) const { return mParams; } private: std::vector mParams; diff --git a/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp b/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp index ece07f0582..3e6fa7a7c2 100644 --- a/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp +++ b/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp @@ -224,7 +224,7 @@ bool DynamicsProcessingTestHelper::isParamEqual(const DynamicsProcessing::Tag& t dpRef.get(), dpTest.get()); } - case DynamicsProcessing::vendorExtension: { + case DynamicsProcessing::vendor: { return false; } }