diff options
| author | James Dong <jdong@google.com> | 2011-09-28 13:46:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-28 13:46:49 -0700 |
| commit | 5530493f9abcd8f1f0b06cccecd6900e86a99778 (patch) | |
| tree | 191bb6fff2637f3ff074a2cfda970d10be9c6dcb /media | |
| parent | 729de186450f78c099637e1fce743fe531862c52 (diff) | |
| parent | 6c375490a5536695770a85b57ec9f828d3c0c9d4 (diff) | |
| download | frameworks_av-5530493f9abcd8f1f0b06cccecd6900e86a99778.zip frameworks_av-5530493f9abcd8f1f0b06cccecd6900e86a99778.tar.gz frameworks_av-5530493f9abcd8f1f0b06cccecd6900e86a99778.tar.bz2 | |
Merge "Flush resets the count of played audio frames"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp index ba076f5..2581a62 100644 --- a/media/libstagefright/AudioPlayer.cpp +++ b/media/libstagefright/AudioPlayer.cpp @@ -508,6 +508,9 @@ status_t AudioPlayer::seekTo(int64_t time_us) { mReachedEOS = false; mSeekTimeUs = time_us; + // Flush resets the number of played frames + mNumFramesPlayed = 0; + if (mAudioSink != NULL) { mAudioSink->flush(); } else { |