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

Commit 53d6d49e authored by Eric Laurent's avatar Eric Laurent
Browse files

audio: remove flag com.android.media.audio.dsa_over_bt_le_audio 

Bug: 409606418
Bug: 307588546
Flag: EXEMPT flag removal
Test: make
Change-Id: Ia89f5880f6b89386ab38a75bb8b1cc52e5dddc9c
parent ac4517fe

media/audio/aconfig/audio.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -77,14 +77,6 @@ flag { 
    bug: "302553525"

}



flag {

    name: "dsa_over_bt_le_audio"

    namespace: "media_audio"

    description:

        "Enable dynamic spatial audio over Bluetooth LE Audio."

    bug: "307588546"

}



flag {

    name: "equal_sco_lea_vc_index_range"

    namespace: "media_audio"

services/audiopolicy/service/Spatializer.cpp

+21 −42
Original line number Diff line number Diff line
@@ -225,9 +225,6 @@ const std::map<std::string, audio_latency_mode_t> Spatializer::sStringToLatencyM 
};



void Spatializer::loadOrderedLowLatencyModes() {

    if (!com::android::media::audio::dsa_over_bt_le_audio()) {

        return;

    }

    auto latencyModesStrs = android::sysprop::BluetoothProperties::dsa_transport_preference();

    audio_utils::lock_guard lock(mMutex);

    // First load preferred low latency modes ordered from the property
@@ -438,8 +435,6 @@ status_t Spatializer::loadEngineConfiguration(sp<EffectHalInterface> effect) { 
        }

    }



    if (com::android::media::audio::dsa_over_bt_le_audio()

            && mSupportsHeadTracking) {

    mHeadtrackingConnectionMode = HeadTracking::ConnectionMode::FRAMEWORK_PROCESSED;

    std::vector<HeadTracking::ConnectionMode> headtrackingConnectionModes;

    status = getHalParameter<true>(effect, SPATIALIZER_PARAM_SUPPORTED_HEADTRACKING_CONNECTION,
@@ -459,7 +454,6 @@ status_t Spatializer::loadEngineConfiguration(sp<EffectHalInterface> effect) { 
                    mSupportedHeadtrackingConnectionModes.end(),

                "%s: Headtracking FRAMEWORK_PROCESSED not reported", __func__);

    }

    }



    // Currently we expose only RELATIVE_WORLD.

    // This is a limitation of the head tracking library based on a UX choice.
@@ -944,9 +938,6 @@ void Spatializer::onActualModeChangeMsg(HeadTrackingMode mode) { 
}



void Spatializer::setEngineHeadtrackingConnectionMode_l() {

    if (!com::android::media::audio::dsa_over_bt_le_audio()) {

        return;

    }

    if (mActualHeadTrackingMode != HeadTracking::Mode::DISABLED

            && !mSupportedHeadtrackingConnectionModes.empty()) {

        setEffectParameter_l(SPATIALIZER_PARAM_HEADTRACKING_CONNECTION,
@@ -956,9 +947,6 @@ void Spatializer::setEngineHeadtrackingConnectionMode_l() { 
}



void Spatializer::sortSupportedLatencyModes_l() {

    if (!com::android::media::audio::dsa_over_bt_le_audio()) {

        return;

    }

    std::sort(mSupportedLatencyModes.begin(), mSupportedLatencyModes.end(),

            [this](audio_latency_mode_t x, audio_latency_mode_t y) {

                auto itX = std::find(mOrderedLowLatencyModes.begin(),
@@ -1099,9 +1087,6 @@ void Spatializer::updateActiveTracks( 
}



audio_latency_mode_t Spatializer::selectHeadtrackingConnectionMode_l() {

    if (!com::android::media::audio::dsa_over_bt_le_audio()) {

        return AUDIO_LATENCY_MODE_LOW;

    }

    // mSupportedLatencyModes is ordered according to system preferences loaded in

    // mOrderedLowLatencyModes

    mHeadtrackingConnectionMode = HeadTracking::ConnectionMode::FRAMEWORK_PROCESSED;
@@ -1136,17 +1121,11 @@ audio_latency_mode_t Spatializer::selectHeadtrackingConnectionMode_l() { 
void Spatializer::checkSensorsState_l() {

    mRequestedLatencyMode = AUDIO_LATENCY_MODE_FREE;

    const bool supportsSetLatencyMode = !mSupportedLatencyModes.empty();

    bool supportsLowLatencyMode;

    if (com::android::media::audio::dsa_over_bt_le_audio()) {



    // mSupportedLatencyModes is ordered with MODE_FREE always at the end:

    // the first entry is never MODE_FREE if at least one low ltency mode is supported.

        supportsLowLatencyMode = supportsSetLatencyMode

    bool supportsLowLatencyMode = supportsSetLatencyMode

            && mSupportedLatencyModes[0] != AUDIO_LATENCY_MODE_FREE;

    } else {

        supportsLowLatencyMode = supportsSetLatencyMode && std::find(

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

            AUDIO_LATENCY_MODE_LOW) != mSupportedLatencyModes.end();

    }

    if (mSupportsHeadTracking) {

        if (mPoseController != nullptr) {

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

services/audiopolicy/tests/spatializer_tests.cpp

+0 −6
Original line number Diff line number Diff line
@@ -160,9 +160,6 @@ TEST_F(SpatializerTest, SupportedBleLatencyTest) { 
    if (!setpUpForHeadtracking()) {

        GTEST_SKIP() << "Skipping SupportedBleLatencyTest: head tracking not supported";

    }

    if (!com::android::media::audio::dsa_over_bt_le_audio()) {

        GTEST_SKIP() << "Skipping SupportedBleLatencyTest: DSA over LE not enabled";

    }

    std::vector<audio_latency_mode_t> latencies = sBLELatencyModes;

    mSpatializer->onSupportedLatencyModesChangedMsg(sTestOutput, std::move(latencies));
@@ -220,9 +217,6 @@ TEST_F(SpatializerTest, RequestedBleLatencyTest) { 
    if (!setpUpForHeadtracking()) {

        GTEST_SKIP() << "Skipping RequestedBleLatencyTest: head tracking not supported";

    }

    if (!com::android::media::audio::dsa_over_bt_le_audio()) {

        GTEST_SKIP() << "Skipping RequestedBleLatencyTest: DSA over LE not enabled";

    }



    mSpatializer->onSupportedLatencyModesChangedMsg(sTestOutput,

            { AUDIO_LATENCY_MODE_DYNAMIC_SPATIAL_AUDIO_SOFTWARE,