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

Commit 3d8565aa authored by Vishnu Nair's avatar Vishnu Nair
Browse files

[sf] propagate FrameRateSelectionPriority to child layers 

Fixes an issue found with new fe where we did not
pass the FrameRateSelectionPriority to child layers.
Also populate the metadata from the requested state
when creating the layer snapshots.

Test: window type populated correctly in sf dump
Test: presubmit
Bug: 238781169
Change-Id: I74d970bad8079b1465764ebba34a3154ecf7ff59
parent 3cc15a4f

libs/gui/include/gui/LayerState.h

+2 −1
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ struct layer_state_t { 
            layer_state_t::HIERARCHY_CHANGES | layer_state_t::eAlphaChanged |

            layer_state_t::eColorTransformChanged | layer_state_t::eCornerRadiusChanged |

            layer_state_t::eFlagsChanged | layer_state_t::eTrustedOverlayChanged |

            layer_state_t::eFrameRateChanged | layer_state_t::eFixedTransformHintChanged;

            layer_state_t::eFrameRateChanged | layer_state_t::eFrameRateSelectionPriority |

            layer_state_t::eFixedTransformHintChanged;



    // Changes affecting data sent to input.

    static constexpr uint64_t INPUT_CHANGES = layer_state_t::eInputInfoChanged |

services/surfaceflinger/FrontEnd/LayerSnapshot.cpp

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ LayerSnapshot::LayerSnapshot(const RequestedLayerState& state, 
            ? path

            : LayerHierarchy::TraversalPath::ROOT;

    reachablilty = LayerSnapshot::Reachablilty::Unreachable;

    frameRateSelectionPriority = state.frameRateSelectionPriority;

    layerMetadata = state.metadata;

}



// As documented in libhardware header, formats in the range

services/surfaceflinger/FrontEnd/LayerSnapshot.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct LayerSnapshot : public compositionengine::LayerFECompositionState { 
    ui::Transform::RotationFlags fixedTransformHint;

    std::optional<ui::Transform::RotationFlags> transformHint;

    bool handleSkipScreenshotFlag = false;

    int32_t frameRateSelectionPriority;

    int32_t frameRateSelectionPriority = -1;

    LayerHierarchy::TraversalPath mirrorRootPath;

    uint32_t touchCropId;

    gui::Uid uid = gui::Uid::INVALID;

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp

+8 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include "DisplayHardware/HWC2.h"

#include "DisplayHardware/Hal.h"

#include "Layer.h" // eFrameRateSelectionPriority constants

#include "LayerLog.h"

#include "LayerSnapshotBuilder.h"

#include "TimeStats/TimeStats.h"
@@ -819,6 +820,13 @@ void LayerSnapshotBuilder::updateSnapshot(LayerSnapshot& snapshot, const Args& a 
                : parentSnapshot.frameRate;

    }



    if (forceUpdate || snapshot.clientChanges & layer_state_t::eFrameRateSelectionPriority) {

        snapshot.frameRateSelectionPriority =

                (requested.frameRateSelectionPriority == Layer::PRIORITY_UNSET)

                ? parentSnapshot.frameRateSelectionPriority

                : requested.frameRateSelectionPriority;

    }



    if (forceUpdate ||

        snapshot.clientChanges &

                (layer_state_t::eBackgroundBlurRadiusChanged | layer_state_t::eBlurRegionsChanged |

services/surfaceflinger/tests/unittests/LayerHierarchyTest.h

+11 −0
Original line number Diff line number Diff line
@@ -308,6 +308,17 @@ protected: 
        mLifecycleManager.applyTransactions(transactions);

    }



    void setFrameRateSelectionPriority(uint32_t id, int32_t priority) {

        std::vector<TransactionState> transactions;

        transactions.emplace_back();

        transactions.back().states.push_back({});



        transactions.back().states.front().state.what = layer_state_t::eFrameRateSelectionPriority;

        transactions.back().states.front().layerId = id;

        transactions.back().states.front().state.frameRateSelectionPriority = priority;

        mLifecycleManager.applyTransactions(transactions);

    }



    LayerLifecycleManager mLifecycleManager;

};