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

Commit 1ca8460a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "SurfaceFlinger: getRefreshRateForContentV2 always returns valid config"... 

Merge "SurfaceFlinger: getRefreshRateForContentV2 always returns valid config" into rvc-dev am: 2a95359e

Change-Id: I40f7b8ce899be377b892b6a21e8b61f913583a6a
parents 46fdadde 2a95359e

services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -235,13 +235,13 @@ const RefreshRate& RefreshRateConfigs::getRefreshRateForContentV2( 
            ? getBestRefreshRate(scores.rbegin(), scores.rend())

            ? getBestRefreshRate(scores.rbegin(), scores.rend())

            : getBestRefreshRate(scores.begin(), scores.end());

            : getBestRefreshRate(scores.begin(), scores.end());





    return bestRefreshRate == nullptr ? *mCurrentRefreshRate : *bestRefreshRate;

    return *bestRefreshRate;

}

}





template <typename Iter>

template <typename Iter>

const RefreshRate* RefreshRateConfigs::getBestRefreshRate(Iter begin, Iter end) const {

const RefreshRate* RefreshRateConfigs::getBestRefreshRate(Iter begin, Iter end) const {

    const RefreshRate* bestRefreshRate = nullptr;

    const RefreshRate* bestRefreshRate = begin->first;

    float max = 0;

    float max = begin->second;

    for (auto i = begin; i != end; ++i) {

    for (auto i = begin; i != end; ++i) {

        const auto [refreshRate, score] = *i;

        const auto [refreshRate, score] = *i;

        ALOGV("%s scores %.2f", refreshRate->name.c_str(), score);

        ALOGV("%s scores %.2f", refreshRate->name.c_str(), score);