commit 919b93473ebbba036f3934e92039f038c7f91a54
author Robert Shih <robertshih@google.com> Wed Sep 17 02:01:57 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 17 02:01:57 2014 +0000
tree 64ef07ea42adcb89bf851fb6ad0bb1f7fb0a0413
parent fbbeeeb87c55c3eca94a709f9f8986190f6472a1
parent 6e9f6b498d758848fd934f8217c386dd74ef3833

Merge "NuPlayerDriver: restart after eos pause" into lmp-dev

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
index 7dd54c1..4e6b4d8 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
@@ -263,8 +263,15 @@
         case STATE_PAUSED:
         case STATE_STOPPED_AND_PREPARED:
         {
-            mPlayer->resume();
-            mPositionUs -= ALooper::GetNowUs() - mPauseStartedTimeUs;
+            if (mAtEOS) {
+                mPlayer->seekToAsync(0);
+                mAtEOS = false;
+                mPlayer->resume();
+                mPositionUs = -1;
+            } else {
+                mPlayer->resume();
+                mPositionUs -= ALooper::GetNowUs() - mPauseStartedTimeUs;
+            }
             break;
         }