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

Commit 17f2daed authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "SurfaceFlinger: fix infrequent frames logic" into rvc-dev am: 7e221c91 

Change-Id: I2cd9d578906fd5c82fe6f32e49bc8359ed106670
parents c4f3ee9f 7e221c91

services/surfaceflinger/Scheduler/LayerInfoV2.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -82,14 +82,14 @@ bool LayerInfoV2::isFrequent(nsecs_t now) const { 
        }

        }

    }

    }





    const auto numFrames = std::distance(it, mFrameTimes.end()) - 1;

    const auto numFrames = std::distance(it, mFrameTimes.end());

    if (numFrames <= 0) {

    if (numFrames < FREQUENT_LAYER_WINDOW_SIZE) {

        return false;

        return false;

    }

    }





    // Layer is considered frequent if the average frame rate is higher than the threshold

    // Layer is considered frequent if the average frame rate is higher than the threshold

    const auto totalTime = mFrameTimes.back().queueTime - it->queueTime;

    const auto totalTime = mFrameTimes.back().queueTime - it->queueTime;

    return (1e9f * numFrames) / totalTime >= MIN_FPS_FOR_FREQUENT_LAYER;

    return (1e9f * (numFrames - 1)) / totalTime >= MIN_FPS_FOR_FREQUENT_LAYER;

}

}





bool LayerInfoV2::hasEnoughDataForHeuristic() const {

bool LayerInfoV2::hasEnoughDataForHeuristic() const {

services/surfaceflinger/tests/unittests/LayerHistoryTestV2.cpp

+57 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ class LayerHistoryTestV2 : public testing::Test { 
protected:

protected:

    static constexpr auto PRESENT_TIME_HISTORY_SIZE = LayerInfoV2::HISTORY_SIZE;

    static constexpr auto PRESENT_TIME_HISTORY_SIZE = LayerInfoV2::HISTORY_SIZE;

    static constexpr auto MAX_FREQUENT_LAYER_PERIOD_NS = LayerInfoV2::MAX_FREQUENT_LAYER_PERIOD_NS;

    static constexpr auto MAX_FREQUENT_LAYER_PERIOD_NS = LayerInfoV2::MAX_FREQUENT_LAYER_PERIOD_NS;

    static constexpr auto FREQUENT_LAYER_WINDOW_SIZE = LayerInfoV2::FREQUENT_LAYER_WINDOW_SIZE;





    static constexpr float LO_FPS = 30.f;

    static constexpr float LO_FPS = 30.f;

    static constexpr auto LO_FPS_PERIOD = static_cast<nsecs_t>(1e9f / LO_FPS);

    static constexpr auto LO_FPS_PERIOD = static_cast<nsecs_t>(1e9f / LO_FPS);
@@ -451,5 +452,61 @@ TEST_F(LayerHistoryTestV2, multipleLayers) { 
    EXPECT_EQ(0, frequentLayerCount(time));

    EXPECT_EQ(0, frequentLayerCount(time));

}

}





TEST_F(LayerHistoryTestV2, inactiveLayers) {

    auto layer = createLayer();



    EXPECT_CALL(*layer, isVisible()).WillRepeatedly(Return(true));

    EXPECT_CALL(*layer, getFrameRate()).WillRepeatedly(Return(Layer::FrameRate()));



    nsecs_t time = systemTime();



    // the very first updates makes the layer frequent

    for (int i = 0; i < FREQUENT_LAYER_WINDOW_SIZE - 1; i++) {

        history().record(layer.get(), time, time);

        time += MAX_FREQUENT_LAYER_PERIOD_NS.count();



        EXPECT_EQ(1, layerCount());

        ASSERT_EQ(1, history().summarize(time).size());

        EXPECT_EQ(LayerHistory::LayerVoteType::Max, history().summarize(time)[0].vote);

        EXPECT_EQ(1, activeLayerCount());

        EXPECT_EQ(1, frequentLayerCount(time));

    }



    // the next update with the MAX_FREQUENT_LAYER_PERIOD_NS will get us to infrequent

    history().record(layer.get(), time, time);

    time += MAX_FREQUENT_LAYER_PERIOD_NS.count();



    EXPECT_EQ(1, layerCount());

    ASSERT_EQ(1, history().summarize(time).size());

    EXPECT_EQ(LayerHistory::LayerVoteType::Min, history().summarize(time)[0].vote);

    EXPECT_EQ(1, activeLayerCount());

    EXPECT_EQ(0, frequentLayerCount(time));



    // advance the time for the previous frame to be inactive

    time += MAX_ACTIVE_LAYER_PERIOD_NS.count();



    // Now event if we post a quick few frame we should stay infrequent

    for (int i = 0; i < FREQUENT_LAYER_WINDOW_SIZE - 1; i++) {

        history().record(layer.get(), time, time);

        time += HI_FPS_PERIOD;



        EXPECT_EQ(1, layerCount());

        ASSERT_EQ(1, history().summarize(time).size());

        EXPECT_EQ(LayerHistory::LayerVoteType::Min, history().summarize(time)[0].vote);

        EXPECT_EQ(1, activeLayerCount());

        EXPECT_EQ(0, frequentLayerCount(time));

    }



    // More quick frames will get us to frequent again

    history().record(layer.get(), time, time);

    time += HI_FPS_PERIOD;



    EXPECT_EQ(1, layerCount());

    ASSERT_EQ(1, history().summarize(time).size());

    EXPECT_EQ(LayerHistory::LayerVoteType::Max, history().summarize(time)[0].vote);

    EXPECT_EQ(1, activeLayerCount());

    EXPECT_EQ(1, frequentLayerCount(time));

}



} // namespace

} // namespace

} // namespace android::scheduler
 
} // namespace android::scheduler