diff options
author | Glenn Kasten <gkasten@google.com> | 2013-10-18 15:06:37 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-18 15:06:37 -0700 |
commit | 77177fa20773d02b4f9c4147ecb98107f019fa7d (patch) | |
tree | 9d72d4d5d404fda711ae8e7b476052ef5d81a8cf /include/private | |
parent | 6edd8ca5b7e3d169db4314d2b994bc9d48e9e082 (diff) | |
parent | 95c03858e2ab4fb693a2bfe47b3caa806e43c044 (diff) | |
download | frameworks_av-77177fa20773d02b4f9c4147ecb98107f019fa7d.zip frameworks_av-77177fa20773d02b4f9c4147ecb98107f019fa7d.tar.gz frameworks_av-77177fa20773d02b4f9c4147ecb98107f019fa7d.tar.bz2 |
am 95c03858: Merge "Allow releaseBuffer after flush" into klp-dev
* commit '95c03858e2ab4fb693a2bfe47b3caa806e43c044':
Allow releaseBuffer after flush
Diffstat (limited to 'include/private')
-rw-r--r-- | include/private/media/AudioTrackShared.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index 395f164..7fd9379 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -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; } |