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

Commit e3b2036a authored by Kevin DuBois's avatar Kevin DuBois Committed by android-build-merger
Browse files

Merge "SF: delay region sampling when short on time" into qt-r1-dev 

am: 5bb93223

Change-Id: I35442a3b89cad706cf85993e698d0ea7932462cc
parents 3f4989a0 5bb93223

services/surfaceflinger/RegionSamplingThread.cpp

+19 −4
Original line number Diff line number Diff line
@@ -44,11 +44,14 @@ constexpr auto lumaSamplingStepTag = "LumaSamplingStep"; 
enum class samplingStep {

    noWorkNeeded,

    idleTimerWaiting,

    waitForQuietFrame,

    waitForZeroPhase,

    waitForSamplePhase,

    sample

};



constexpr auto timeForRegionSampling = 5000000ns;

constexpr auto maxRegionSamplingSkips = 10;

constexpr auto defaultRegionSamplingOffset = -3ms;

constexpr auto defaultRegionSamplingPeriod = 100ms;

constexpr auto defaultRegionSamplingTimerTimeout = 100ms;
@@ -215,9 +218,9 @@ void RegionSamplingThread::removeListener(const sp<IRegionSamplingListener>& lis 
void RegionSamplingThread::checkForStaleLuma() {

    std::lock_guard lock(mThreadControlMutex);



    if (mDiscardedFrames) {

    if (mDiscardedFrames > 0) {

        ATRACE_INT(lumaSamplingStepTag, static_cast<int>(samplingStep::waitForZeroPhase));

        mDiscardedFrames = false;

        mDiscardedFrames = 0;

        mPhaseCallback->startVsyncListener();

    }

}
@@ -235,13 +238,25 @@ void RegionSamplingThread::doSample() { 
    auto now = std::chrono::nanoseconds(systemTime(SYSTEM_TIME_MONOTONIC));

    if (lastSampleTime + mTunables.mSamplingPeriod > now) {

        ATRACE_INT(lumaSamplingStepTag, static_cast<int>(samplingStep::idleTimerWaiting));

        mDiscardedFrames = true;

        if (mDiscardedFrames == 0) mDiscardedFrames++;

        return;

    }

    if (mDiscardedFrames < maxRegionSamplingSkips) {

        // If there is relatively little time left for surfaceflinger

        // until the next vsync deadline, defer this sampling work

        // to a later frame, when hopefully there will be more time.

        DisplayStatInfo stats;

        mScheduler.getDisplayStatInfo(&stats);

        if (std::chrono::nanoseconds(stats.vsyncTime) - now < timeForRegionSampling) {

            ATRACE_INT(lumaSamplingStepTag, static_cast<int>(samplingStep::waitForQuietFrame));

            mDiscardedFrames++;

            return;

        }

    }



    ATRACE_INT(lumaSamplingStepTag, static_cast<int>(samplingStep::sample));



    mDiscardedFrames = false;

    mDiscardedFrames = 0;

    lastSampleTime = now;



    mIdleTimer.reset();

services/surfaceflinger/RegionSamplingThread.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ private: 
    std::condition_variable_any mCondition;

    bool mRunning GUARDED_BY(mThreadControlMutex) = true;

    bool mSampleRequested GUARDED_BY(mThreadControlMutex) = false;

    bool mDiscardedFrames GUARDED_BY(mThreadControlMutex) = false;

    uint32_t mDiscardedFrames GUARDED_BY(mThreadControlMutex) = 0;

    std::chrono::nanoseconds lastSampleTime GUARDED_BY(mThreadControlMutex);



    std::mutex mSamplingMutex;