Merge "Allow releaseBuffer after flush" into klp-dev (95c03858) · Commits · e / os / android_frameworks_av

include/private/media/AudioTrackShared.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -360,6 +360,7 @@ public:
		// which must be > 0.
		// buffer->mNonContig is unused.
		// buffer->mRaw is unused.
		// ackFlush is true iff being called from Track::start to acknowledge a pending flush.
		// On exit:
		// buffer->mFrameCount has the actual number of contiguous available frames,
		// which is always 0 when the return status != NO_ERROR.
		@@ -370,7 +371,7 @@ public:
		// NO_ERROR Success, buffer->mFrameCount > 0.
		// WOULD_BLOCK No frames are available.
		// NO_INIT Shared memory is corrupt.
		virtual status_t obtainBuffer(Buffer* buffer);
		virtual status_t obtainBuffer(Buffer* buffer, bool ackFlush = false);

		// Release (some of) the frames last obtained.
		// On entry, buffer->mFrameCount should have the number of frames to release,
		@@ -437,7 +438,7 @@ protected:
		public:
		virtual size_t framesReady();
		virtual void framesReadyIsCalledByMultipleThreads();
		virtual status_t obtainBuffer(Buffer* buffer);
		virtual status_t obtainBuffer(Buffer* buffer, bool ackFlush);
		virtual void releaseBuffer(Buffer* buffer);
		virtual void tallyUnderrunFrames(uint32_t frameCount);
		virtual uint32_t getUnderrunFrames() const { return 0; }

+7 −3

Original line number	Diff line number	Diff line
		@@ -506,7 +506,7 @@ ServerProxy::ServerProxy(audio_track_cblk_t* cblk, void *buffers, size_t frameCo
		{
		}

		status_t ServerProxy::obtainBuffer(Buffer* buffer)
		status_t ServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush)
		{
		LOG_ALWAYS_FATAL_IF(buffer == NULL \|\| buffer->mFrameCount == 0);
		if (mIsShutdown) {
		@@ -579,7 +579,11 @@ status_t ServerProxy::obtainBuffer(Buffer* buffer)
		buffer->mRaw = part1 > 0 ?
		&((char ) mBuffers)[(mIsOut ? front : rear) mFrameSize] : NULL;
		buffer->mNonContig = availToServer - part1;
		// After flush(), allow releaseBuffer() on a previously obtained buffer;
		// see "Acknowledge any pending flush()" in audioflinger/Tracks.cpp.
		if (!ackFlush) {
		mUnreleased = part1;
		}
		return part1 > 0 ? NO_ERROR : WOULD_BLOCK;
		}
		no_init:
		@@ -761,7 +765,7 @@ ssize_t StaticAudioTrackServerProxy::pollPosition()
		return (ssize_t) position;
		}

		status_t StaticAudioTrackServerProxy::obtainBuffer(Buffer* buffer)
		status_t StaticAudioTrackServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush)
		{
		if (mIsShutdown) {
		buffer->mFrameCount = 0;

+1 −1

Original line number	Diff line number	Diff line
		@@ -608,7 +608,7 @@ status_t AudioFlinger::PlaybackThread::Track::start(AudioSystem::sync_event_t ev
		// and for fast tracks the track is not yet in the fast mixer thread's active set.
		ServerProxy::Buffer buffer;
		buffer.mFrameCount = 1;
		(void) mAudioTrackServerProxy->obtainBuffer(&buffer);
		(void) mAudioTrackServerProxy->obtainBuffer(&buffer, true /ackFlush/);
		}
		} else {
		status = BAD_VALUE;