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

Commit d179bd67 authored by Eric Laurent's avatar Eric Laurent Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed."

parents 6f3b732b 8b67ce72

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

+7 −0
Original line number Diff line number Diff line
@@ -316,6 +316,13 @@ status_t NuPlayerDriver::stop() { 
}



status_t NuPlayerDriver::pause() {

    // The NuPlayerRenderer may get flushed if pause for long enough, e.g. the pause timeout tear

    // down for audio offload mode. If that happens, the NuPlayerRenderer will no longer know the

    // current position. So similar to seekTo, update |mPositionUs| to the pause position by calling

    // getCurrentPosition here.

    int msec;

    getCurrentPosition(&msec);



    Mutex::Autolock autoLock(mLock);



    switch (mState) {

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1012,6 +1012,7 @@ void NuPlayer::Renderer::onFlush(const sp<AMessage> &msg) { 
         Mutex::Autolock autoLock(mLock);

         syncQueuesDone_l();

         setPauseStartedTimeRealUs(-1);

         setAnchorTime(-1, -1);

    }



    ALOGV("flushing %s", audio ? "audio" : "video");