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

Commit 4f5e307c authored by Toshikazu Saito's avatar Toshikazu Saito Committed by android-build-merger
Browse files

Merge "Avoid scanning sources when decoder state is shutdown" 

am: 95165fd5

* commit '95165fd5':
  Avoid scanning sources when decoder state is shutdown

Change-Id: Ib777ec702f630c6f327eaca50ab0e4deaceddabd
parents 98a9b2a4 95165fd5

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1688,8 +1688,10 @@ void NuPlayer::flushDecoder(bool audio, bool needShutdown) { 
    // Make sure we don't continue to scan sources until we finish flushing.

    ++mScanSourcesGeneration;

    if (mScanSourcesPending) {

        if (!needShutdown) {

            mDeferredActions.push_back(

                    new SimpleAction(&NuPlayer::performScanSources));

        }

        mScanSourcesPending = false;

    }