diff options
| author | Wei Jia <wjia@google.com> | 2014-09-08 18:52:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-08 18:52:41 +0000 |
| commit | aec8b9ac793cdecb4ec3d9e38c63d71b2167be23 (patch) | |
| tree | 5bfe9692b793e0468c5534aca7fa93c72835b8a9 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | f4207cd4024e421bf51e5cd1457dd454f52be68a (diff) | |
| parent | e2b2e5fb735a2cdd93e44982539470fbec2ab36b (diff) | |
| download | frameworks_av-aec8b9ac793cdecb4ec3d9e38c63d71b2167be23.zip frameworks_av-aec8b9ac793cdecb4ec3d9e38c63d71b2167be23.tar.gz frameworks_av-aec8b9ac793cdecb4ec3d9e38c63d71b2167be23.tar.bz2 | |
am e2b2e5fb: am 43cbe059: Merge "NuPlayerDriver: put player in paused state when reaching EOS." into lmp-dev
* commit 'e2b2e5fb735a2cdd93e44982539470fbec2ab36b':
NuPlayerDriver: put player in paused state when reaching EOS.
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
| -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 3c16715..ae8ee43 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -638,13 +638,13 @@ void NuPlayerDriver::notifyListener_l( case MEDIA_PLAYBACK_COMPLETE: { if (mLooping && mState != STATE_RESET_IN_PROGRESS) { - mLock.unlock(); mPlayer->seekToAsync(0); - mLock.lock(); break; } else { mState = STATE_PAUSED; } + mPlayer->pause(); + mState = STATE_PAUSED; // fall through } |