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

Commit 41f8a75f authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "Propagate frame rate correctly to child layers" into main

parents a53635f8 30515cb7

services/surfaceflinger/FrontEnd/LayerSnapshot.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ struct LayerSnapshot : public compositionengine::LayerFECompositionState { 
    bool isTrustedOverlay;

    gui::GameMode gameMode;

    scheduler::LayerInfo::FrameRate frameRate;

    scheduler::LayerInfo::FrameRate inheritedFrameRate;

    scheduler::LayerInfo::FrameRateSelectionStrategy frameRateSelectionStrategy;

    scheduler::FrameRateCompatibility defaultFrameRateCompatibility =

            scheduler::FrameRateCompatibility::Default;

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp

+8 −3
Original line number Diff line number Diff line
@@ -815,9 +815,14 @@ void LayerSnapshotBuilder::updateSnapshot(LayerSnapshot& snapshot, const Args& a 
                             RequestedLayerState::Changes::Hierarchy)) {

        bool shouldOverrideChildren = parentSnapshot.frameRateSelectionStrategy ==

                scheduler::LayerInfo::FrameRateSelectionStrategy::OverrideChildren;

        snapshot.frameRate = !requested.requestedFrameRate.isValid() || shouldOverrideChildren

                ? parentSnapshot.frameRate

                : requested.requestedFrameRate;

        if (!requested.requestedFrameRate.isValid() || shouldOverrideChildren) {

            snapshot.inheritedFrameRate = parentSnapshot.inheritedFrameRate;

        } else {

            snapshot.inheritedFrameRate = requested.requestedFrameRate;

        }

        // Set the framerate as the inherited frame rate and allow children to override it if

        // needed.

        snapshot.frameRate = snapshot.inheritedFrameRate;

        snapshot.changes |= RequestedLayerState::Changes::FrameRate;

    }

services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp

+37 −11
Original line number Diff line number Diff line
@@ -282,25 +282,51 @@ TEST_F(LayerSnapshotTest, NoLayerVoteForParentWithChildVotes) { 
    // │   └── 13

    // └── 2



    std::vector<TransactionState> transactions;

    transactions.emplace_back();

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

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

    transactions.back().states.front().state.frameRate = 90.0;

    transactions.back().states.front().state.frameRateCompatibility =

            ANATIVEWINDOW_FRAME_RATE_EXACT;

    transactions.back().states.front().state.changeFrameRateStrategy =

            ANATIVEWINDOW_CHANGE_FRAME_RATE_ALWAYS;

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

    mLifecycleManager.applyTransactions(transactions);

    setFrameRate(11, 90.0, ANATIVEWINDOW_FRAME_RATE_EXACT, ANATIVEWINDOW_CHANGE_FRAME_RATE_ALWAYS);

    UPDATE_AND_VERIFY(mSnapshotBuilder, STARTING_ZORDER);



    EXPECT_EQ(getSnapshot(11)->frameRate.vote.rate.getIntValue(), 90);

    EXPECT_EQ(getSnapshot(11)->frameRate.vote.type, scheduler::FrameRateCompatibility::Exact);

    EXPECT_EQ(getSnapshot(111)->frameRate.vote.rate.getIntValue(), 90);

    EXPECT_EQ(getSnapshot(111)->frameRate.vote.type, scheduler::FrameRateCompatibility::Exact);

    EXPECT_EQ(getSnapshot(1)->frameRate.vote.rate.getIntValue(), 0);

    EXPECT_EQ(getSnapshot(1)->frameRate.vote.type, scheduler::FrameRateCompatibility::NoVote);

}



TEST_F(LayerSnapshotTest, NoLayerVoteForParentWithChildVotesDoesNotAffectSiblings) {

    // ROOT

    // ├── 1 (verify layer has no vote)

    // │   ├── 11 (frame rate set)

    // │   │   └── 111

    // │   ├── 12 (frame rate set)

    // │   │   ├── 121

    // │   │   └── 122

    // │   │       └── 1221

    // │   └── 13 (verify layer has default vote)

    // └── 2



    setFrameRate(11, 90.0, ANATIVEWINDOW_FRAME_RATE_EXACT, ANATIVEWINDOW_CHANGE_FRAME_RATE_ALWAYS);

    setFrameRate(12, 45.0, ANATIVEWINDOW_FRAME_RATE_EXACT, ANATIVEWINDOW_CHANGE_FRAME_RATE_ALWAYS);



    UPDATE_AND_VERIFY(mSnapshotBuilder, STARTING_ZORDER);



    EXPECT_EQ(getSnapshot(11)->frameRate.vote.rate.getIntValue(), 90);

    EXPECT_EQ(getSnapshot(11)->frameRate.vote.type, scheduler::FrameRateCompatibility::Exact);

    EXPECT_EQ(getSnapshot(111)->frameRate.vote.rate.getIntValue(), 90);

    EXPECT_EQ(getSnapshot(111)->frameRate.vote.type, scheduler::FrameRateCompatibility::Exact);

    EXPECT_EQ(getSnapshot(12)->frameRate.vote.rate.getIntValue(), 45);

    EXPECT_EQ(getSnapshot(12)->frameRate.vote.type, scheduler::FrameRateCompatibility::Exact);

    EXPECT_EQ(getSnapshot(121)->frameRate.vote.rate.getIntValue(), 45);

    EXPECT_EQ(getSnapshot(121)->frameRate.vote.type, scheduler::FrameRateCompatibility::Exact);

    EXPECT_EQ(getSnapshot(1221)->frameRate.vote.rate.getIntValue(), 45);

    EXPECT_EQ(getSnapshot(1221)->frameRate.vote.type, scheduler::FrameRateCompatibility::Exact);



    EXPECT_EQ(getSnapshot(1)->frameRate.vote.rate.getIntValue(), 0);

    EXPECT_EQ(getSnapshot(1)->frameRate.vote.type, scheduler::FrameRateCompatibility::NoVote);

    EXPECT_EQ(getSnapshot(13)->frameRate.vote.rate.getIntValue(), 0);

    EXPECT_EQ(getSnapshot(13)->frameRate.vote.type, scheduler::FrameRateCompatibility::Default);

    EXPECT_EQ(getSnapshot(2)->frameRate.vote.rate.getIntValue(), 0);

    EXPECT_EQ(getSnapshot(2)->frameRate.vote.type, scheduler::FrameRateCompatibility::Default);

}



TEST_F(LayerSnapshotTest, CanCropTouchableRegion) {