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

Commit 9e308de9 authored by Chong Zhang's avatar Chong Zhang Committed by Android Git Automerger
Browse files

am 4d4ea7f7: Merge "do not use paused postition if it\'s not available" into lmp-mr1-dev 

* commit '4d4ea7f7':
  do not use paused postition if it's not available
parents 65cb339d 4d4ea7f7

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+8 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ NuPlayer::Renderer::Renderer( 
      mNotifyCompleteVideo(false),

      mSyncQueues(false),

      mPaused(false),

      mPausePositionMediaTimeUs(0),

      mPausePositionMediaTimeUs(-1),

      mVideoSampleReceived(false),

      mVideoRenderingStarted(false),

      mVideoRenderingStartGeneration(0),
@@ -210,7 +210,7 @@ status_t NuPlayer::Renderer::getCurrentPositionOnLooper( 


// Called either with mLock acquired or on renderer's thread.

bool NuPlayer::Renderer::getCurrentPositionIfPaused_l(int64_t *mediaUs) {

    if (!mPaused) {

    if (!mPaused || mPausePositionMediaTimeUs < 0ll) {

        return false;

    }

    *mediaUs = mPausePositionMediaTimeUs;
@@ -1232,6 +1232,12 @@ void NuPlayer::Renderer::onPause() { 
    if (getCurrentPositionFromAnchor(

            &currentPositionUs, ALooper::GetNowUs()) == OK) {

        mPausePositionMediaTimeUs = currentPositionUs;

    } else {

        // Set paused position to -1 (unavailabe) if we don't have anchor time

        // This could happen if client does a seekTo() immediately followed by

        // pause(). Renderer will be flushed with anchor time cleared. We don't

        // want to leave stale value in mPausePositionMediaTimeUs.

        mPausePositionMediaTimeUs = -1;

    }

    {

        Mutex::Autolock autoLock(mLock);