am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev (b2059ff3) · Commits · e / os / android_frameworks_av

include/media/AudioTrack.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -612,6 +612,7 @@ protected:
		bool mPaused; // whether thread is requested to pause at next loop entry
		bool mPausedInt; // whether thread internally requests pause
		nsecs_t mPausedNs; // if mPausedInt then associated timeout, otherwise ignored
		bool mIgnoreNextPausedInt; // whether to ignore next mPausedInt request
		};

		// body of AudioTrackThread::threadLoop()

+8 −7

Original line number	Diff line number	Diff line
		@@ -1787,7 +1787,8 @@ void AudioTrack::DeathNotifier::binderDied(const wp<IBinder>& who)
		// =========================================================================

		AudioTrack::AudioTrackThread::AudioTrackThread(AudioTrack& receiver, bool bCanCallJava)
		: Thread(bCanCallJava), mReceiver(receiver), mPaused(true), mPausedInt(false), mPausedNs(0LL)
		: Thread(bCanCallJava), mReceiver(receiver), mPaused(true), mPausedInt(false), mPausedNs(0LL),
		mIgnoreNextPausedInt(false)
		{
		}

		@@ -1804,6 +1805,10 @@ bool AudioTrack::AudioTrackThread::threadLoop()
		// caller will check for exitPending()
		return true;
		}
		if (mIgnoreNextPausedInt) {
		mIgnoreNextPausedInt = false;
		mPausedInt = false;
		}
		if (mPausedInt) {
		if (mPausedNs > 0) {
		(void) mMyCond.waitRelative(mMyLock, mPausedNs);
		@@ -1838,12 +1843,7 @@ void AudioTrack::AudioTrackThread::requestExit()
		{
		// must be in this order to avoid a race condition
		Thread::requestExit();
		AutoMutex _l(mMyLock);
		if (mPaused \|\| mPausedInt) {
		mPaused = false;
		mPausedInt = false;
		mMyCond.signal();
		}
		resume();
		}

		void AudioTrack::AudioTrackThread::pause()
		@@ -1855,6 +1855,7 @@ void AudioTrack::AudioTrackThread::pause()
		void AudioTrack::AudioTrackThread::resume()
		{
		AutoMutex _l(mMyLock);
		mIgnoreNextPausedInt = true;
		if (mPaused \|\| mPausedInt) {
		mPaused = false;
		mPausedInt = false;