Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0c89137 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am e2a11aea: am 45b94402: am 2fa84b0b: am e760de61: Merge "NuPlayerDriver:... 

am e2a11aea: am 45b94402: am 2fa84b0b: am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev

* commit 'e2a11aea':
  NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.
parents b0b36e6d e2a11aea

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;