resolved conflicts for merge of b1080917 to master (9382378b) · Commits · e / os / android_frameworks_av

media/libmedia/AudioTrackShared.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -295,8 +295,8 @@ void ClientProxy::binderDied()
		audio_track_cblk_t* cblk = mCblk;
		if (!(android_atomic_or(CBLK_INVALID, &cblk->mFlags) & CBLK_INVALID)) {
		// it seems that a FUTEX_WAKE_PRIVATE will not wake a FUTEX_WAIT, even within same process
		(void) __futex_syscall3(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE,
		1);
		(void) __futex_syscall4(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE,
		1, NULL);
		}
		}

		@@ -304,8 +304,8 @@ void ClientProxy::interrupt()
		{
		audio_track_cblk_t* cblk = mCblk;
		if (!(android_atomic_or(CBLK_INTERRUPT, &cblk->mFlags) & CBLK_INTERRUPT)) {
		(void) __futex_syscall3(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE,
		1);
		(void) __futex_syscall4(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE,
		1, NULL);
		}
		}

		@@ -535,8 +535,8 @@ status_t ServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush)
		if (front != rear) {
		int32_t old = android_atomic_or(CBLK_FUTEX_WAKE, &cblk->mFutex);
		if (!(old & CBLK_FUTEX_WAKE)) {
		(void) __futex_syscall3(&cblk->mFutex,
		mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1);
		(void) __futex_syscall4(&cblk->mFutex,
		mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL);
		}
		}
		front = rear;
		@@ -638,8 +638,8 @@ void ServerProxy::releaseBuffer(Buffer* buffer)
		ALOGV("mAvailToClient=%u stepCount=%u minimum=%u", mAvailToClient, stepCount, minimum);
		int32_t old = android_atomic_or(CBLK_FUTEX_WAKE, &cblk->mFutex);
		if (!(old & CBLK_FUTEX_WAKE)) {
		(void) __futex_syscall3(&cblk->mFutex,
		mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1);
		(void) __futex_syscall4(&cblk->mFutex,
		mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL);
		}
		}

		@@ -683,8 +683,8 @@ bool AudioTrackServerProxy::setStreamEndDone() {
		bool old =
		(android_atomic_or(CBLK_STREAM_END_DONE, &cblk->mFlags) & CBLK_STREAM_END_DONE) != 0;
		if (!old) {
		(void) __futex_syscall3(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE,
		1);
		(void) __futex_syscall4(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE,
		1, NULL);
		}
		return old;
		}

services/audioflinger/Threads.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -2752,7 +2752,7 @@ AudioFlinger::MixerThread::~MixerThread()
		if (state->mCommand == FastMixerState::COLD_IDLE) {
		int32_t old = android_atomic_inc(&mFastMixerFutex);
		if (old == -1) {
		(void) __futex_syscall3(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1);
		(void) __futex_syscall4(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1, NULL);
		}
		}
		state->mCommand = FastMixerState::EXIT;
		@@ -2809,7 +2809,7 @@ ssize_t AudioFlinger::MixerThread::threadLoop_write()
		if (state->mCommand == FastMixerState::COLD_IDLE) {
		int32_t old = android_atomic_inc(&mFastMixerFutex);
		if (old == -1) {
		(void) __futex_syscall3(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1);
		(void) __futex_syscall4(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1, NULL);
		}
		#ifdef AUDIO_WATCHDOG
		if (mAudioWatchdog != 0) {

services/audioflinger/Tracks.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -1008,7 +1008,7 @@ void AudioFlinger::PlaybackThread::Track::invalidate()
		android_atomic_or(CBLK_INVALID, &cblk->mFlags);
		android_atomic_release_store(0x40000000, &cblk->mFutex);
		// client is not in server, so FUTEX_WAKE is needed instead of FUTEX_WAKE_PRIVATE
		(void) __futex_syscall3(&cblk->mFutex, FUTEX_WAKE, INT_MAX);
		(void) __futex_syscall4(&cblk->mFutex, FUTEX_WAKE, INT_MAX, NULL);
		mIsInvalid = true;
		}

		@@ -1937,7 +1937,7 @@ void AudioFlinger::RecordThread::RecordTrack::invalidate()
		android_atomic_or(CBLK_INVALID, &cblk->mFlags);
		android_atomic_release_store(0x40000000, &cblk->mFutex);
		// client is not in server, so FUTEX_WAKE is needed instead of FUTEX_WAKE_PRIVATE
		(void) __futex_syscall3(&cblk->mFutex, FUTEX_WAKE, INT_MAX);
		(void) __futex_syscall4(&cblk->mFutex, FUTEX_WAKE, INT_MAX, NULL);
		}