am 63b3a29d: am c1d5c921: Fix seek-on-startup behaviour in AwesomePlayer.

Merge commit '63b3a29d4fe85d709403c1030d221d97f89b9744'

* commit '63b3a29d4fe85d709403c1030d221d97f89b9744':
  Fix seek-on-startup behaviour in AwesomePlayer.

1 files changed, 9 insertions, 3 deletions

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 973815b1a521..d4ad972288fa 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -261,6 +261,8 @@ status_t AwesomePlayer::play() {
     mFlags |= PLAYING;
     mFlags |= FIRST_FRAME;
 
+    bool deferredAudioSeek = false;
+
     if (mAudioSource != NULL) {
         if (mAudioPlayer == NULL) {
             if (mAudioSink != NULL) {
@@ -275,9 +277,7 @@ status_t AwesomePlayer::play() {
                 delete mTimeSource;
                 mTimeSource = mAudioPlayer;
 
-                // If there was a seek request while we were paused
-                // and we're just starting up again, honor the request now.
-                seekAudioIfNecessary_l();
+                deferredAudioSeek = true;
             }
         } else {
             mAudioPlayer->resume();
@@ -299,6 +299,12 @@ status_t AwesomePlayer::play() {
         }
     }
 
+    if (deferredAudioSeek) {
+        // If there was a seek request while we were paused
+        // and we're just starting up again, honor the request now.
+        seekAudioIfNecessary_l();
+    }
+
     return OK;
 }