diff options
| author | Wei Jia <wjia@google.com> | 2014-09-10 19:59:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 19:59:16 +0000 |
| commit | 42db212edc507588768479ec91acfb97b49b2837 (patch) | |
| tree | cb94031a9f924074d54341770a0138c460d1ae82 /media | |
| parent | 3eef436cea1928f96b789449ea144d1a529d2651 (diff) | |
| parent | e4c8b32f1123aa639f46d234203ad5c5e7926628 (diff) | |
| download | frameworks_av-42db212edc507588768479ec91acfb97b49b2837.zip frameworks_av-42db212edc507588768479ec91acfb97b49b2837.tar.gz frameworks_av-42db212edc507588768479ec91acfb97b49b2837.tar.bz2 | |
am e4c8b32f: Merge "NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress." into lmp-dev
* commit 'e4c8b32f1123aa639f46d234203ad5c5e7926628':
NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 35cd514..7dd54c1 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -626,12 +626,15 @@ void NuPlayerDriver::notifyListener_l( switch (msg) { case MEDIA_PLAYBACK_COMPLETE: { - if (mLooping && mState != STATE_RESET_IN_PROGRESS) { - mPlayer->seekToAsync(0); - break; + if (mState != STATE_RESET_IN_PROGRESS) { + if (mLooping) { + mPlayer->seekToAsync(0); + break; + } + + mPlayer->pause(); + mState = STATE_PAUSED; } - mPlayer->pause(); - mState = STATE_PAUSED; // fall through } |