diff options
| author | Wei Jia <wjia@google.com> | 2014-09-24 01:39:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-24 01:39:53 +0000 |
| commit | fc55783d0886d5dbaa234f85a4313796d9ef1df4 (patch) | |
| tree | 49fde06b4444b02eeda2b5a740babcb6a8b6f676 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | a4b0894425c0e2a2ebd54b002b6bafa5f1ce0445 (diff) | |
| parent | e427abf1ea252ff305fc33aacdd2e83cf34891b5 (diff) | |
| download | frameworks_av-fc55783d0886d5dbaa234f85a4313796d9ef1df4.zip frameworks_av-fc55783d0886d5dbaa234f85a4313796d9ef1df4.tar.gz frameworks_av-fc55783d0886d5dbaa234f85a4313796d9ef1df4.tar.bz2 | |
Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 7ec9876..a9bca49 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -240,9 +240,7 @@ status_t NuPlayerDriver::start() { mPlayer->start(); if (mStartupSeekTimeUs >= 0) { - if (mStartupSeekTimeUs == 0) { - notifySeekComplete_l(); - } else { + if (mStartupSeekTimeUs > 0) { mPlayer->seekToAsync(mStartupSeekTimeUs); } @@ -369,7 +367,7 @@ status_t NuPlayerDriver::seekTo(int msec) { mAtEOS = false; // seeks can take a while, so we essentially paused notifyListener_l(MEDIA_PAUSED); - mPlayer->seekToAsync(seekTimeUs); + mPlayer->seekToAsync(seekTimeUs, true /* needNotify */); break; } |