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

Commit fc523426 authored by ramindani's avatar ramindani
Browse files

Enable vrr_config flag for RefreshRateSelectorTest 

BUG: 284845445
Test: atest RefreshRateSelectorTest
Change-Id: I4d4e2c5734b41c8efc5eb5edf8916e83404d1da5
parent 4bc3f3a5

services/surfaceflinger/tests/unittests/RefreshRateSelectorTest.cpp

+15 −7
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "mock/DisplayHardware/MockDisplayMode.h"

#include "mock/MockFrameRateMode.h"



#include "FlagUtils.h"

#include "libsurfaceflinger_unittest_main.h"



#include <com_android_graphics_surfaceflinger_flags.h>
@@ -1539,10 +1540,11 @@ TEST_P(RefreshRateSelectorTest, getBestFrameRateMode_withFrameRateCategory_60_12 


TEST_P(RefreshRateSelectorTest,

       getBestFrameRateMode_withFrameRateCategory_smoothSwitchOnly_60_120_nonVrr) {

    if (GetParam() != Config::FrameRateOverride::Enabled || flags::vrr_config()) {

    if (GetParam() != Config::FrameRateOverride::Enabled) {

        return;

    }



    SET_FLAG_FOR_TEST(flags::vrr_config, false);

    // VRR compatibility is determined by the presence of a vrr config in the DisplayMode.

    auto selector = createSelector(makeModes(kMode60, kMode120), kModeId120);
@@ -1606,10 +1608,11 @@ TEST_P(RefreshRateSelectorTest, 


TEST_P(RefreshRateSelectorTest,

       getBestFrameRateMode_withFrameRateCategory_smoothSwitchOnly_60_120_vrr) {

    if (GetParam() != Config::FrameRateOverride::Enabled || !flags::vrr_config()) {

    if (GetParam() != Config::FrameRateOverride::Enabled) {

        return;

    }



    SET_FLAG_FOR_TEST(flags::vrr_config, true);

    // VRR compatibility is determined by the presence of a vrr config in the DisplayMode.

    auto selector = createSelector(kVrrModes_60_120, kModeId120);
@@ -3486,10 +3489,11 @@ TEST_P(RefreshRateSelectorTest, frameRateOverrideInBlockingZone60_90_NonDivisor) 


// VRR tests

TEST_P(RefreshRateSelectorTest, singleMinMaxRateForVrr) {

    if (GetParam() != Config::FrameRateOverride::Enabled || !flags::vrr_config()) {

    if (GetParam() != Config::FrameRateOverride::Enabled) {

        return;

    }



    SET_FLAG_FOR_TEST(flags::vrr_config, true);

    auto selector = createSelector(kVrrMode_120, kModeId120);

    EXPECT_TRUE(selector.supportsFrameRateOverride());
@@ -3505,10 +3509,11 @@ TEST_P(RefreshRateSelectorTest, singleMinMaxRateForVrr) { 
}



TEST_P(RefreshRateSelectorTest, renderRateChangesWithPolicyChangeForVrr) {

    if (GetParam() != Config::FrameRateOverride::Enabled || !flags::vrr_config()) {

    if (GetParam() != Config::FrameRateOverride::Enabled) {

        return;

    }



    SET_FLAG_FOR_TEST(flags::vrr_config, true);

    auto selector = createSelector(kVrrModes_60_120, kModeId120);



    const FpsRange only120 = {120_Hz, 120_Hz};
@@ -3562,10 +3567,11 @@ TEST_P(RefreshRateSelectorTest, renderRateChangesWithPolicyChangeForVrr) { 
}



TEST_P(RefreshRateSelectorTest, modeChangesWithPolicyChangeForVrr) {

    if (GetParam() != Config::FrameRateOverride::Enabled || !flags::vrr_config()) {

    if (GetParam() != Config::FrameRateOverride::Enabled) {

        return;

    }



    SET_FLAG_FOR_TEST(flags::vrr_config, true);

    auto selector = createSelector(kVrrModes_60_120, kModeId120);



    const FpsRange range120 = {0_Hz, 120_Hz};
@@ -3585,10 +3591,11 @@ TEST_P(RefreshRateSelectorTest, modeChangesWithPolicyChangeForVrr) { 
}



TEST_P(RefreshRateSelectorTest, getFrameRateOverridesForVrr) {

    if (GetParam() != Config::FrameRateOverride::Enabled || !flags::vrr_config()) {

    if (GetParam() != Config::FrameRateOverride::Enabled) {

        return;

    }



    SET_FLAG_FOR_TEST(flags::vrr_config, true);

    auto selector = createSelector(kVrrMode_120, kModeId120);

    // TODO(b/297600226) Run at lower than 30 Fps for dVRR

    const std::vector<Fps> desiredRefreshRates = {30_Hz, 34.285_Hz, 40_Hz, 48_Hz,
@@ -3614,10 +3621,11 @@ TEST_P(RefreshRateSelectorTest, getFrameRateOverridesForVrr) { 
}



TEST_P(RefreshRateSelectorTest, renderFrameRatesForVrr) {

    if (GetParam() != Config::FrameRateOverride::Enabled || !flags::vrr_config()) {

    if (GetParam() != Config::FrameRateOverride::Enabled) {

        return;

    }



    SET_FLAG_FOR_TEST(flags::vrr_config, true);

    auto selector = createSelector(kVrrMode_120, kModeId120);

    const FpsRange only120 = {120_Hz, 120_Hz};

    const FpsRange range120 = {0_Hz, 120_Hz};