Some syntactic cleanup
Mostly, this change renames HeadTrackingMode to
SpatializerHeadTrackingMode in order to avoid name collision with the
HeadTrackingMode type from libheadtracking.
Other nits are included.
Test: m -j
Bug: 188502620
Change-Id: I7f4188c1f401a98044f28c68d9613267d5baa808
diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index 4ab9b28..9d90b50 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -388,9 +388,9 @@
"aidl/android/media/AudioProductStrategy.aidl",
"aidl/android/media/AudioVolumeGroup.aidl",
"aidl/android/media/DeviceRole.aidl",
- "aidl/android/media/HeadTrackingMode.aidl",
"aidl/android/media/SoundTriggerSession.aidl",
"aidl/android/media/SpatializationLevel.aidl",
+ "aidl/android/media/SpatializerHeadTrackingMode.aidl",
],
imports: [
"audio_common-aidl",
diff --git a/media/libaudioclient/aidl/android/media/ISpatializer.aidl b/media/libaudioclient/aidl/android/media/ISpatializer.aidl
index 212d8fe..3c2eda6 100644
--- a/media/libaudioclient/aidl/android/media/ISpatializer.aidl
+++ b/media/libaudioclient/aidl/android/media/ISpatializer.aidl
@@ -16,8 +16,8 @@
package android.media;
-import android.media.HeadTrackingMode;
import android.media.SpatializationLevel;
+import android.media.SpatializerHeadTrackingMode;
/**
* The ISpatializer interface is used to control the native audio service implementation
@@ -47,22 +47,23 @@
/** Gets the selected spatialization level (see SpatializationLevel.aidl) */
SpatializationLevel getLevel();
- /** Reports the list of supported head tracking modes (see HeadTrackingMode.aidl). The list can
- * be empty if the spatializer implementation does not support head tracking or if no
- * head tracking device is connected.
+ /** Reports the list of supported head tracking modes (see SpatializerHeadTrackingMode.aidl).
+ * The list can be empty if the spatializer implementation does not support head tracking or if
+ * no head tracking device is connected.
*/
- HeadTrackingMode[] getSupportedHeadTrackingModes();
+ SpatializerHeadTrackingMode[] getSupportedHeadTrackingModes();
- /** Selects the desired head tracking mode (see HeadTrackingMode.aidl) */
- void setDesiredHeadTrackingMode(HeadTrackingMode mode);
+ /** Selects the desired head tracking mode (see SpatializerHeadTrackingMode.aidl) */
+ void setDesiredHeadTrackingMode(SpatializerHeadTrackingMode mode);
/** Gets the actual head tracking mode. Can be different from the desired mode if conditions to
* enable the desired mode are not met (e.g if the head tracking device was removed)
*/
- HeadTrackingMode getActualHeadTrackingMode();
+ SpatializerHeadTrackingMode getActualHeadTrackingMode();
/** Reset the head tracking algorithm to consider current head pose as neutral */
- void recenterHeadtracker();
+ void recenterHeadTracker();
+
/** Set the screen to stage transform to use by the head tracking algorithm */
void setGlobalTransform(in float[] screenToStage);
}
diff --git a/media/libaudioclient/aidl/android/media/HeadTrackingMode.aidl b/media/libaudioclient/aidl/android/media/SpatializerHeadTrackingMode.aidl
similarity index 90%
rename from media/libaudioclient/aidl/android/media/HeadTrackingMode.aidl
rename to media/libaudioclient/aidl/android/media/SpatializerHeadTrackingMode.aidl
index d6cf410..58e0f61 100644
--- a/media/libaudioclient/aidl/android/media/HeadTrackingMode.aidl
+++ b/media/libaudioclient/aidl/android/media/SpatializerHeadTrackingMode.aidl
@@ -18,12 +18,12 @@
/**
- * The head tracking mode supported by the spatializer stage effect implementation.
+ * The head tracking mode supported by the spatializer effect implementation.
* Used by methods of the ISpatializer interface.
* {@hide}
*/
@Backing(type="byte")
-enum HeadTrackingMode {
+enum SpatializerHeadTrackingMode {
/** Head tracking is active in a mode not listed below (forward compatibility) */
OTHER = 0,
/** Head tracking is disabled */