Merge "audio: Add presentation and latency control to IStreamOut" (ae0e88ca) · Commits · e / os / android_hardware_interfaces

audio/aidl/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,7 @@ aidl_interface {
		"android/hardware/audio/core/IStreamCommon.aidl",
		"android/hardware/audio/core/IStreamIn.aidl",
		"android/hardware/audio/core/IStreamOut.aidl",
		"android/hardware/audio/core/IStreamOutEventCallback.aidl",
		"android/hardware/audio/core/ITelephony.aidl",
		"android/hardware/audio/core/MicrophoneDynamicInfo.aidl",
		"android/hardware/audio/core/MicrophoneInfo.aidl",

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ interface IModule {
		android.hardware.audio.core.AudioRoute[] getAudioRoutesForAudioPort(int portId);
		android.hardware.audio.core.IModule.OpenInputStreamReturn openInputStream(in android.hardware.audio.core.IModule.OpenInputStreamArguments args);
		android.hardware.audio.core.IModule.OpenOutputStreamReturn openOutputStream(in android.hardware.audio.core.IModule.OpenOutputStreamArguments args);
		android.hardware.audio.core.IModule.SupportedPlaybackRateFactors getSupportedPlaybackRateFactors();
		android.hardware.audio.core.AudioPatch setAudioPatch(in android.hardware.audio.core.AudioPatch requested);
		boolean setAudioPortConfig(in android.media.audio.common.AudioPortConfig requested, out android.media.audio.common.AudioPortConfig suggested);
		void resetAudioPatch(int patchId);
		@@ -84,12 +85,20 @@ interface IModule {
		@nullable android.media.audio.common.AudioOffloadInfo offloadInfo;
		long bufferSizeFrames;
		@nullable android.hardware.audio.core.IStreamCallback callback;
		@nullable android.hardware.audio.core.IStreamOutEventCallback eventCallback;
		}
		@VintfStability
		parcelable OpenOutputStreamReturn {
		android.hardware.audio.core.IStreamOut stream;
		android.hardware.audio.core.StreamDescriptor desc;
		}
		@VintfStability
		parcelable SupportedPlaybackRateFactors {
		float minSpeed;
		float maxSpeed;
		float minPitch;
		float maxPitch;
		}
		@Backing(type="int") @VintfStability
		enum ScreenRotation {
		DEG_0 = 0,

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,16 @@ interface IStreamOut {
		void updateMetadata(in android.hardware.audio.common.SourceMetadata sourceMetadata);
		float[] getHwVolume();
		void setHwVolume(in float[] channelVolumes);
		float getAudioDescriptionMixLevel();
		void setAudioDescriptionMixLevel(float leveldB);
		android.media.audio.common.AudioDualMonoMode getDualMonoMode();
		void setDualMonoMode(android.media.audio.common.AudioDualMonoMode mode);
		android.media.audio.common.AudioLatencyMode[] getRecommendedLatencyModes();
		void setLatencyMode(android.media.audio.common.AudioLatencyMode mode);
		android.media.audio.common.AudioPlaybackRate getPlaybackRateParameters();
		void setPlaybackRateParameters(in android.media.audio.common.AudioPlaybackRate playbackRate);
		void selectPresentation(int presentationId, int programId);
		const int HW_VOLUME_MIN = 0;
		const int HW_VOLUME_MAX = 1;
		const int AUDIO_DESCRIPTION_MIX_LEVEL_MAX = 48;
		}

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

0 → 100644

+39 −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;
		@VintfStability
		interface IStreamOutEventCallback {
		oneway void onCodecFormatChanged(in byte[] audioMetadata);
		oneway void onRecommendedLatencyModeChanged(in android.media.audio.common.AudioLatencyMode[] modes);
		}

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

+31 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.hardware.audio.core.ISoundDose;
		import android.hardware.audio.core.IStreamCallback;
		import android.hardware.audio.core.IStreamIn;
		import android.hardware.audio.core.IStreamOut;
		import android.hardware.audio.core.IStreamOutEventCallback;
		import android.hardware.audio.core.ITelephony;
		import android.hardware.audio.core.MicrophoneInfo;
		import android.hardware.audio.core.ModuleDebug;
		@@ -34,6 +35,7 @@ import android.hardware.audio.effect.IEffect;
		import android.media.audio.common.AudioOffloadInfo;
		import android.media.audio.common.AudioPort;
		import android.media.audio.common.AudioPortConfig;
		import android.media.audio.common.Float;

		/**
		* Each instance of IModule corresponds to a separate audio module. The system
		@@ -389,6 +391,8 @@ interface IModule {
		long bufferSizeFrames;
		/** Client callback interface for the non-blocking output mode. */
		@nullable IStreamCallback callback;
		/** Optional callback to notify client about stream events. */
		@nullable IStreamOutEventCallback eventCallback;
		}
		@VintfStability
		parcelable OpenOutputStreamReturn {
		@@ -397,6 +401,33 @@ interface IModule {
		}
		OpenOutputStreamReturn openOutputStream(in OpenOutputStreamArguments args);

		/**
		* Get supported ranges of playback rate factors.
		*
		* See 'PlaybackRate' for the information on the playback rate parameters.
		* This method provides supported ranges (inclusive) for the speed factor
		* and the pitch factor.
		*
		* If the HAL module supports setting the playback rate, it is recommended
		* to support speed and pitch factor values at least in the range from 0.5f
		* to 2.0f.
		*
		* @throws EX_UNSUPPORTED_OPERATION If setting of playback rate parameters
		* is not supported by the module.
		*/
		@VintfStability
		parcelable SupportedPlaybackRateFactors {
		/** The minimum allowed speed factor. */
		float minSpeed;
		/** The maximum allowed speed factor. */
		float maxSpeed;
		/** The minimum allowed pitch factor. */
		float minPitch;
		/** The maximum allowed pitch factor. */
		float maxPitch;
		}
		SupportedPlaybackRateFactors getSupportedPlaybackRateFactors();

		/**
		* Set an audio patch.
		*