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

Commit dae53216 authored by Andy Hung's avatar Andy Hung
Browse files

Spatializer: Workaround for Head Tracking on BT AAC 

As the BT HAL doesn't report low latency reliably,
it is not required to enable Head Tracking.

Nevertheless we always request low latency for
head tracking if the HAL supports it.

Test: Head Tracking works over AAC HT Buds
Bug: 253297301
Change-Id: I6e372603a9f69c7bd9eb0434d18208f61fd9b78d
parent 25c68079

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);

    }

}