Spatializer dumpsys: Add mode selector and pose rate limiter in dumpsys
Bug: 233092747
Test: m and "adb shell dumpsys media.audio_policy"
Merged-In: I7ec026ed0e5005cd9f56f3a16d37cc547e1dcc99
Change-Id: I7ec026ed0e5005cd9f56f3a16d37cc547e1dcc99
(cherry picked from commit 56e43f09911b4f8b144f5d3e358f93978b6f5365)
diff --git a/services/audiopolicy/service/Spatializer.cpp b/services/audiopolicy/service/Spatializer.cpp
index 3172256..ec8d6e6 100644
--- a/services/audiopolicy/service/Spatializer.cpp
+++ b/services/audiopolicy/service/Spatializer.cpp
@@ -718,11 +718,9 @@
}
void Spatializer::onActualModeChange(HeadTrackingMode mode) {
- std::string modeStr = SpatializerPoseController::toString(mode);
+ std::string modeStr = media::toString(mode);
ALOGV("%s(%s)", __func__, modeStr.c_str());
- mLocalLog.log("%s with %s", __func__, modeStr.c_str());
- sp<AMessage> msg =
- new AMessage(EngineCallbackHandler::kWhatOnActualModeChange, mHandler);
+ sp<AMessage> msg = new AMessage(EngineCallbackHandler::kWhatOnActualModeChange, mHandler);
msg->setInt32(EngineCallbackHandler::kModeKey, static_cast<int>(mode));
msg->post();
}
@@ -756,8 +754,7 @@
std::vector<SpatializerHeadTrackingMode>{spatializerMode});
}
callback = mHeadTrackingCallback;
- mLocalLog.log("%s: %s, spatializerMode %s", __func__,
- SpatializerPoseController::toString(mode).c_str(),
+ mLocalLog.log("%s: %s, spatializerMode %s", __func__, media::toString(mode).c_str(),
media::toString(spatializerMode).c_str());
}
if (callback != nullptr) {
@@ -983,7 +980,7 @@
base::StringAppendF(&ss, " %s", media::toString(mode).c_str());
}
base::StringAppendF(&ss, "], Desired: %s, Actual %s\n",
- SpatializerPoseController::toString(mDesiredHeadTrackingMode).c_str(),
+ media::toString(mDesiredHeadTrackingMode).c_str(),
media::toString(mActualHeadTrackingMode).c_str());
base::StringAppendF(&ss, "%smSpatializationModes: [", prefixSpace.c_str());
@@ -1018,9 +1015,9 @@
ss.append(prefixSpace +
"Sensor data format - [rx, ry, rz, vx, vy, vz] (units-degree, "
"r-transform, v-angular velocity, x-pitch, y-roll, z-yaw):\n");
- ss.append(prefixSpace + "PerMinuteHistory:\n");
+ ss.append(prefixSpace + " PerMinuteHistory:\n");
ss += mPoseDurableRecorder.toString(level + 1);
- ss.append(prefixSpace + "PerSecondHistory:\n");
+ ss.append(prefixSpace + " PerSecondHistory:\n");
ss += mPoseRecorder.toString(level + 1);
} else {
ss.append(prefixSpace).append("SpatializerPoseController not exist\n");
diff --git a/services/audiopolicy/service/SpatializerPoseController.cpp b/services/audiopolicy/service/SpatializerPoseController.cpp
index e7f4750..5e9a0e1 100644
--- a/services/audiopolicy/service/SpatializerPoseController.cpp
+++ b/services/audiopolicy/service/SpatializerPoseController.cpp
@@ -312,14 +312,14 @@
}
ss += prefixSpace;
- if (mHeadSensor == media::SensorPoseProvider::INVALID_HANDLE) {
- ss.append("HeadSensor: INVALID\n");
+ if (mHeadSensor == INVALID_SENSOR) {
+ ss += "HeadSensor: INVALID\n";
} else {
base::StringAppendF(&ss, "HeadSensor: 0x%08x\n", mHeadSensor);
}
ss += prefixSpace;
- if (mScreenSensor == media::SensorPoseProvider::INVALID_HANDLE) {
+ if (mScreenSensor == INVALID_SENSOR) {
ss += "ScreenSensor: INVALID\n";
} else {
base::StringAppendF(&ss, "ScreenSensor: 0x%08x\n", mScreenSensor);
@@ -327,7 +327,7 @@
ss += prefixSpace;
if (mActualMode.has_value()) {
- base::StringAppendF(&ss, "ActualMode: %s", toString(mActualMode.value()).c_str());
+ base::StringAppendF(&ss, "ActualMode: %s\n", media::toString(mActualMode.value()).c_str());
} else {
ss += "ActualMode NOTEXIST\n";
}
diff --git a/services/audiopolicy/service/SpatializerPoseController.h b/services/audiopolicy/service/SpatializerPoseController.h
index 546eba0..233f94c 100644
--- a/services/audiopolicy/service/SpatializerPoseController.h
+++ b/services/audiopolicy/service/SpatializerPoseController.h
@@ -116,18 +116,6 @@
// convert fields to a printable string
std::string toString(unsigned level) const;
- static std::string toString(media::HeadTrackingMode mode) {
- switch (mode) {
- case media::HeadTrackingMode::STATIC:
- return "STATIC";
- case media::HeadTrackingMode::WORLD_RELATIVE:
- return "WORLD_RELATIVE";
- case media::HeadTrackingMode::SCREEN_RELATIVE:
- return "SCREEN_RELATIVE";
- }
- return "EnumNotImplemented";
- };
-
private:
mutable std::timed_mutex mMutex;
Listener* const mListener;