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

Commit b33e0b07 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "NuPlayer: Do not account eos frames in dropped-frame-counter" into pi-dev 

am: 0bb94af9

Change-Id: Id5004add0c9da2b8113e2d400eabeee3f3618c79
parents d3566a51 0bb94af9

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+6 −1
Original line number Diff line number Diff line
@@ -745,6 +745,7 @@ bool NuPlayer::Decoder::handleAnOutputBuffer( 
    sp<AMessage> reply = new AMessage(kWhatRenderBuffer, this);

    reply->setSize("buffer-ix", index);

    reply->setInt32("generation", mBufferGeneration);

    reply->setSize("size", size);



    if (eos) {

        ALOGI("[%s] saw output EOS", mIsAudio ? "audio" : "video");
@@ -1127,6 +1128,7 @@ void NuPlayer::Decoder::onRenderBuffer(const sp<AMessage> &msg) { 
    int32_t render;

    size_t bufferIx;

    int32_t eos;

    size_t size;

    CHECK(msg->findSize("buffer-ix", &bufferIx));



    if (!mIsAudio) {
@@ -1146,7 +1148,10 @@ void NuPlayer::Decoder::onRenderBuffer(const sp<AMessage> &msg) { 
        CHECK(msg->findInt64("timestampNs", &timestampNs));

        err = mCodec->renderOutputBufferAndRelease(bufferIx, timestampNs);

    } else {

        if (!msg->findInt32("eos", &eos) || !eos ||

                !msg->findSize("size", &size) || size) {

            mNumOutputFramesDropped += !mIsAudio;

        }

        err = mCodec->releaseOutputBuffer(bufferIx);

    }

    if (err != OK) {