commit 2edbdcc6f2572e5f84253617b1850908344b3f8c
author Andreas Huber <andih@google.com> Mon Mar 28 08:11:26 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 28 08:11:26 2011 -0700
tree eb844a00439e9baeacdc924f2b50cd9f0259bb59
parent 0b9bacc69314fc6480d1ebe67b7ee0d0aebca5c0
parent 59529e1474a5e696e83955ccf0876992299bc86f

Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1

media/libstagefright/AudioPlayer.cpp

diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index e7c0299..bd04a26 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -405,6 +405,10 @@
     Mutex::Autolock autoLock(mLock);
 
     if (mPositionTimeMediaUs < 0 || mPositionTimeRealUs < 0) {
+        if (mSeeking) {
+            return mSeekTimeUs;
+        }
+
         return 0;
     }
 
@@ -430,6 +434,7 @@
     Mutex::Autolock autoLock(mLock);
 
     mSeeking = true;
+    mPositionTimeRealUs = mPositionTimeMediaUs = -1;
     mReachedEOS = false;
     mSeekTimeUs = time_us;