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

Commit 9be4a480 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7671179 from 3819b9fe to sc-qpr1-release 

Change-Id: I44701ef919ea6db1ddb9534752c337d2158dab6e
parents ee3afdd7 3819b9fe

services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp

+4 −1
Original line number Diff line number Diff line
@@ -911,7 +911,10 @@ RefreshRateConfigs::KernelIdleTimerAction RefreshRateConfigs::getIdleTimerAction 
int RefreshRateConfigs::getFrameRateDivider(Fps displayFrameRate, Fps layerFrameRate) {

    // This calculation needs to be in sync with the java code

    // in DisplayManagerService.getDisplayInfoForFrameRateOverride

    constexpr float kThreshold = 0.1f;



    // The threshold must be smaller than 0.001 in order to differentiate

    // between the fractional pairs (e.g. 59.94 and 60).

    constexpr float kThreshold = 0.0009f;

    const auto numPeriods = displayFrameRate.getValue() / layerFrameRate.getValue();

    const auto numPeriodsRounded = std::round(numPeriods);

    if (std::abs(numPeriods - numPeriodsRounded) > kThreshold) {

services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp

+5 −1
Original line number Diff line number Diff line
@@ -2123,7 +2123,11 @@ TEST_F(RefreshRateConfigsTest, getFrameRateDivider) { 
    refreshRateConfigs->setCurrentModeId(HWC_CONFIG_ID_90);

    displayRefreshRate = refreshRateConfigs->getCurrentRefreshRate().getFps();

    EXPECT_EQ(4, RefreshRateConfigs::getFrameRateDivider(displayRefreshRate, Fps(22.5f)));

    EXPECT_EQ(4, RefreshRateConfigs::getFrameRateDivider(displayRefreshRate, Fps(22.6f)));



    EXPECT_EQ(0, RefreshRateConfigs::getFrameRateDivider(Fps(24.f), Fps(25.f)));

    EXPECT_EQ(0, RefreshRateConfigs::getFrameRateDivider(Fps(24.f), Fps(23.976f)));

    EXPECT_EQ(0, RefreshRateConfigs::getFrameRateDivider(Fps(30.f), Fps(29.97f)));

    EXPECT_EQ(0, RefreshRateConfigs::getFrameRateDivider(Fps(60.f), Fps(59.94f)));

}



TEST_F(RefreshRateConfigsTest, getFrameRateOverrides_noLayers) {