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

Commit b189a5b3 authored by Wei Jia's avatar Wei Jia Committed by The Android Automerger
Browse files

Revert "NuPlayer: don't feed decoder input data during flushing." 

The previous patch results in MediaBuffer leakage.

This reverts commit 69a85b79.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 16849601
Change-Id: Ib1892b7603a97e12b7ee228fd5a4009700cdc988
parent ef28532f

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;