summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-07-11 20:11:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-11 20:11:55 +0000
commitce177bb31493d3cd4450f9d4760fa1fd32ec6bf4 (patch)
tree7e892378eed7bc22e051862e4a07d72894740648 /include
parent303d783cc3c0cc47bfd2f64ed13104e339427e34 (diff)
parent7db7df0e8d9d7cee8ba374468cdbfa0108e3337c (diff)
downloadframeworks_av-ce177bb31493d3cd4450f9d4760fa1fd32ec6bf4.zip
frameworks_av-ce177bb31493d3cd4450f9d4760fa1fd32ec6bf4.tar.gz
frameworks_av-ce177bb31493d3cd4450f9d4760fa1fd32ec6bf4.tar.bz2
Merge "AudioTrackShared cleanup"
Diffstat (limited to 'include')
-rw-r--r--include/private/media/AudioTrackShared.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h
index b41684a..0592683 100644
--- a/include/private/media/AudioTrackShared.h
+++ b/include/private/media/AudioTrackShared.h
@@ -168,6 +168,7 @@ protected:
const bool mIsOut; // true for AudioTrack, false for AudioRecord
const bool mClientInServer; // true for OutputTrack, false for AudioTrack & AudioRecord
bool mIsShutdown; // latch set to true when shared memory corruption detected
+ size_t mUnreleased; // unreleased frames remaining from most recent obtainBuffer
};
// ----------------------------------------------------------------------------
@@ -213,7 +214,7 @@ public:
// DEAD_OBJECT Server has died or invalidated, caller should destroy this proxy and re-create.
// -EINTR Call has been interrupted. Look around to see why, and then perhaps try again.
// NO_INIT Shared memory is corrupt.
- // BAD_VALUE On entry buffer == NULL or buffer->mFrameCount == 0.
+ // Assertion failure on entry, if buffer == NULL or buffer->mFrameCount == 0.
status_t obtainBuffer(Buffer* buffer, const struct timespec *requested = NULL,
struct timespec *elapsed = NULL);
@@ -372,7 +373,6 @@ public:
virtual void releaseBuffer(Buffer* buffer);
protected:
- size_t mUnreleased; // unreleased frames remaining from most recent obtainBuffer()
size_t mAvailToClient; // estimated frames available to client prior to releaseBuffer()
private:
int32_t mFlush; // our copy of cblk->u.mStreaming.mFlush, for streaming output only