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

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

Merge "AudioPolicyService: add check when creating the spatializer" into... 

Merge "AudioPolicyService: add check when creating the spatializer" into sc-v2-dev am: f6fc53ad am: 1c47cc60

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

Change-Id: I97db027deae95920d0e79978264416858b4bf891
parents 485c0cf5 1c47cc60

services/audiopolicy/service/AudioPolicyService.cpp

+9 −5
Original line number Diff line number Diff line
@@ -142,12 +142,15 @@ void AudioPolicyService::onFirstRef() 
    sensorPrivacyPolicy->registerSelf();



    // Create spatializer if supported

    if (mAudioPolicyManager != nullptr) {

        Mutex::Autolock _l(mLock);

        const audio_attributes_t attr = attributes_initializer(AUDIO_USAGE_MEDIA);

        AudioDeviceTypeAddrVector devices;

        bool hasSpatializer = mAudioPolicyManager->canBeSpatialized(&attr, nullptr, devices);

        if (hasSpatializer) {

            mSpatializer = Spatializer::create(this);

        }

    }

    AudioSystem::audioPolicyReady();

}
@@ -381,6 +384,7 @@ void AudioPolicyService::doOnCheckSpatializer() 
    Mutex::Autolock _l(mLock);



    if (mSpatializer != nullptr) {

        // Note: mSpatializer != nullptr =>  mAudioPolicyManager != nullptr

        if (mSpatializer->getLevel() != media::SpatializationLevel::NONE) {

            audio_io_handle_t currentOutput = mSpatializer->getOutput();

            audio_io_handle_t newOutput;