commit 3979f08f59ab2905510a439bae32b92ae21cfddf
author Andreas Huber <andih@google.com> Mon Mar 28 08:16:52 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 28 08:16:52 2011 -0700
tree f604c04099e2f0a8ad9edcf4adece1f4c68e577e
parent 3a4d645d3bf0bcd3e75968a9d88245fa9a9e0a42
parent 98442ddd86ea33453c2db10cfbfc310ae49dce8f

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

* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.

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;