diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-05-09 13:38:09 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-05-09 16:34:39 -0700 |
| commit | 844f88ccfcca95687e774bccb5e9065da61d33f8 (patch) | |
| tree | bfe432c13ed27513ad40db6cac889f5d580514a1 | |
| parent | 0fdbdd2a3909e4692fa3baaaa1f53eb91b31af56 (diff) | |
| download | frameworks_av-844f88ccfcca95687e774bccb5e9065da61d33f8.zip frameworks_av-844f88ccfcca95687e774bccb5e9065da61d33f8.tar.gz frameworks_av-844f88ccfcca95687e774bccb5e9065da61d33f8.tar.bz2 | |
Cache mCblk in local variable cblk
This is the style used throughout the rest of AudioTrackShared.
Change-Id: I959a6be3064e087bb19eba41173fd130dfcb4a9a
| -rw-r--r-- | media/libmedia/AudioTrackShared.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp index 58c9fc1..323b675 100644 --- a/media/libmedia/AudioTrackShared.cpp +++ b/media/libmedia/AudioTrackShared.cpp @@ -621,7 +621,7 @@ void ServerProxy::releaseBuffer(Buffer* buffer) android_atomic_release_store(stepCount + rear, &cblk->u.mStreaming.mRear); } - mCblk->mServer += stepCount; + cblk->mServer += stepCount; size_t half = mFrameCount / 2; if (half == 0) { @@ -679,10 +679,11 @@ size_t AudioTrackServerProxy::framesReady() } bool AudioTrackServerProxy::setStreamEndDone() { + audio_track_cblk_t* cblk = mCblk; bool old = - (android_atomic_or(CBLK_STREAM_END_DONE, &mCblk->mFlags) & CBLK_STREAM_END_DONE) != 0; + (android_atomic_or(CBLK_STREAM_END_DONE, &cblk->mFlags) & CBLK_STREAM_END_DONE) != 0; if (!old) { - (void) __futex_syscall3(&mCblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, + (void) __futex_syscall3(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1); } return old; @@ -690,10 +691,11 @@ bool AudioTrackServerProxy::setStreamEndDone() { void AudioTrackServerProxy::tallyUnderrunFrames(uint32_t frameCount) { - mCblk->u.mStreaming.mUnderrunFrames += frameCount; + audio_track_cblk_t* cblk = mCblk; + cblk->u.mStreaming.mUnderrunFrames += frameCount; // FIXME also wake futex so that underrun is noticed more quickly - (void) android_atomic_or(CBLK_UNDERRUN, &mCblk->mFlags); + (void) android_atomic_or(CBLK_UNDERRUN, &cblk->mFlags); } // --------------------------------------------------------------------------- |