commit dd5c2148e97dcf68577a84d6162618e0e5ce4936
author ramindani <ramindani@google.com> Tue Jan 14 09:33:08 2025 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jan 16 12:23:28 2025 -0800
tree 75b468e14204ea9198ae888857c044386ae9355c
parent 206ba4109464d7fd8ede177c589979acf3deb1d5

[SF] Use render rate for the compositorTiming

Vsync Period does not represent the actual
composition rate in the framework anymore,
render rate is the more accurate composition rate.

BUG: 383938139
BUG: 355342197
Flag: EXEMPT bug fix
Test: atest CtsDeqpTestCases --test-filter '*dEQP-EGL.functional.get_frame_timestamps*'
Test: Before fix http://ab/I51300010353712246
Test: After the fix http://ab/I22500010354940353
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6b6d542c5c002e2247aacdb1aec79868c0c4a809)
Merged-In: I33574b3ff347264a19e2e0bcfd2236639aad01a5
Change-Id: I33574b3ff347264a19e2e0bcfd2236639aad01a5

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index d7d567c..896d13d 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3171,12 +3171,12 @@
 
     const auto schedule = mScheduler->getVsyncSchedule();
     const TimePoint vsyncDeadline = schedule->vsyncDeadlineAfter(presentTime);
-    const Period vsyncPeriod = schedule->period();
+    const Fps renderRate = pacesetterDisplay->refreshRateSelector().getActiveMode().fps;
     const nsecs_t vsyncPhase =
             mScheduler->getVsyncConfiguration().getCurrentConfigs().late.sfOffset;
 
-    const CompositorTiming compositorTiming(vsyncDeadline.ns(), vsyncPeriod.ns(), vsyncPhase,
-                                            presentLatency.ns());
+    const CompositorTiming compositorTiming(vsyncDeadline.ns(), renderRate.getPeriodNsecs(),
+                                            vsyncPhase, presentLatency.ns());
 
     ui::DisplayMap<ui::LayerStack, const DisplayDevice*> layerStackToDisplay;
     {