diff options
| author | Wei Jia <wjia@google.com> | 2014-10-14 17:26:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 17:26:28 +0000 |
| commit | d0c8913702815fb0e86c4e183e6dbb4bab1016c2 (patch) | |
| tree | 8e11712c0694b540540aa78a6a16e4ce4d025c7d /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | b0b36e6dfc6e9b7adce4225e161e1d37bbb5af86 (diff) | |
| parent | e2a11aea42e3fca474e737717dd471baa2c22861 (diff) | |
| download | frameworks_av-d0c8913702815fb0e86c4e183e6dbb4bab1016c2.zip frameworks_av-d0c8913702815fb0e86c4e183e6dbb4bab1016c2.tar.gz frameworks_av-d0c8913702815fb0e86c4e183e6dbb4bab1016c2.tar.bz2 | |
am e2a11aea: am 45b94402: am 2fa84b0b: am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev
* commit 'e2a11aea42e3fca474e737717dd471baa2c22861':
NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.
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 d9d25a5..ca955eb 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -191,7 +191,7 @@ status_t NuPlayerDriver::prepare_l() { mAtEOS = false; mState = STATE_STOPPED_AND_PREPARING; mIsAsyncPrepare = false; - mPlayer->seekToAsync(0); + mPlayer->seekToAsync(0, true /* needNotify */); while (mState == STATE_STOPPED_AND_PREPARING) { mCondition.wait(mLock); } @@ -216,7 +216,7 @@ status_t NuPlayerDriver::prepareAsync() { mAtEOS = false; mState = STATE_STOPPED_AND_PREPARING; mIsAsyncPrepare = true; - mPlayer->seekToAsync(0); + mPlayer->seekToAsync(0, true /* needNotify */); return OK; default: return INVALID_OPERATION; |