Merge "audio: Add microphone settings to IModule, IStreamIn" (77494f93) · Commits · e / os / android_hardware_interfaces

audio/aidl/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,8 @@ aidl_interface {
		"android/hardware/audio/core/IStreamIn.aidl",
		"android/hardware/audio/core/IStreamOut.aidl",
		"android/hardware/audio/core/ITelephony.aidl",
		"android/hardware/audio/core/MicrophoneDynamicInfo.aidl",
		"android/hardware/audio/core/MicrophoneInfo.aidl",
		"android/hardware/audio/core/MmapBufferDescriptor.aidl",
		"android/hardware/audio/core/ModuleDebug.aidl",
		"android/hardware/audio/core/StreamDescriptor.aidl",

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ interface IModule {
		void setMasterVolume(float volume);
		boolean getMicMute();
		void setMicMute(boolean mute);
		android.hardware.audio.core.MicrophoneInfo[] getMicrophones();
		void updateAudioMode(android.hardware.audio.core.AudioMode mode);
		void updateScreenRotation(android.hardware.audio.core.IModule.ScreenRotation rotation);
		void updateScreenState(boolean isTurnedOn);

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -35,5 +35,20 @@ package android.hardware.audio.core;
		@VintfStability
		interface IStreamIn {
		void close();
		android.hardware.audio.core.MicrophoneDynamicInfo[] getActiveMicrophones();
		android.hardware.audio.core.IStreamIn.MicrophoneDirection getMicrophoneDirection();
		void setMicrophoneDirection(android.hardware.audio.core.IStreamIn.MicrophoneDirection direction);
		float getMicrophoneFieldDimension();
		void setMicrophoneFieldDimension(float zoom);
		void updateMetadata(in android.hardware.audio.common.SinkMetadata sinkMetadata);
		const int MIC_FIELD_DIMENSION_WIDE_ANGLE = -1;
		const int MIC_FIELD_DIMENSION_NO_ZOOM = 0;
		const int MIC_FIELD_DIMENSION_MAX_ZOOM = 1;
		@Backing(type="int") @VintfStability
		enum MicrophoneDirection {
		UNSPECIFIED = 0,
		FRONT = 1,
		BACK = 2,
		EXTERNAL = 3,
		}
		}

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/MicrophoneDynamicInfo.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.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// 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 MicrophoneDynamicInfo {
		@utf8InCpp String id;
		android.hardware.audio.core.MicrophoneDynamicInfo.ChannelMapping[] channelMapping;
		@Backing(type="int") @VintfStability
		enum ChannelMapping {
		UNUSED = 0,
		DIRECT = 1,
		PROCESSED = 2,
		}
		}

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

0 → 100644

+82 −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 MicrophoneInfo {
		@utf8InCpp String id;
		android.media.audio.common.AudioDevice device;
		android.hardware.audio.core.MicrophoneInfo.Location location = android.hardware.audio.core.MicrophoneInfo.Location.UNKNOWN;
		int group = -1;
		int indexInTheGroup = -1;
		@nullable android.hardware.audio.core.MicrophoneInfo.Sensitivity sensitivity;
		android.hardware.audio.core.MicrophoneInfo.Directionality directionality = android.hardware.audio.core.MicrophoneInfo.Directionality.UNKNOWN;
		android.hardware.audio.core.MicrophoneInfo.FrequencyResponsePoint[] frequencyResponse;
		@nullable android.hardware.audio.core.MicrophoneInfo.Coordinate position;
		@nullable android.hardware.audio.core.MicrophoneInfo.Coordinate orientation;
		const int GROUP_UNKNOWN = -1;
		const int INDEX_IN_THE_GROUP_UNKNOWN = -1;
		@Backing(type="int") @VintfStability
		enum Location {
		UNKNOWN = 0,
		MAINBODY = 1,
		MAINBODY_MOVABLE = 2,
		PERIPHERAL = 3,
		}
		@VintfStability
		parcelable Sensitivity {
		float leveldBFS;
		float maxSpldB;
		float minSpldB;
		}
		@Backing(type="int") @VintfStability
		enum Directionality {
		UNKNOWN = 0,
		OMNI = 1,
		BI_DIRECTIONAL = 2,
		CARDIOID = 3,
		HYPER_CARDIOID = 4,
		SUPER_CARDIOID = 5,
		}
		@VintfStability
		parcelable FrequencyResponsePoint {
		float frequencyHz;
		float leveldB;
		}
		@VintfStability
		parcelable Coordinate {
		float x;
		float y;
		float z;
		}
		}