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

Commit becd6bd4 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Moved desiredPresentTime for BLAST into State"

parents 1b397ddc fa67b553

services/surfaceflinger/BufferStateLayer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -227,10 +227,10 @@ bool BufferStateLayer::setBuffer(const sp<GraphicBuffer>& buffer, nsecs_t postTi 
    setTransactionFlags(eTransactionNeeded);



    mFlinger->mTimeStats->setPostTime(getSequence(), mFrameNumber, getName().c_str(), postTime);

    mDesiredPresentTime = desiredPresentTime;

    mCurrentState.desiredPresentTime = desiredPresentTime;



    if (mFlinger->mUseSmart90ForVideo) {

        const nsecs_t presentTime = (mDesiredPresentTime == -1) ? 0 : mDesiredPresentTime;

        const nsecs_t presentTime = (desiredPresentTime == -1) ? 0 : desiredPresentTime;

        mFlinger->mScheduler->addLayerPresentTimeAndHDR(mSchedulerLayerHandle, presentTime,

                                                        mCurrentState.hdrMetadata.validTypes != 0);

    }
@@ -384,11 +384,11 @@ bool BufferStateLayer::framePresentTimeIsCurrent(nsecs_t expectedPresentTime) co 
        return true;

    }



    return mDesiredPresentTime <= expectedPresentTime;

    return mCurrentState.desiredPresentTime <= expectedPresentTime;

}



nsecs_t BufferStateLayer::getDesiredPresentTime() {

    return mDesiredPresentTime;

    return getDrawingState().desiredPresentTime;

}



std::shared_ptr<FenceTime> BufferStateLayer::getCurrentFenceTime() const {

services/surfaceflinger/BufferStateLayer.h

+0 −2
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ private: 
    bool mReleasePreviousBuffer = false;

    nsecs_t mCallbackHandleAcquireTime = -1;



    nsecs_t mDesiredPresentTime = -1;



    // TODO(marissaw): support sticky transform for LEGACY camera mode



    class HwcSlotGenerator : public ClientCache::ErasedRecipient {

services/surfaceflinger/Layer.h

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ public: 
        // recent callback handle.

        std::deque<sp<CallbackHandle>> callbackHandles;

        bool colorSpaceAgnostic;

        nsecs_t desiredPresentTime = -1;

    };



    explicit Layer(const LayerCreationArgs& args);