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

Commit f8c556c3 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: remove global effect enablement timeout" into main am: 6fb00c78 

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



Change-Id: Id1edc507706b21d0d35b3c801506d93f88bb5b3d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1332ce5 6fb00c78

services/audioflinger/AudioFlinger.cpp

+0 −11
Original line number Diff line number Diff line
@@ -109,10 +109,6 @@ static constexpr char kNoEffectsFactory[] = "Effects Factory is absent\n"; 


static constexpr char kAudioServiceName[] = "audio";



// In order to avoid invalidating offloaded tracks each time a Visualizer is turned on and off

// we define a minimum time during which a global effect is considered enabled.

static const nsecs_t kMinGlobalEffectEnabletimeNs = seconds(7200);



// Keep a strong reference to media.log service around forever.

// The service is within our parent process so it can never die in a way that we could observe.

// These two variables are const after initialization.
@@ -4969,11 +4965,6 @@ Exit: 


bool AudioFlinger::isNonOffloadableGlobalEffectEnabled_l() const

{

    if (mGlobalEffectEnableTime != 0 &&

            ((systemTime() - mGlobalEffectEnableTime) < kMinGlobalEffectEnabletimeNs)) {

        return true;

    }



    for (size_t i = 0; i < mPlaybackThreads.size(); i++) {

        const auto thread = mPlaybackThreads.valueAt(i);

        audio_utils::lock_guard l(thread->mutex());
@@ -4989,8 +4980,6 @@ void AudioFlinger::onNonOffloadableGlobalEffectEnable() 
{

    audio_utils::lock_guard _l(mutex());



    mGlobalEffectEnableTime = systemTime();



    for (size_t i = 0; i < mPlaybackThreads.size(); i++) {

        const sp<IAfPlaybackThread> t = mPlaybackThreads.valueAt(i);

        if (t->type() == IAfThreadBase::OFFLOAD) {

services/audioflinger/AudioFlinger.h

+0 −3
Original line number Diff line number Diff line
@@ -763,9 +763,6 @@ private: 
    std::atomic<size_t> mClientSharedHeapSize = kMinimumClientSharedHeapSizeBytes;

    static constexpr size_t kMinimumClientSharedHeapSizeBytes = 1024 * 1024; // 1MB



    // when a global effect was last enabled

    nsecs_t mGlobalEffectEnableTime GUARDED_BY(mutex()) = 0;



    /* const */ sp<IAfPatchPanel> mPatchPanel;



    const sp<EffectsFactoryHalInterface> mEffectsFactoryHal =