diff options
| author | Wei Jia <wjia@google.com> | 2014-09-08 17:45:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-08 17:45:07 +0000 |
| commit | 43cbe059b21185855465063d3767c2364f446f44 (patch) | |
| tree | a7cde3d75ff1c7a9ae969dca2ede9325825214f9 /media/libmediaplayerservice | |
| parent | 62ce207291353a13dd722855102e99684259a517 (diff) | |
| parent | 4ec6746804ad8172c8b1c4eb3e6deb19a0920734 (diff) | |
| download | frameworks_av-43cbe059b21185855465063d3767c2364f446f44.zip frameworks_av-43cbe059b21185855465063d3767c2364f446f44.tar.gz frameworks_av-43cbe059b21185855465063d3767c2364f446f44.tar.bz2 | |
Merge "NuPlayerDriver: put player in paused state when reaching EOS." into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 09324ae..35cd514 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -627,11 +627,11 @@ void NuPlayerDriver::notifyListener_l( case MEDIA_PLAYBACK_COMPLETE: { if (mLooping && mState != STATE_RESET_IN_PROGRESS) { - mLock.unlock(); mPlayer->seekToAsync(0); - mLock.lock(); break; } + mPlayer->pause(); + mState = STATE_PAUSED; // fall through } |