Merge "Effect AIDL: add Spatializer aidl in audio effect HAL" into main am: 69bc4e0711 (d123477c) · Commits · e / os / android_hardware_interfaces

audio/aidl/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -297,6 +297,7 @@ aidl_interface {
	"android/hardware/audio/effect/PresetReverb.aidl",		"android/hardware/audio/effect/PresetReverb.aidl",
	"android/hardware/audio/effect/Processing.aidl",		"android/hardware/audio/effect/Processing.aidl",
	"android/hardware/audio/effect/Range.aidl",		"android/hardware/audio/effect/Range.aidl",
			"android/hardware/audio/effect/Spatializer.aidl",
	"android/hardware/audio/effect/State.aidl",		"android/hardware/audio/effect/State.aidl",
	"android/hardware/audio/effect/VendorExtension.aidl",		"android/hardware/audio/effect/VendorExtension.aidl",
	"android/hardware/audio/effect/Virtualizer.aidl",		"android/hardware/audio/effect/Virtualizer.aidl",

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -60,6 +60,7 @@ union Parameter {
	android.hardware.audio.effect.Visualizer.Id visualizerTag;		android.hardware.audio.effect.Visualizer.Id visualizerTag;
	android.hardware.audio.effect.Volume.Id volumeTag;		android.hardware.audio.effect.Volume.Id volumeTag;
	android.hardware.audio.effect.Parameter.Tag commonTag;		android.hardware.audio.effect.Parameter.Tag commonTag;
			android.hardware.audio.effect.Spatializer.Id spatializerTag;
	}		}
	@VintfStability		@VintfStability
	parcelable Common {		parcelable Common {
	@@ -91,5 +92,6 @@ union Parameter {
	android.hardware.audio.effect.Virtualizer virtualizer;		android.hardware.audio.effect.Virtualizer virtualizer;
	android.hardware.audio.effect.Visualizer visualizer;		android.hardware.audio.effect.Visualizer visualizer;
	android.hardware.audio.effect.Volume volume;		android.hardware.audio.effect.Volume volume;
			android.hardware.audio.effect.Spatializer spatializer;
	}		}
	}		}

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,7 @@ union Range {
	android.hardware.audio.effect.Range.VirtualizerRange[] virtualizer;		android.hardware.audio.effect.Range.VirtualizerRange[] virtualizer;
	android.hardware.audio.effect.Range.VisualizerRange[] visualizer;		android.hardware.audio.effect.Range.VisualizerRange[] visualizer;
	android.hardware.audio.effect.Range.VolumeRange[] volume;		android.hardware.audio.effect.Range.VolumeRange[] volume;
			android.hardware.audio.effect.Range.SpatializerRange[] spatializer;
	@VintfStability		@VintfStability
	parcelable AcousticEchoCancelerRange {		parcelable AcousticEchoCancelerRange {
	android.hardware.audio.effect.AcousticEchoCanceler min;		android.hardware.audio.effect.AcousticEchoCanceler min;
	@@ -111,6 +112,11 @@ union Range {
	android.hardware.audio.effect.PresetReverb max;		android.hardware.audio.effect.PresetReverb max;
	}		}
	@VintfStability		@VintfStability
			parcelable SpatializerRange {
			android.hardware.audio.effect.Spatializer min;
			android.hardware.audio.effect.Spatializer max;
			}
			@VintfStability
	parcelable VendorExtensionRange {		parcelable VendorExtensionRange {
	android.hardware.audio.effect.VendorExtension min;		android.hardware.audio.effect.VendorExtension min;
	android.hardware.audio.effect.VendorExtension max;		android.hardware.audio.effect.VendorExtension max;

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

0 → 100644

+49 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* 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 <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 Spatializer {
			android.hardware.audio.effect.VendorExtension vendor;
			android.media.audio.common.Spatialization.Level spatializationLevel;
			android.media.audio.common.HeadTracking.Mode headTrackingMode;
			android.media.audio.common.AudioChannelLayout[] supportedChannelLayout;
			android.media.audio.common.Spatialization.Mode spatializationMode;
			float[6] headToStage;
			const int HEAD_TO_STAGE_VEC_SIZE = 6;
			@VintfStability
			union Id {
			android.hardware.audio.effect.VendorExtension vendorExtensionTag;
			android.hardware.audio.effect.Spatializer.Tag commonTag;
			}
			}

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

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ import android.hardware.audio.effect.HapticGenerator;
	import android.hardware.audio.effect.LoudnessEnhancer;		import android.hardware.audio.effect.LoudnessEnhancer;
	import android.hardware.audio.effect.NoiseSuppression;		import android.hardware.audio.effect.NoiseSuppression;
	import android.hardware.audio.effect.PresetReverb;		import android.hardware.audio.effect.PresetReverb;
			import android.hardware.audio.effect.Spatializer;
	import android.hardware.audio.effect.VendorExtension;		import android.hardware.audio.effect.VendorExtension;
	import android.hardware.audio.effect.Virtualizer;		import android.hardware.audio.effect.Virtualizer;
	import android.hardware.audio.effect.Visualizer;		import android.hardware.audio.effect.Visualizer;
	@@ -103,6 +104,11 @@ union Parameter {
	* directly.		* directly.
	*/		*/
	Parameter.Tag commonTag;		Parameter.Tag commonTag;

			/**
			* Parameter tag defined for Spatializer parameters.
			*/
			Spatializer.Id spatializerTag;
	}		}

	/**		/**
	@@ -189,6 +195,7 @@ union Parameter {
	Virtualizer virtualizer;		Virtualizer virtualizer;
	Visualizer visualizer;		Visualizer visualizer;
	Volume volume;		Volume volume;
			Spatializer spatializer;
	}		}
	Specific specific;		Specific specific;
	}		}