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

Commit 9c2cc9d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: enhance refresh rate selection"

parents 2f56c9c4 8a82ba66

services/surfaceflinger/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -165,7 +165,9 @@ filegroup { 
        "Scheduler/EventThread.cpp",

        "Scheduler/OneShotTimer.cpp",

        "Scheduler/LayerHistory.cpp",

        "Scheduler/LayerHistoryV2.cpp",

        "Scheduler/LayerInfo.cpp",

        "Scheduler/LayerInfoV2.cpp",

        "Scheduler/MessageQueue.cpp",

        "Scheduler/PhaseOffsets.cpp",

        "Scheduler/RefreshRateConfigs.cpp",

services/surfaceflinger/BufferQueueLayer.cpp

+5 −2
Original line number Diff line number Diff line
@@ -129,8 +129,11 @@ bool BufferQueueLayer::setFrameRate(float frameRate) { 
    return frameRateChanged;

}



float BufferQueueLayer::getFrameRate() const {

std::optional<float> BufferQueueLayer::getFrameRate() const {

    if (mLatchedFrameRate > 0.f || mLatchedFrameRate == FRAME_RATE_NO_VOTE)

        return mLatchedFrameRate;



    return {};

}



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

services/surfaceflinger/BufferQueueLayer.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public: 
    bool shouldPresentNow(nsecs_t expectedPresentTime) const override;



    bool setFrameRate(float frameRate) override;

    float getFrameRate() const override;

    std::optional<float> getFrameRate() const override;



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

services/surfaceflinger/BufferStateLayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -253,7 +253,8 @@ bool BufferStateLayer::setBuffer(const sp<GraphicBuffer>& buffer, nsecs_t postTi 
                                           FrameTracer::FrameEvent::POST);

    mCurrentState.desiredPresentTime = desiredPresentTime;



    mFlinger->mScheduler->recordLayerHistory(this, desiredPresentTime);

    mFlinger->mScheduler->recordLayerHistory(this,

                                             desiredPresentTime <= 0 ? 0 : desiredPresentTime);



    return true;

}

services/surfaceflinger/DisplayDevice.h

+4 −2
Original line number Diff line number Diff line
@@ -227,8 +227,10 @@ class DisplayRenderArea : public RenderArea { 
public:

    DisplayRenderArea(const sp<const DisplayDevice>& display,

                      RotationFlags rotation = ui::Transform::ROT_0)

          : DisplayRenderArea(display, display->getBounds(), display->getWidth(),

                              display->getHeight(), display->getCompositionDataSpace(), rotation) {}

          : DisplayRenderArea(display, display->getBounds(),

                              static_cast<uint32_t>(display->getWidth()),

                              static_cast<uint32_t>(display->getHeight()),

                              display->getCompositionDataSpace(), rotation) {}



    DisplayRenderArea(sp<const DisplayDevice> display, const Rect& sourceCrop, uint32_t reqWidth,

                      uint32_t reqHeight, ui::Dataspace reqDataSpace, RotationFlags rotation,