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

Commit 39024f23 authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "Avoid scanning sources when decoder state is shutdown" am: 95165fd5 

am: 4f5e307c

* commit '4f5e307c':
  Avoid scanning sources when decoder state is shutdown

Change-Id: I65f275d3f91b844a969ffb845a5f0a8a9a900f8d
parents d2119f39 4f5e307c

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

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

    }