From 3a9b4c8b112c3fbd59bca17228ecc772e0879cb3 Mon Sep 17 00:00:00 2001
From: Dake Gu <dake@google.com>
Date: Thu, 2 Jun 2022 17:42:55 -0700
Subject: Detect doubleStuffed frame when duration is over 2*interval

Current doubleStuffed deadline calculation is based on the assumption
that frame duration cannot go beyond 2*interval. But we see on TV
with many >2*interval cases and device is still rendering without
frame drop.

See details in go/jank-tracker-deadline-fix-on-s

Test: build adt3_gtv-userdebug on T, verified gfxinfo is no longer
reporting a high number of "deadline missed"

Test: new test in JankTrackerTests

Bug: 189942694
Change-Id: Id9be2d0d232b89c6e145ecec513054ca8c752814
---
 libs/hwui/JankTracker.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libs/hwui/JankTracker.cpp')

diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp
index 1e5be6c3eed7..4b0ddd2fa2ef 100644
--- a/libs/hwui/JankTracker.cpp
+++ b/libs/hwui/JankTracker.cpp
@@ -201,8 +201,9 @@ void JankTracker::finishFrame(FrameInfo& frame, std::unique_ptr<FrameMetricsRepo
     // If we are in triple buffering, we have enough buffers in queue to sustain a single frame
     // drop without jank, so adjust the frame interval to the deadline.
     if (isTripleBuffered) {
-        deadline += frameInterval;
-        frame.set(FrameInfoIndex::FrameDeadline) += frameInterval;
+        int64_t originalDeadlineDuration = deadline - frame[FrameInfoIndex::IntendedVsync];
+        deadline = mNextFrameStartUnstuffed + originalDeadlineDuration;
+        frame.set(FrameInfoIndex::FrameDeadline) = deadline;
     }
 
     // If we hit the deadline, cool!
-- 
cgit v1.2.3-59-g8ed1b