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

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

am 9fdc1f14: am c80863e9: Merge "Revert "NuPlayer: don\'t feed decoder input... 

am 9fdc1f14: am c80863e9: Merge "Revert "NuPlayer: don\'t feed decoder input data during flushing." " into lmp-dev

* commit '9fdc1f14':
  Revert "NuPlayer: don't feed decoder input data during flushing."
parents affe2bf3 9fdc1f14

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1198,11 +1198,11 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) { 
    sp<AMessage> reply;

    CHECK(msg->findMessage("reply", &reply));



    if ((audio && mFlushingAudio != NONE

                && mFlushingAudio != AWAITING_DISCONTINUITY)

            || (!audio && mFlushingVideo != NONE

                       && mFlushingVideo != AWAITING_DISCONTINUITY)) {

        return -EWOULDBLOCK;

    if ((audio && IsFlushingState(mFlushingAudio))

            || (!audio && IsFlushingState(mFlushingVideo))) {

        reply->setInt32("err", INFO_DISCONTINUITY);

        reply->post();

        return OK;

    }



    sp<ABuffer> accessUnit;