diff options
author | Andy Hung <hunga@google.com> | 2015-10-06 10:51:09 -0700 |
---|---|---|
committer | Andy Hung <hunga@google.com> | 2015-10-06 13:46:50 -0700 |
commit | 61be84167c1a11c8a030e00a2b79b2bc4fdf617f (patch) | |
tree | 8213fe1a24bdc63e7994b6129615c57845590d03 /media/libmedia/AudioTrack.cpp | |
parent | f99498ee4de7123e2fd71778c6877be44fbd1506 (diff) | |
download | frameworks_av-61be84167c1a11c8a030e00a2b79b2bc4fdf617f.zip frameworks_av-61be84167c1a11c8a030e00a2b79b2bc4fdf617f.tar.gz frameworks_av-61be84167c1a11c8a030e00a2b79b2bc4fdf617f.tar.bz2 |
AudioTrack: Prevent stop() from reissuing last marker event
Avoid a duplicate marker event race condition (1 in 30 or less)
by clearing marker reached in start() not stop().
Bug: 24497521
Change-Id: I9520d063c7d173d2e642174bf60a2bfe75edf085
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
-rw-r--r-- | media/libmedia/AudioTrack.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 444f4d8..ab3d66a 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -523,6 +523,15 @@ status_t AudioTrack::start() mTimestampStartupGlitchReported = false; mRetrogradeMotionReported = false; + // If previousState == STATE_STOPPED, we reactivate markers (mMarkerPosition != 0) + // as the position is reset to 0. This is legacy behavior. This is not done + // in stop() to avoid a race condition where the last marker event is issued twice. + // Note: the if is technically unnecessary because previousState == STATE_FLUSHED + // is only for streaming tracks, and mMarkerReached is already set to false. + if (previousState == STATE_STOPPED) { + mMarkerReached = false; + } + // 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 @@ -592,9 +601,9 @@ void AudioTrack::stop() mProxy->interrupt(); mAudioTrack->stop(); - // the playback head position will reset to 0, so if a marker is set, we need - // to activate it again - mMarkerReached = false; + + // Note: legacy handling - stop does not clear playback marker + // and periodic update counter, but flush does for streaming tracks. if (mSharedBuffer != 0) { // clear buffer position and loop count. |