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

Commit c058454a 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 am: 712d256f am: e048f8b9

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



Change-Id: Ic6dd82964bd59ca1c229b597a24db45a46bf3367
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b30cd859 e048f8b9
Loading
Loading
Loading
Loading
+11 −13
Original line number Diff line number Diff line
@@ -1794,24 +1794,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) {