commit a16a9df3e30fd753641f57f51dd8a19b61dea12e
author Ytai Ben-Tsvi <ytai@google.com> Thu Aug 05 08:57:06 2021 -0700
committer Ytai Ben-Tsvi <ytai@google.com> Mon Aug 23 10:00:53 2021 -0700
tree 6fc23bb23b3052185234aca3fb9c1876b5ab5275
parent b2a87e5dc0bbd496df3addccf4ccd913f132c920

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

services/audiopolicy/service/Spatializer.cpp

diff --git a/services/audiopolicy/service/Spatializer.cpp b/services/audiopolicy/service/Spatializer.cpp
index 345665c..aa104a0 100644
--- a/services/audiopolicy/service/Spatializer.cpp
+++ b/services/audiopolicy/service/Spatializer.cpp
@@ -40,8 +40,8 @@
 using aidl_utils::binderStatusFromStatusT;
 using android::content::AttributionSourceState;
 using binder::Status;
-using media::HeadTrackingMode;
 using media::SpatializationLevel;
+using media::SpatializerHeadTrackingMode;
 
 #define VALUE_OR_RETURN_BINDER_STATUS(x) \
     ({ auto _tmp = (x); \
@@ -177,7 +177,7 @@
 }
 
 Status Spatializer::getSupportedHeadTrackingModes(
-        std::vector<media::HeadTrackingMode>* modes) {
+        std::vector<media::SpatializerHeadTrackingMode>* modes) {
     ALOGV("%s", __func__);
     if (modes == nullptr) {
         return binderStatusFromStatusT(BAD_VALUE);
@@ -186,14 +186,14 @@
     // - The engine capabilities
     // - If a head tracking sensor is registered and linked to a connected audio device
     // - if we have indications on the screen orientation
-    modes->push_back(HeadTrackingMode::RELATIVE_WORLD);
+    modes->push_back(SpatializerHeadTrackingMode::RELATIVE_WORLD);
     return Status::ok();
 }
 
-Status Spatializer::setDesiredHeadTrackingMode(media::HeadTrackingMode mode) {
+Status Spatializer::setDesiredHeadTrackingMode(media::SpatializerHeadTrackingMode mode) {
     ALOGV("%s level %d", __func__, (int)mode);
-    if (mode != HeadTrackingMode::DISABLED
-            && mode != HeadTrackingMode::RELATIVE_WORLD) {
+    if (mode != SpatializerHeadTrackingMode::DISABLED
+            && mode != SpatializerHeadTrackingMode::RELATIVE_WORLD) {
         return binderStatusFromStatusT(BAD_VALUE);
     }
     {
@@ -203,7 +203,7 @@
     return Status::ok();
 }
 
-Status Spatializer::getActualHeadTrackingMode(media::HeadTrackingMode *mode) {
+Status Spatializer::getActualHeadTrackingMode(media::SpatializerHeadTrackingMode *mode) {
     if (mode == nullptr) {
         return binderStatusFromStatusT(BAD_VALUE);
     }
@@ -213,7 +213,7 @@
     return Status::ok();
 }
 
-Status Spatializer::recenterHeadtracker() {
+Status Spatializer::recenterHeadTracker() {
     return Status::ok();
 }
 
@@ -259,10 +259,9 @@
     // create FX instance on output
     AttributionSourceState attributionSource = AttributionSourceState();
     mEngine = new AudioEffect(attributionSource);
-    mEngine->set(nullptr, &mEngineDescriptor.uuid, 0,
-                 Spatializer::engineCallback /* cbf */, this /* user */,
-                 AUDIO_SESSION_OUTPUT_STAGE, output,
-                 {} /* device */, false /* probe */, true /* notifyFramesProcessed */);
+    mEngine->set(nullptr, &mEngineDescriptor.uuid, 0, Spatializer::engineCallback /* cbf */,
+                 this /* user */, AUDIO_SESSION_OUTPUT_STAGE, output, {} /* device */,
+                 false /* probe */, true /* notifyFramesProcessed */);
     status_t status = mEngine->initCheck();
     ALOGV("%s mEngine create status %d", __func__, (int)status);
     if (status != NO_ERROR) {

services/audiopolicy/service/Spatializer.h

diff --git a/services/audiopolicy/service/Spatializer.h b/services/audiopolicy/service/Spatializer.h
index f0ab605..768170a 100644
--- a/services/audiopolicy/service/Spatializer.h
+++ b/services/audiopolicy/service/Spatializer.h
@@ -19,7 +19,7 @@
 
 #include <android/media/BnEffect.h>
 #include <android/media/BnSpatializer.h>
-#include <android/media/HeadTrackingMode.h>
+#include <android/media/SpatializerHeadTrackingMode.h>
 #include <android/media/SpatializationLevel.h>
 
 #include <media/AudioEffect.h>
@@ -93,10 +93,12 @@
     binder::Status setLevel(media::SpatializationLevel level) override;
     binder::Status getLevel(media::SpatializationLevel *level) override;
     binder::Status getSupportedHeadTrackingModes(
-            std::vector<media::HeadTrackingMode>* modes) override;
-    binder::Status setDesiredHeadTrackingMode(media::HeadTrackingMode mode) override;
-    binder::Status getActualHeadTrackingMode(media::HeadTrackingMode *mode) override;
-    binder::Status recenterHeadtracker() override;
+            std::vector<media::SpatializerHeadTrackingMode>* modes) override;
+    binder::Status setDesiredHeadTrackingMode(
+            media::SpatializerHeadTrackingMode mode) override;
+    binder::Status getActualHeadTrackingMode(
+            media::SpatializerHeadTrackingMode* mode) override;
+    binder::Status recenterHeadTracker() override;
     binder::Status setGlobalTransform(const std::vector<float>& screenToStage) override;
 
     /** IBinder::DeathRecipient. Listen to the death of the INativeSpatializerCallback. */
@@ -190,8 +192,8 @@
     /** Requested spatialization level */
     media::SpatializationLevel mLevel GUARDED_BY(mLock) = media::SpatializationLevel::NONE;
     /** Requested head tracking mode */
-    media::HeadTrackingMode mHeadTrackingMode GUARDED_BY(mLock)
-            = media::HeadTrackingMode::DISABLED;
+    media::SpatializerHeadTrackingMode mHeadTrackingMode GUARDED_BY(mLock)
+            = media::SpatializerHeadTrackingMode::DISABLED;
     /** Configured screen to stage transform */
     std::vector<float> mScreenToStageTransform GUARDED_BY(mLock);