diff options
| author | Wei Jia <wjia@google.com> | 2014-10-13 22:03:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-13 22:03:13 +0000 |
| commit | fc4ba7cc831a39b8c42a83f043024423fcd30d80 (patch) | |
| tree | 37ed8cb73f5fe0c7c88b4ac18172ddf264e13f69 /media | |
| parent | ff111660b19f6d0f0b7cd97896806490033e6add (diff) | |
| parent | e760de61d9a662b1fbfda96ac34aaa246c2711bb (diff) | |
| download | frameworks_av-fc4ba7cc831a39b8c42a83f043024423fcd30d80.zip frameworks_av-fc4ba7cc831a39b8c42a83f043024423fcd30d80.tar.gz frameworks_av-fc4ba7cc831a39b8c42a83f043024423fcd30d80.tar.bz2 | |
am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev
* commit 'e760de61d9a662b1fbfda96ac34aaa246c2711bb':
NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.
Diffstat (limited to 'media')
| -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 c57955d..63c4fce 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; |