Merge "Immersive audio APIs for headtracking" into sc-v2-dev (77836487) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+24 −0

Original line number	Diff line number	Diff line
		@@ -5375,9 +5375,33 @@ package android.media {

		public class Spatializer {
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public void addCompatibleAudioDevice(@NonNull android.media.AudioDeviceAttributes);
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public void addOnHeadTrackingModeChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.Spatializer.OnHeadTrackingModeChangedListener);
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public void clearOnHeadToSoundstagePoseUpdatedListener();
		method @NonNull @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public java.util.List<android.media.AudioDeviceAttributes> getCompatibleAudioDevices();
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public int getDesiredHeadTrackingMode();
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public int getHeadTrackingMode();
		method @NonNull @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public java.util.List<java.lang.Integer> getSupportedHeadTrackingModes();
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public void recenterHeadTracker();
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public void removeCompatibleAudioDevice(@NonNull android.media.AudioDeviceAttributes);
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public void removeOnHeadTrackingModeChangedListener(@NonNull android.media.Spatializer.OnHeadTrackingModeChangedListener);
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public void setDesiredHeadTrackingMode(int);
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public void setEnabled(boolean);
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public void setGlobalTransform(@NonNull float[]);
		method @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public void setOnHeadToSoundstagePoseUpdatedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.Spatializer.OnHeadToSoundstagePoseUpdatedListener);
		field @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public static final int HEAD_TRACKING_MODE_DISABLED = -1; // 0xffffffff
		field @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public static final int HEAD_TRACKING_MODE_OTHER = 0; // 0x0
		field @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public static final int HEAD_TRACKING_MODE_RELATIVE_DEVICE = 2; // 0x2
		field @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public static final int HEAD_TRACKING_MODE_RELATIVE_WORLD = 1; // 0x1
		field @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public static final int HEAD_TRACKING_MODE_UNSUPPORTED = -2; // 0xfffffffe
		}

		public static interface Spatializer.OnHeadToSoundstagePoseUpdatedListener {
		method public void onHeadToSoundstagePoseUpdated(@NonNull android.media.Spatializer, @NonNull float[]);
		}

		public static interface Spatializer.OnHeadTrackingModeChangedListener {
		method public void onDesiredHeadTrackingModeChanged(@NonNull android.media.Spatializer, int);
		method public void onHeadTrackingModeChanged(@NonNull android.media.Spatializer, int);
		}

		}

media/java/android/media/IAudioService.aidl

+24 −2

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@ import android.media.IRecordingConfigDispatcher;
		import android.media.IRingtonePlayer;
		import android.media.IStrategyPreferredDevicesDispatcher;
		import android.media.ISpatializerCallback;
		import android.media.ISpatializerHeadTrackingModeCallback;
		import android.media.ISpatializerHeadToSoundStagePoseCallback;
		import android.media.IVolumeController;
		import android.media.IVolumeController;
		import android.media.PlayerBase;
		@@ -405,13 +407,33 @@ interface IAudioService {

		boolean canBeSpatialized(in AudioAttributes aa, in AudioFormat af);

		void registerSpatializerCallback(in ISpatializerCallback callback);
		void registerSpatializerCallback(in ISpatializerCallback cb);

		void unregisterSpatializerCallback(in ISpatializerCallback callback);
		void unregisterSpatializerCallback(in ISpatializerCallback cb);

		void registerSpatializerHeadTrackingCallback(in ISpatializerHeadTrackingModeCallback cb);

		void unregisterSpatializerHeadTrackingCallback(in ISpatializerHeadTrackingModeCallback cb);

		void registerHeadToSoundstagePoseCallback(in ISpatializerHeadToSoundStagePoseCallback cb);

		void unregisterHeadToSoundstagePoseCallback(in ISpatializerHeadToSoundStagePoseCallback cb);

		List<AudioDeviceAttributes> getSpatializerCompatibleAudioDevices();

		void addSpatializerCompatibleAudioDevice(in AudioDeviceAttributes ada);

		void removeSpatializerCompatibleAudioDevice(in AudioDeviceAttributes ada);

		void setDesiredHeadTrackingMode(int mode);

		int getDesiredHeadTrackingMode();

		int[] getSupportedHeadTrackingModes();

		int getActualHeadTrackingMode();

		oneway void setSpatializerGlobalTransform(in float[] transform);

		oneway void recenterHeadTracker();
		}

media/java/android/media/ISpatializerHeadToSoundStagePoseCallback.aidl

0 → 100644

+31 −0

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

		/**
		* AIDL for the AudioService to signal Spatializer state changes.
		*
		* {@hide}
		*/
		oneway interface ISpatializerHeadToSoundStagePoseCallback {

		/**
		* The pose is sent as an array of 6 float values, the first 3 are the translation vector, the
		* other 3 are the rotation vector.
		*/
		void dispatchPoseChanged(in float[] pose);
		}

media/java/android/media/ISpatializerHeadTrackingModeCallback.aidl

0 → 100644

+29 −0

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

		/**
		* AIDL for the AudioService to signal Spatializer head tracking mode changes.
		*
		* {@hide}
		*/
		oneway interface ISpatializerHeadTrackingModeCallback {

		void dispatchSpatializerActualHeadTrackingModeChanged(int mode);

		void dispatchSpatializerDesiredHeadTrackingModeChanged(int mode);
		}

media/java/android/media/Spatializer.java

+507 −13

File changed.

Preview size limit exceeded, changes collapsed.