Merge "AudioFlinger: remove global effect enablement timeout" into main (6fb00c78) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+0 −11

Original line number	Diff line number	Diff line
		@@ -98,10 +98,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.
		@@ -4842,11 +4838,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());
		@@ -4862,8 +4853,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) {

+0 −3

Original line number	Diff line number	Diff line
		@@ -760,9 +760,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 =