diff options
author | Gloria Wang <gwang@google.com> | 2010-02-08 10:46:36 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-08 10:46:36 -0800 |
commit | c9c4bef6b7f6793263a1f7659fe3641e856f2573 (patch) | |
tree | 69cbb2677b27857b7ea0e782a0df228187f2420a /media | |
parent | 7ebf475799f6ae1ec8c67983fc1028c487af4c2e (diff) | |
parent | cb9859bcf5f00cee57de06e9968b88a69b2d6d9c (diff) | |
download | frameworks_av-c9c4bef6b7f6793263a1f7659fe3641e856f2573.zip frameworks_av-c9c4bef6b7f6793263a1f7659fe3641e856f2573.tar.gz frameworks_av-c9c4bef6b7f6793263a1f7659fe3641e856f2573.tar.bz2 |
Merge "Fix for 2224736. Sometimes mSeeking is reset without calling setSeekTo first."
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp index e7351dc..4926920 100644 --- a/media/libstagefright/AudioPlayer.cpp +++ b/media/libstagefright/AudioPlayer.cpp @@ -229,6 +229,8 @@ void AudioPlayer::fillBuffer(void *data, size_t size) { mInputBuffer->release(); mInputBuffer = NULL; } + + mSeeking = false; } } @@ -240,8 +242,6 @@ void AudioPlayer::fillBuffer(void *data, size_t size) { Mutex::Autolock autoLock(mLock); - mSeeking = false; - if (err != OK) { mReachedEOS = true; memset((char *)data + size_done, 0, size_remaining); |