Merge "Pull in declaration of effectChains to inner block" (fa52678f) · Commits · e / os / android_frameworks_base

services/audioflinger/AudioFlinger.cpp

+13 −2

Original line number	Diff line number	Diff line
		@@ -2012,7 +2012,6 @@ bool AudioFlinger::MixerThread::threadLoop()
		uint32_t sleepTime = idleSleepTime;

		uint32_t sleepTimeShift = 0;
		Vector< sp<EffectChain> > effectChains;
		CpuStats cpuStats;

		// DirectOutputThread has shorter standbyDelay
		@@ -2025,6 +2024,8 @@ bool AudioFlinger::MixerThread::threadLoop()

		// DirectOutputThread has rampVolume, leftVol, rightVol

		Vector< sp<EffectChain> > effectChains;

		processConfigEvents();

		mixer_state mixerStatus = MIXER_IDLE;
		@@ -2200,6 +2201,9 @@ bool AudioFlinger::MixerThread::threadLoop()
		// Effect chains will be actually deleted here if they were removed from
		// mEffectChains list during mixing or effects processing
		effectChains.clear();

		// FIXME Note that the above .clear() is no longer necessary since effectChains
		// is now local to this block, but will keep it for now (at least until merge done).
		}

		// put output stream into standby mode
		@@ -3022,6 +3026,9 @@ bool AudioFlinger::DirectOutputThread::threadLoop()
		// Effect chains will be actually deleted here if they were removed from
		// mEffectChains list during mixing or effects processing
		effectChains.clear();

		// FIXME Note that the above .clear() is no longer necessary since effectChains
		// is now local to this block, but will keep it for now (at least until merge done).
		}

		// put output stream into standby mode
		@@ -3158,7 +3165,6 @@ bool AudioFlinger::DuplicatingThread::threadLoop()
		uint32_t activeSleepTime = activeSleepTimeUs();
		uint32_t idleSleepTime = idleSleepTimeUs();
		uint32_t sleepTime = idleSleepTime;
		Vector< sp<EffectChain> > effectChains;

		acquireWakeLock();

		@@ -3166,6 +3172,8 @@ bool AudioFlinger::DuplicatingThread::threadLoop()
		{
		// MixerThread has cpuStats.sample

		Vector< sp<EffectChain> > effectChains;

		processConfigEvents();

		mixer_state mixerStatus = MIXER_IDLE;
		@@ -3302,6 +3310,9 @@ bool AudioFlinger::DuplicatingThread::threadLoop()
		// Effect chains will be actually deleted here if they were removed from
		// mEffectChains list during mixing or effects processing
		effectChains.clear();

		// FIXME Note that the above .clear() is no longer necessary since effectChains
		// is now local to this block, but will keep it for now (at least until merge done).
		}

		// MixerThread and DirectOutpuThread have standby here,