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

Commit 2b97a830 authored by Ying Wei's avatar Ying Wei Committed by Android (Google) Code Review
Browse files

Merge "Correct SF frame interval." into main

parents 6fd87ca9 af854add

services/surfaceflinger/Scheduler/Scheduler.cpp

+5 −2
Original line number Diff line number Diff line
@@ -306,8 +306,11 @@ Period Scheduler::getVsyncPeriod(uid_t uid) { 
        const auto pacesetterOpt = pacesetterDisplayLocked();

        LOG_ALWAYS_FATAL_IF(!pacesetterOpt);

        const Display& pacesetter = *pacesetterOpt;

        return std::make_pair(pacesetter.selectorPtr->getActiveMode().fps,

                              pacesetter.schedulePtr->period());

        const FrameRateMode& frameRateMode = pacesetter.selectorPtr->getActiveMode();

        const auto refreshRate = frameRateMode.fps;

        const auto displayVsync = frameRateMode.modePtr->getVsyncRate();

        const auto numPeriod = RefreshRateSelector::getFrameRateDivisor(displayVsync, refreshRate);

        return std::make_pair(refreshRate, numPeriod * pacesetter.schedulePtr->period());

    }();



    const Period currentPeriod = period != Period::zero() ? period : refreshRate.getPeriod();

services/surfaceflinger/Scheduler/Scheduler.h

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ private: 


    // IEventThreadCallback overrides

    bool throttleVsync(TimePoint, uid_t) override;

    // Get frame interval

    Period getVsyncPeriod(uid_t) override EXCLUDES(mDisplayLock);

    void resync() override EXCLUDES(mDisplayLock);

    void onExpectedPresentTimePosted(TimePoint expectedPresentTime) override EXCLUDES(mDisplayLock);