Merge "For static obtainBuffer(), do not set mUnreleased if acknowledging flush." into mnc-dr-dev (8fa0848c) · Commits · e / os / android_frameworks_av

media/libmedia/AudioTrackShared.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -932,7 +932,7 @@ ssize_t StaticAudioTrackServerProxy::pollPosition()
		return (ssize_t) mState.mPosition;
		}

		status_t StaticAudioTrackServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush __unused)
		status_t StaticAudioTrackServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush)
		{
		if (mIsShutdown) {
		buffer->mFrameCount = 0;
		@@ -970,7 +970,9 @@ status_t StaticAudioTrackServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush
		// it is always larger or equal to avail.
		LOG_ALWAYS_FATAL_IF(mFramesReady < (int64_t) avail);
		buffer->mNonContig = mFramesReady == INT64_MAX ? SIZE_MAX : clampToSize(mFramesReady - avail);
		if (!ackFlush) {
		mUnreleased = avail;
		}
		return NO_ERROR;
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -715,6 +715,7 @@ status_t AudioFlinger::PlaybackThread::Track::start(AudioSystem::sync_event_t ev
		// But in this case we know the mixer thread (whether normal mixer or fast mixer)
		// isn't looking at this track yet: we still hold the normal mixer thread lock,
		// and for fast tracks the track is not yet in the fast mixer thread's active set.
		// For static tracks, this is used to acknowledge change in position or loop.
		ServerProxy::Buffer buffer;
		buffer.mFrameCount = 1;
		(void) mAudioTrackServerProxy->obtainBuffer(&buffer, true /ackFlush/);