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

Commit cdc7cfb9 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge changes I6e372603,I3c8fee7c am: 1e2bd24f 

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



Change-Id: Ia74a46c2b2a4a9c5fca3ac2519b3e4f4d83c6ae8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 512daf78 1e2bd24f

services/audiopolicy/service/Spatializer.cpp

+9 −6
Original line number Diff line number Diff line
@@ -935,12 +935,15 @@ void Spatializer::updateActiveTracks(size_t numActiveTracks) { 


void Spatializer::checkSensorsState_l() {

    audio_latency_mode_t requestedLatencyMode = AUDIO_LATENCY_MODE_FREE;

    bool lowLatencySupported = mSupportedLatencyModes.empty()

            || (std::find(mSupportedLatencyModes.begin(), mSupportedLatencyModes.end(),

                    AUDIO_LATENCY_MODE_LOW) != mSupportedLatencyModes.end());

    const bool supportsSetLatencyMode = !mSupportedLatencyModes.empty();

    const bool supportsLowLatencyMode = supportsSetLatencyMode && std::find(

            mSupportedLatencyModes.begin(), mSupportedLatencyModes.end(),

            AUDIO_LATENCY_MODE_LOW) != mSupportedLatencyModes.end();

    if (mSupportsHeadTracking) {

        if (mPoseController != nullptr) {

            if (lowLatencySupported && mNumActiveTracks > 0 && mLevel != SpatializationLevel::NONE

            // TODO(b/253297301, b/255433067) reenable low latency condition check

            // for Head Tracking after Bluetooth HAL supports it correctly.

            if (mNumActiveTracks > 0 && mLevel != SpatializationLevel::NONE

                && mDesiredHeadTrackingMode != HeadTrackingMode::STATIC

                && mHeadSensor != SpatializerPoseController::INVALID_SENSOR) {

                if (mEngine != nullptr) {
@@ -949,7 +952,7 @@ void Spatializer::checkSensorsState_l() { 
                }

                mPoseController->setHeadSensor(mHeadSensor);

                mPoseController->setScreenSensor(mScreenSensor);

                requestedLatencyMode = AUDIO_LATENCY_MODE_LOW;

                if (supportsLowLatencyMode) requestedLatencyMode = AUDIO_LATENCY_MODE_LOW;

            } else {

                mPoseController->setHeadSensor(SpatializerPoseController::INVALID_SENSOR);

                mPoseController->setScreenSensor(SpatializerPoseController::INVALID_SENSOR);
@@ -959,7 +962,7 @@ void Spatializer::checkSensorsState_l() { 
            resetEngineHeadPose_l();

        }

    }

    if (mOutput != AUDIO_IO_HANDLE_NONE) {

    if (mOutput != AUDIO_IO_HANDLE_NONE && supportsSetLatencyMode) {

        AudioSystem::setRequestedLatencyMode(mOutput, requestedLatencyMode);

    }

}