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

Commit 673f3aa7 authored by Ram Indani's avatar Ram Indani Committed by Android (Google) Code Review
Browse files

Merge "[Native] FRAME_RATE_COMPATIBILITY_GTE renamed to... 

Merge "[Native] FRAME_RATE_COMPATIBILITY_GTE renamed to FRAME_RATE_COMPATIBILITY_AT_LEAST" into main
parents 10fcdbed bcde3ec6

libs/gui/FrameRateUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ bool ValidateFrameRate(float frameRate, int8_t compatibility, int8_t changeFrame 


    if (compatibility != ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT &&

        compatibility != ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE &&

        compatibility != ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_GTE &&

        compatibility != ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_AT_LEAST &&

        (!privileged ||

         (compatibility != ANATIVEWINDOW_FRAME_RATE_EXACT &&

          compatibility != ANATIVEWINDOW_FRAME_RATE_NO_VOTE))) {

libs/gui/tests/FrameRateUtilsTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ TEST(FrameRateUtilsTest, ValidateFrameRate) { 
                                  ANATIVEWINDOW_CHANGE_FRAME_RATE_ALWAYS, ""));

    EXPECT_TRUE(ValidateFrameRate(60.0f, ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,

                                  ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS, ""));

    EXPECT_TRUE(ValidateFrameRate(60.0f, ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_GTE,

    EXPECT_TRUE(ValidateFrameRate(60.0f, ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_AT_LEAST,

                                  ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS, ""));



    // Privileged APIs.

libs/nativewindow/include/android/native_window.h

+2 −2
Original line number Diff line number Diff line
@@ -258,11 +258,11 @@ enum ANativeWindow_FrameRateCompatibility { 
    ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE = 1,



    /**

     * The window requests a frame rate that is greater than or equal to the specified frame rate.

     * The window requests a frame rate that is at least the specified frame rate.

     * This value should be used for UIs, animations, scrolling, and anything that is not a game

     * or video.

     */

    ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_GTE = 2

    ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_AT_LEAST = 2

};



/**

services/surfaceflinger/Scheduler/LayerInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ FrameRateCompatibility LayerInfo::FrameRate::convertCompatibility(int8_t compati 
            return FrameRateCompatibility::Exact;

        case ANATIVEWINDOW_FRAME_RATE_MIN:

            return FrameRateCompatibility::Min;

        case ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_GTE:

        case ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_AT_LEAST:

            return FrameRateCompatibility::Gte;

        case ANATIVEWINDOW_FRAME_RATE_NO_VOTE:

            return FrameRateCompatibility::NoVote;

services/surfaceflinger/tests/unittests/LayerHistoryIntegrationTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ TEST_F(LayerHistoryIntegrationTest, oneLayerExplicitGte_vrr) { 


    auto layer = createLegacyAndFrontedEndLayer(1);

    showLayer(1);

    setFrameRate(1, (33_Hz).getValue(), ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_GTE,

    setFrameRate(1, (33_Hz).getValue(), ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_AT_LEAST,

                 ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);

    setFrameRateCategory(1, 0);
@@ -623,7 +623,7 @@ TEST_F(LayerHistoryIntegrationTest, oneLayerExplicitGte_nonVrr) { 


    auto layer = createLegacyAndFrontedEndLayer(1);

    showLayer(1);

    setFrameRate(1, (33_Hz).getValue(), ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_GTE,

    setFrameRate(1, (33_Hz).getValue(), ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_AT_LEAST,

                 ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);

    setFrameRateCategory(1, 0);
@@ -662,7 +662,7 @@ TEST_F(LayerHistoryIntegrationTest, oneLayerGteNoVote_arr) { 


    auto layer = createLegacyAndFrontedEndLayer(1);

    showLayer(1);

    setFrameRate(1, (0_Hz).getValue(), ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_GTE,

    setFrameRate(1, (0_Hz).getValue(), ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_AT_LEAST,

                 ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);



    EXPECT_EQ(1u, layerCount());
@@ -694,7 +694,7 @@ TEST_F(LayerHistoryIntegrationTest, oneLayerGteNoVote_mrr) { 


    auto layer = createLegacyAndFrontedEndLayer(1);

    showLayer(1);

    setFrameRate(1, (0_Hz).getValue(), ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_GTE,

    setFrameRate(1, (0_Hz).getValue(), ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_AT_LEAST,

                 ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);

    setFrameRateCategory(1, 0);