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

Commit 6a209a7a authored by Sally Qi's avatar Sally Qi
Browse files

[HDR metrics] Add metrics for logging requested headroom in the 

SurfaceControlEvents

Bug: 383391288
Test: builds
Flag: EXEMPT proto cannot be flagged
Change-Id: Ic1c70b48cb556ec0803f55c4a3d076d7c2a7a3a8
parent 66f2fb13

services/surfaceflinger/Layer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1344,6 +1344,7 @@ void Layer::gatherBufferInfo() { 
    }



    if (mLastLayerEvent->dataspace != mBufferInfo.mDataspace ||

        mLastLayerEvent->desiredHdrHeadroom != mBufferInfo.mDesiredHdrSdrRatio ||

        mLastLayerEvent->useLuts != mDrawingState.useLuts ||

        mTimeSinceLayerEventsUpdate == std::chrono::steady_clock::time_point::min()) {

        const auto currentTime = std::chrono::steady_clock::now();
@@ -1356,6 +1357,7 @@ void Layer::gatherBufferInfo() { 
        mTimeSinceLayerEventsUpdate = currentTime;

        mLastLayerEvent->dataspace = mBufferInfo.mDataspace;

        mLastLayerEvent->useLuts = mDrawingState.useLuts;

        mLastLayerEvent->desiredHdrHeadroom = mBufferInfo.mDesiredHdrSdrRatio;

    }

}

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -3389,7 +3389,8 @@ void SurfaceFlinger::onCompositionPresented(PhysicalDisplayId pacesetterId, 
                                   static_cast<int32_t>(layerEvent.uid),

                                   static_cast<int64_t>(layerEvent.timeSinceLastEvent.count()),

                                   static_cast<int32_t>(layerEvent.dataspace),

                                   static_cast<bool>(layerEvent.useLuts));

                                   static_cast<bool>(layerEvent.useLuts),

                                   static_cast<float>(layerEvent.desiredHdrHeadroom));

        if (result < 0) {

            ALOGW("Failed to report layer event with error: %d", result);

        }

services/surfaceflinger/SurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,7 @@ private: 
        ui::Dataspace dataspace;

        std::chrono::milliseconds timeSinceLastEvent;

        bool useLuts;

        float desiredHdrHeadroom;

    };

    std::vector<LayerEvent> mLayerEvents;