Merge "Add surround sound configuration to the AIDL Audio HAL interface." am:... (3fd16888) · Commits · e / os / android_hardware_interfaces

audio/aidl/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ aidl_interface {
		"android/hardware/audio/core/MmapBufferDescriptor.aidl",
		"android/hardware/audio/core/ModuleDebug.aidl",
		"android/hardware/audio/core/StreamDescriptor.aidl",
		"android/hardware/audio/core/SurroundSoundConfig.aidl",
		],
		imports: [
		"android.hardware.common-V2",

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/IConfig.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,4 +34,5 @@
		package android.hardware.audio.core;
		@VintfStability
		interface IConfig {
		android.hardware.audio.core.SurroundSoundConfig getSurroundSoundConfig();
		}

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/SurroundSoundConfig.aidl

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.core;
		@JavaDerive(equals=true, toString=true) @VintfStability
		parcelable SurroundSoundConfig {
		android.hardware.audio.core.SurroundSoundConfig.SurroundFormatFamily[] formatFamilies;
		@VintfStability
		parcelable SurroundFormatFamily {
		android.media.audio.common.AudioFormatDescription primaryFormat;
		android.media.audio.common.AudioFormatDescription[] subFormats;
		}
		}

audio/aidl/android/hardware/audio/core/IConfig.aidl

+14 −1

Original line number	Diff line number	Diff line
		@@ -16,9 +16,22 @@

		package android.hardware.audio.core;

		import android.hardware.audio.core.SurroundSoundConfig;

		/**
		* This interface provides system-wide configuration parameters for audio I/O
		* (by "system" here we mean the device running Android).
		*/
		@VintfStability
		interface IConfig {}
		interface IConfig {
		/**
		* Returns the surround sound configuration used for the Audio Policy
		* Manager initial configuration.
		*
		* This method will only be called during the initialization of the Audio
		* Policy Manager, and must always return the same result.
		*
		* @return The surround sound configuration
		*/
		SurroundSoundConfig getSurroundSoundConfig();
		}

audio/aidl/android/hardware/audio/core/SurroundSoundConfig.aidl

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.core;

		import android.media.audio.common.AudioFormatDescription;

		/**
		* SurroundSoundConfig defines the multi-channel formats that can be enabled on
		* (primarily TV) devices.
		*/
		@JavaDerive(equals=true, toString=true)
		@VintfStability
		parcelable SurroundSoundConfig {
		@VintfStability
		parcelable SurroundFormatFamily {
		/**
		* A primaryFormat shall get an entry in the Surround Settings dialog on TV
		* devices. There must be a corresponding Java ENCODING_... constant
		* defined in AudioFormat.java, and a display name defined in
		* AudioFormat.toDisplayName.
		*/
		AudioFormatDescription primaryFormat;
		/**
		* List of formats that shall be equivalent to the primaryFormat from the
		* users' point of view and don't need a dedicated Surround Settings
		* dialog entry.
		*/
		AudioFormatDescription[] subFormats;
		}
		SurroundFormatFamily[] formatFamilies;
		}