Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd32def4 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Spatializer: head tracking optimization am: 780be4ad 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15844648

Change-Id: I92d4c7ea699e8078fdeadf00f404750522457f9a
parents 9d02ae8e 780be4ad

services/audiopolicy/service/Spatializer.cpp

+33 −11
Original line number Diff line number Diff line
@@ -391,6 +391,9 @@ Status Spatializer::getActualHeadTrackingMode(SpatializerHeadTrackingMode *mode) 
}



Status Spatializer::recenterHeadTracker() {

    if (!mSupportsHeadTracking) {

        return binderStatusFromStatusT(INVALID_OPERATION);

    }

    std::lock_guard lock(mLock);

    if (mPoseController != nullptr) {

        mPoseController->recenter();
@@ -400,6 +403,9 @@ Status Spatializer::recenterHeadTracker() { 


Status Spatializer::setGlobalTransform(const std::vector<float>& screenToStage) {

    ALOGV("%s", __func__);

    if (!mSupportsHeadTracking) {

        return binderStatusFromStatusT(INVALID_OPERATION);

    }

    std::optional<Pose3f> maybePose = Pose3f::fromVector(screenToStage);

    if (!maybePose.has_value()) {

        ALOGW("Invalid screenToStage vector.");
@@ -437,6 +443,9 @@ Status Spatializer::release() { 


Status Spatializer::setHeadSensor(int sensorHandle) {

    ALOGV("%s sensorHandle %d", __func__, sensorHandle);

    if (!mSupportsHeadTracking) {

        return binderStatusFromStatusT(INVALID_OPERATION);

    }

    std::lock_guard lock(mLock);

    if (sensorHandle == ASENSOR_INVALID) {

        mHeadSensor = nullptr;
@@ -451,6 +460,9 @@ Status Spatializer::setHeadSensor(int sensorHandle) { 


Status Spatializer::setScreenSensor(int sensorHandle) {

    ALOGV("%s sensorHandle %d", __func__, sensorHandle);

    if (!mSupportsHeadTracking) {

        return binderStatusFromStatusT(INVALID_OPERATION);

    }

    std::lock_guard lock(mLock);

    if (sensorHandle == ASENSOR_INVALID) {

        mScreenSensor = nullptr;
@@ -465,6 +477,9 @@ Status Spatializer::setScreenSensor(int sensorHandle) { 


Status Spatializer::setDisplayOrientation(float physicalToLogicalAngle) {

    ALOGV("%s physicalToLogicalAngle %f", __func__, physicalToLogicalAngle);

    if (!mSupportsHeadTracking) {

        return binderStatusFromStatusT(INVALID_OPERATION);

    }

    std::lock_guard lock(mLock);

    mDisplayOrientation = physicalToLogicalAngle;

    if (mPoseController != nullptr) {
@@ -494,6 +509,9 @@ Status Spatializer::getSupportedModes(std::vector<SpatializationMode> *modes) { 
// SpatializerPoseController::Listener

void Spatializer::onHeadToStagePose(const Pose3f& headToStage) {

    ALOGV("%s", __func__);

    LOG_ALWAYS_FATAL_IF(!mSupportsHeadTracking,

            "onHeadToStagePose() called with no head tracking support!");



    auto vec = headToStage.toVector();

    LOG_ALWAYS_FATAL_IF(vec.size() != sHeadPoseKeys.size(),

            "%s invalid head to stage vector size %zu", __func__, vec.size());
@@ -610,6 +628,7 @@ status_t Spatializer::attachOutput(audio_io_handle_t output) { 
        mEngine->setEnabled(true);

        mOutput = output;



        if (mSupportsHeadTracking) {

            mPoseController = std::make_shared<SpatializerPoseController>(

                    static_cast<SpatializerPoseController::Listener*>(this), 10ms, 50ms);

            LOG_ALWAYS_FATAL_IF(mPoseController == nullptr,
@@ -621,7 +640,10 @@ status_t Spatializer::attachOutput(audio_io_handle_t output) { 
            mPoseController->setDisplayOrientation(mDisplayOrientation);

            poseController = mPoseController;

        }

    }

    if (poseController != nullptr) {

        poseController->waitUntilCalculated();

    }

    return NO_ERROR;

}