summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-02-08 10:46:36 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-08 10:46:36 -0800
commit5a84386ae3a5935a91c628a3e1084a71aa95850a (patch)
tree55743ba2eb30ac632382b93fa763d1e06db74aa9 /media
parent5d36c46d2d8fb3f1bdc8fd1ff407e14b4433272a (diff)
parent2b7bb21a5c96caf16b8a13691fd7c3971ff3c7bd (diff)
downloadframeworks_base-5a84386ae3a5935a91c628a3e1084a71aa95850a.zip
frameworks_base-5a84386ae3a5935a91c628a3e1084a71aa95850a.tar.gz
frameworks_base-5a84386ae3a5935a91c628a3e1084a71aa95850a.tar.bz2
Merge "Fix for 2224736. Sometimes mSeeking is reset without calling setSeekTo first."
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/AudioPlayer.cpp4
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);