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

Commit f16d1088 authored by Brian Lindahl's avatar Brian Lindahl Committed by Automerger Merge Worker
Browse files

Merge "Guard render metrics against too-large render times" into main am: d6fd8eee 

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



Change-Id: I07f53a18006f3196f9924de192a9241758f3f85e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66a6961c d6fd8eee

media/codec2/sfplugin/CCodecBufferChannel.cpp

+9 −0
Original line number Diff line number Diff line
@@ -1044,6 +1044,15 @@ void CCodecBufferChannel::trackReleasedFrame(const IGraphicBufferProducer::Queue 
    if (desiredRenderTimeNs < nowNs) {

        desiredRenderTimeNs = nowNs;

    }



    // If the render time is more than a second from now, then pretend the frame is supposed to be

    // rendered immediately, because that's what SurfaceFlinger heuristics will do. This is a tight

    // coupling, but is really the only way to optimize away unnecessary present fence checks in

    // processRenderedFrames.

    if (desiredRenderTimeNs > nowNs + 1*1000*1000*1000LL) {

        desiredRenderTimeNs = nowNs;

    }



    // We've just queued a frame to the surface, so keep track of it and later check to see if it is

    // actually rendered.

    TrackedFrame frame;

media/libstagefright/ACodec.cpp

+9 −0
Original line number Diff line number Diff line
@@ -1583,6 +1583,15 @@ void ACodec::trackReleasedFrame(int64_t frameId, int64_t mediaTimeUs, int64_t de 
    if (desiredRenderTimeNs < nowNs) {

        desiredRenderTimeNs = nowNs;

    }



    // If the render time is more than a second from now, then pretend the frame is supposed to be

    // rendered immediately, because that's what SurfaceFlinger heuristics will do. This is a tight

    // coupling, but is really the only way to optimize away unnecessary present fence checks in

    // processRenderedFrames.

    if (desiredRenderTimeNs > nowNs + 1*1000*1000*1000LL) {

        desiredRenderTimeNs = nowNs;

    }



    // We've just queued a frame to the surface, so keep track of it and later check to see if it is

    // actually rendered.

    TrackedFrame frame;