summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-10-13 20:27:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-13 20:27:43 +0000
commite760de61d9a662b1fbfda96ac34aaa246c2711bb (patch)
treef4915925df2fa0a4c5a9a8c83d4ae22712288431 /media
parent801a3ff80c36aa9b55dc9b360d0e59f863011a39 (diff)
parentdab70a065a8e972d272ed948e77cf2cd0f1525e1 (diff)
downloadframeworks_av-e760de61d9a662b1fbfda96ac34aaa246c2711bb.zip
frameworks_av-e760de61d9a662b1fbfda96ac34aaa246c2711bb.tar.gz
frameworks_av-e760de61d9a662b1fbfda96ac34aaa246c2711bb.tar.bz2
Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp4
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;