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

Commit abb701a1 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: DispSync -> VsyncController"

parents c6975fbf 8cb2188b

libs/gui/include/gui/DisplayEventReceiver.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,7 @@ public: 
        struct VSync {

        struct VSync {

            uint32_t count;

            uint32_t count;

            nsecs_t expectedVSyncTimestamp __attribute__((aligned(8)));

            nsecs_t expectedVSyncTimestamp __attribute__((aligned(8)));

            nsecs_t deadlineTimestamp __attribute__((aligned(8)));

        };

        };





        struct Hotplug {

        struct Hotplug {

services/surfaceflinger/BufferLayerConsumer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 




#include "BufferLayerConsumer.h"

#include "BufferLayerConsumer.h"

#include "Layer.h"

#include "Layer.h"

#include "Scheduler/DispSync.h"

#include "Scheduler/VsyncController.h"





#include <inttypes.h>

#include <inttypes.h>

services/surfaceflinger/BufferLayerConsumer.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ 
namespace android {

namespace android {

// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------





class DispSync;

class Layer;

class Layer;

class String8;

class String8;

services/surfaceflinger/RegionSamplingThread.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include "DisplayRenderArea.h"

#include "DisplayRenderArea.h"

#include "Layer.h"

#include "Layer.h"

#include "Promise.h"

#include "Promise.h"

#include "Scheduler/DispSync.h"

#include "Scheduler/VsyncController.h"

#include "SurfaceFlinger.h"

#include "SurfaceFlinger.h"





namespace android {

namespace android {
@@ -249,7 +249,7 @@ void RegionSamplingThread::doSample() { 
        // until the next vsync deadline, defer this sampling work

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

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

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

        DisplayStatInfo stats;

        DisplayStatInfo stats;

        mScheduler.getDisplayStatInfo(&stats);

        mScheduler.getDisplayStatInfo(&stats, systemTime());

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

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

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

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

            mDiscardedFrames++;

            mDiscardedFrames++;

services/surfaceflinger/Scheduler/DispSyncSource.cpp

+1 −4
Original line number Original line Diff line number Diff line
@@ -22,16 +22,13 @@ 
#include <utils/Trace.h>

#include <utils/Trace.h>

#include <mutex>

#include <mutex>





#include "DispSync.h"

#include "EventThread.h"

#include "EventThread.h"

#include "VsyncController.h"





namespace android::scheduler {

namespace android::scheduler {

using base::StringAppendF;

using base::StringAppendF;

using namespace std::chrono_literals;

using namespace std::chrono_literals;





// The DispSync interface has a 'repeat this callback at rate' semantic. This object adapts

// VSyncDispatch's individually-scheduled callbacks so as to meet DispSync's existing semantic

// for now.

class CallbackRepeater {

class CallbackRepeater {

public:

public:

    CallbackRepeater(VSyncDispatch& dispatch, VSyncDispatch::Callback cb, const char* name,

    CallbackRepeater(VSyncDispatch& dispatch, VSyncDispatch::Callback cb, const char* name,