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

Commit 712d256f authored by Dorin Drimus's avatar Dorin Drimus Committed by Automerger Merge Worker
Browse files

Merge "Fix MediaCodec mBuffersInFlight size increased so large" into main am:... 

Merge "Fix MediaCodec mBuffersInFlight size increased so large" into main am: a3dc3461 am: b3bd2d89

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2732593



Change-Id: I689482df651e4432a61524240d4e8c2f8db66c23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7962f3d b3bd2d89

media/libstagefright/MediaCodec.cpp

+11 −13
Original line number Diff line number Diff line
@@ -1791,24 +1791,22 @@ void MediaCodec::statsBufferSent(int64_t presentationUs, const sp<MediaCodecBuff 
        mFramesInput++;

    }



    const int64_t nowNs = systemTime(SYSTEM_TIME_MONOTONIC);

    BufferFlightTiming_t startdata = { presentationUs, nowNs };



    {

    // mutex access to mBuffersInFlight and other stats

    Mutex::Autolock al(mLatencyLock);





    // XXX: we *could* make sure that the time is later than the end of queue

    // as part of a consistency check...

    if (!mTunneled) {

        const int64_t nowNs = systemTime(SYSTEM_TIME_MONOTONIC);

        BufferFlightTiming_t startdata = { presentationUs, nowNs };

        mBuffersInFlight.push_back(startdata);

    }



    if (mIsLowLatencyModeOn && mIndexOfFirstFrameWhenLowLatencyOn < 0) {

        mIndexOfFirstFrameWhenLowLatencyOn = mInputBufferCounter;

    }

    ++mInputBufferCounter;

}

}



// when we get a buffer back from the codec

void MediaCodec::statsBufferReceived(int64_t presentationUs, const sp<MediaCodecBuffer> &buffer) {