From 59529e1474a5e696e83955ccf0876992299bc86f Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Fri, 25 Mar 2011 16:36:13 -0700
Subject: [PATCH] After a seek there's a brief period where audio time isn't
 reestablished.

Don't use audio time to trigger a "we're very late, skipping ahead" action
until it's reestablished.

Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1
related-to-bug: 4173683
---
 media/libstagefright/AudioPlayer.cpp | 5 +++++
 1 file changed, 5 insertions(+)

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