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

Commit ec779b8e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30750708'] into 25Q1-release. 

Change-Id: I5764307ec6bd3dc1d25057c1765e2be7e4aa72dd
parents 243a3a62 99c85e8a

services/audiopolicy/service/Spatializer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -418,11 +418,13 @@ status_t Spatializer::loadEngineConfiguration(sp<EffectHalInterface> effect) { 
                                   &spatializedChannelMasks);

    if (status != NO_ERROR) {

        ALOGW("%s: cannot get SPATIALIZER_PARAM_SPATIALIZED_CHANNEL_MASKS", __func__);

        return status;

        // do not return an error yet as spatializer implementations may not have been

        // updated yet to support this parameter

    }

    if (spatializedChannelMasks.empty()) {

        ALOGW("%s: SPATIALIZER_PARAM_SPATIALIZED_CHANNEL_MASKS reports empty", __func__);

        return BAD_VALUE;

        // do not return an error yet as spatializer implementations may not have been

        // updated yet to support this parameter

    }

    for (const audio_channel_mask_t spatializedMask : spatializedChannelMasks) {

        // spatialized masks must be contained in the supported input masks