diff options
author | Andy Hung <hunga@google.com> | 2014-10-17 20:42:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 20:42:17 +0000 |
commit | 81fb2e869ac3c57c9856482af27ba9f954053aa6 (patch) | |
tree | 223f37c15c9bfc0f528cf0fc79b0d8e3500b3f94 /media | |
parent | bd94706940b76f4c9fbf16829823a08db8f0b3db (diff) | |
parent | e9234f17dfbb192c96b122b9e0ce8cd9015d1589 (diff) | |
download | frameworks_av-81fb2e869ac3c57c9856482af27ba9f954053aa6.zip frameworks_av-81fb2e869ac3c57c9856482af27ba9f954053aa6.tar.gz frameworks_av-81fb2e869ac3c57c9856482af27ba9f954053aa6.tar.bz2 |
am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-dev
* commit 'e9234f17dfbb192c96b122b9e0ce8cd9015d1589':
Fix AudioTrack retrograde getPosition when restoring tracks
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/AudioTrack.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 8e0704f..0a89fbb 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -464,7 +464,6 @@ status_t AudioTrack::start() if (previousState == STATE_STOPPED || previousState == STATE_FLUSHED) { // reset current position as seen by client to 0 mPosition = 0; - mReleased = 0; // For offloaded tracks, we don't know if the hardware counters are really zero here, // since the flush is asynchronous and stop may not fully drain. // We save the time when the track is started to later verify whether @@ -529,6 +528,7 @@ void AudioTrack::stop() mState = STATE_STOPPING; } else { mState = STATE_STOPPED; + mReleased = 0; } mProxy->interrupt(); @@ -585,6 +585,7 @@ void AudioTrack::flush_l() mRefreshRemaining = true; mState = STATE_FLUSHED; + mReleased = 0; if (isOffloaded_l()) { mProxy->interrupt(); } @@ -1625,6 +1626,7 @@ nsecs_t AudioTrack::processAudioBuffer() waitStreamEnd = mState == STATE_STOPPING; if (waitStreamEnd) { mState = STATE_STOPPED; + mReleased = 0; } } if (waitStreamEnd && status != DEAD_OBJECT) { @@ -1873,6 +1875,7 @@ status_t AudioTrack::restoreTrack_l(const char *from) if (result != NO_ERROR) { ALOGW("restoreTrack_l() failed status %d", result); mState = STATE_STOPPED; + mReleased = 0; } return result; |