From 88b24b2dea5b24085fc0c83a758de709d32dc2db Mon Sep 17 00:00:00 2001 From: Shunkai Yao Date: Tue, 24 Jan 2023 22:56:26 +0000 Subject: [PATCH] AIDL effect: add Range for effect capabilities Bug: 261129656 Test: Compile and build, will add usage in effect capabilities. Change-Id: I29b80ee8b3e08fa3b6f0e5cf0e9349096adddb43 --- audio/aidl/Android.bp | 1 + .../android/hardware/audio/effect/Range.aidl | 66 +++++++++++++++++++ .../android/hardware/audio/effect/Range.aidl | 65 ++++++++++++++++++ 3 files changed, 132 insertions(+) create mode 100644 audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Range.aidl create mode 100644 audio/aidl/android/hardware/audio/effect/Range.aidl diff --git a/audio/aidl/Android.bp b/audio/aidl/Android.bp index 56ac510a53..08d660cfae 100644 --- a/audio/aidl/Android.bp +++ b/audio/aidl/Android.bp @@ -243,6 +243,7 @@ aidl_interface { "android/hardware/audio/effect/Parameter.aidl", "android/hardware/audio/effect/PresetReverb.aidl", "android/hardware/audio/effect/Processing.aidl", + "android/hardware/audio/effect/Range.aidl", "android/hardware/audio/effect/State.aidl", "android/hardware/audio/effect/VendorExtension.aidl", "android/hardware/audio/effect/Virtualizer.aidl", diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Range.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Range.aidl new file mode 100644 index 0000000000..531d3a12b2 --- /dev/null +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Range.aidl @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2023 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 -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 +parcelable Range { + int tag; + android.hardware.audio.effect.Range.Types types; + @VintfStability + parcelable Int { + int min; + int max; + } + @VintfStability + parcelable Float { + float min; + float max; + } + @VintfStability + parcelable Long { + long min; + long max; + } + @VintfStability + parcelable Byte { + byte min; + byte max; + } + @VintfStability + union Types { + android.hardware.audio.effect.Range.Int rangeInt; + android.hardware.audio.effect.Range.Float rangeFloat; + android.hardware.audio.effect.Range.Long rangeLong; + android.hardware.audio.effect.Range.Byte rangeByte; + } +} diff --git a/audio/aidl/android/hardware/audio/effect/Range.aidl b/audio/aidl/android/hardware/audio/effect/Range.aidl new file mode 100644 index 0000000000..c052502eb4 --- /dev/null +++ b/audio/aidl/android/hardware/audio/effect/Range.aidl @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2023 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. + */ + +package android.hardware.audio.effect; + +/** + * Define the range (min and max) of a certain field, identified by tag. + * Can be used by effect capabilities to define supported value ranges. + */ +@VintfStability +parcelable Range { + /** + * The union tag name which the range is defined for. + * For example: if used in AutomaticGainControlV1.Capability, value of Range.tag could be + * targetLevelDbFs or compressionGainDb. + */ + int tag; + + @VintfStability + parcelable Int { + int min; + int max; + } + + @VintfStability + parcelable Float { + float min; + float max; + } + + @VintfStability + parcelable Long { + long min; + long max; + } + + @VintfStability + parcelable Byte { + byte min; + byte max; + } + + @VintfStability + union Types { + Int rangeInt; + Float rangeFloat; + Long rangeLong; + Byte rangeByte; + } + + Types types; +}