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

Commit aabba33a authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5746125 from e35878ce to qt-qpr1-release 

Change-Id: I0c91f66b7816a13f6fc44f6ab6d57962a7d9fa23
parents f8828992 e35878ce

services/surfaceflinger/Scheduler/LayerInfo.h

+2 −2
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ class LayerInfo { 


    private:

        std::deque<nsecs_t> mElements;

        static constexpr size_t HISTORY_SIZE = 10;

        static constexpr std::chrono::nanoseconds HISTORY_TIME = 500ms;

        static constexpr size_t HISTORY_SIZE = 90;

        static constexpr std::chrono::nanoseconds HISTORY_TIME = 1s;

    };



public:

services/surfaceflinger/tests/unittests/LayerHistoryTest.cpp

+34 −26
Original line number Diff line number Diff line
@@ -27,6 +27,15 @@ protected: 


    static constexpr float MIN_REFRESH_RATE = 30.f;

    static constexpr float MAX_REFRESH_RATE = 90.f;

    static constexpr auto RELEVANT_FRAME_THRESHOLD = 90u;

    static constexpr uint64_t THIRTY_FPS_INTERVAL = 33'333'333;



    void forceRelevancy(const std::unique_ptr<LayerHistory::LayerHandle>& testLayer) {

        mLayerHistory->setVisibility(testLayer, true);

        for (auto i = 0u; i < RELEVANT_FRAME_THRESHOLD; i++) {

            mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

        }

    };

};



LayerHistoryTest::LayerHistoryTest() {
@@ -39,24 +48,18 @@ TEST_F(LayerHistoryTest, oneLayer) { 
    std::unique_ptr<LayerHistory::LayerHandle> testLayer =

            mLayerHistory->createLayer("TestLayer", MIN_REFRESH_RATE, MAX_REFRESH_RATE);

    mLayerHistory->setVisibility(testLayer, true);



    mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    EXPECT_FLOAT_EQ(0.f, mLayerHistory->getDesiredRefreshRateAndHDR().first);



    mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    // This is still 0, because the layer is not considered recently active if it

    // has been present in less than 10 frames.

    for (auto i = 0u; i < RELEVANT_FRAME_THRESHOLD; i++) {

        EXPECT_FLOAT_EQ(0.f, mLayerHistory->getDesiredRefreshRateAndHDR().first);

        mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    // This should be MAX_REFRESH_RATE as we have more than 10 samples

    }



    // Add a few more. This time we should get MAX refresh rate as the layer

    // becomes relevant

    static constexpr auto A_FEW = 10;

    for (auto i = 0u; i < A_FEW; i++) {

        EXPECT_FLOAT_EQ(MAX_REFRESH_RATE, mLayerHistory->getDesiredRefreshRateAndHDR().first);

        mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    }

}



TEST_F(LayerHistoryTest, oneHDRLayer) {
@@ -79,8 +82,9 @@ TEST_F(LayerHistoryTest, explicitTimestamp) { 
    mLayerHistory->setVisibility(test30FpsLayer, true);



    nsecs_t startTime = systemTime();

    for (int i = 0; i < 31; i++) {

        mLayerHistory->insert(test30FpsLayer, startTime + (i * 33333333), false /*isHDR*/);

    for (int i = 0; i < RELEVANT_FRAME_THRESHOLD; i++) {

        mLayerHistory->insert(test30FpsLayer, startTime + (i * THIRTY_FPS_INTERVAL),

                              false /*isHDR*/);

    }



    EXPECT_FLOAT_EQ(30.f, mLayerHistory->getDesiredRefreshRateAndHDR().first);
@@ -98,19 +102,21 @@ TEST_F(LayerHistoryTest, multipleLayers) { 
    mLayerHistory->setVisibility(testLayer2, true);



    nsecs_t startTime = systemTime();

    for (int i = 0; i < 10; i++) {

    for (int i = 0; i < RELEVANT_FRAME_THRESHOLD; i++) {

        mLayerHistory->insert(testLayer, 0, false /*isHDR*/);

    }

    EXPECT_FLOAT_EQ(MAX_REFRESH_RATE, mLayerHistory->getDesiredRefreshRateAndHDR().first);



    startTime = systemTime();

    for (int i = 0; i < 10; i++) {

        mLayerHistory->insert(test30FpsLayer, startTime + (i * 33333333), false /*isHDR*/);

    for (int i = 0; i < RELEVANT_FRAME_THRESHOLD; i++) {

        mLayerHistory->insert(test30FpsLayer, startTime + (i * THIRTY_FPS_INTERVAL),

                              false /*isHDR*/);

    }

    EXPECT_FLOAT_EQ(MAX_REFRESH_RATE, mLayerHistory->getDesiredRefreshRateAndHDR().first);



    for (int i = 10; i < 30; i++) {

        mLayerHistory->insert(test30FpsLayer, startTime + (i * 33333333), false /*isHDR*/);

    for (int i = 10; i < RELEVANT_FRAME_THRESHOLD; i++) {

        mLayerHistory->insert(test30FpsLayer, startTime + (i * THIRTY_FPS_INTERVAL),

                              false /*isHDR*/);

    }

    EXPECT_FLOAT_EQ(MAX_REFRESH_RATE, mLayerHistory->getDesiredRefreshRateAndHDR().first);
@@ -122,8 +128,10 @@ TEST_F(LayerHistoryTest, multipleLayers) { 
    EXPECT_FLOAT_EQ(MAX_REFRESH_RATE, mLayerHistory->getDesiredRefreshRateAndHDR().first);

    // After 1200 ms frames become obsolete.

    std::this_thread::sleep_for(std::chrono::milliseconds(1500));

    // Insert the 31st frame.

    mLayerHistory->insert(test30FpsLayer, startTime + (30 * 33333333), false /*isHDR*/);



    mLayerHistory->insert(test30FpsLayer,

                          startTime + (RELEVANT_FRAME_THRESHOLD * THIRTY_FPS_INTERVAL),

                          false /*isHDR*/);

    EXPECT_FLOAT_EQ(30.f, mLayerHistory->getDesiredRefreshRateAndHDR().first);

}