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

Commit 5f489bd9 authored by Ady Abraham's avatar Ady Abraham
Browse files

Revert "SurfaceFlinger: use queueTime as well when calculating refresh rate" 

This reverts commit 49e65e42.

Reason for revert: Different fix was applied to b/155710271

Change-Id: Ic70812309b3acbd85ece80fce7e9769e19126d13
Bug: 155710271
parent 942c5370

services/surfaceflinger/Scheduler/LayerInfoV2.cpp

+6 −10
Original line number Diff line number Diff line
@@ -130,16 +130,12 @@ std::optional<float> LayerInfoV2::calculateRefreshRateIfPossible() { 
    // Now once we calculated the refresh rate we need to make sure that all the frames we captured

    // are evenly distributed and we don't calculate the average across some burst of frames.

    for (auto it = mFrameTimes.begin(); it != mFrameTimes.end() - 1; ++it) {

        const nsecs_t frameTimeDeltas = [&] {

            nsecs_t delta;

        if (it->presetTime == 0 || (it + 1)->presetTime == 0) {

                delta = (it + 1)->queueTime - it->queueTime;

            } else {

                delta = (it + 1)->presetTime - it->presetTime;

            continue;

        }

            return std::max(delta, mHighRefreshRatePeriod);

        }();

        if (std::abs(frameTimeDeltas - averageFrameTime) > 2 * averageFrameTime) {

        const nsecs_t presentTimeDeltas =

                std::max(((it + 1)->presetTime - it->presetTime), mHighRefreshRatePeriod);

        if (std::abs(presentTimeDeltas - averageFrameTime) > 2 * averageFrameTime) {

            return std::nullopt;

        }

    }