diff options
author | 2023-11-22 11:24:02 -0800 | |
---|---|---|
committer | 2023-11-22 11:24:02 -0800 | |
commit | 70f7b69bb8f69ed78526d304c0a165b5ca54141e (patch) | |
tree | ffc14e05e4edf4b0f4e793bbbc60c2adf09b41ac | |
parent | a021bb0f099587dc41b6eec042a004be9404cde1 (diff) |
native: Rename frame rate selection strategies
SELF -> PROPAGATE (default)
DO_NOT_PROPAGATE -> SELF
No behavioral changes.
Test: atest libsurfaceflinger_unittest
Bug: 309687765
Change-Id: I055d827a45ecc7f566375425c42e745a41b751f9
-rw-r--r-- | libs/gui/LayerState.cpp | 2 | ||||
-rw-r--r-- | libs/nativewindow/include/system/window.h | 26 | ||||
-rw-r--r-- | services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp | 2 | ||||
-rw-r--r-- | services/surfaceflinger/FrontEnd/RequestedLayerState.cpp | 2 | ||||
-rw-r--r-- | services/surfaceflinger/Layer.cpp | 2 | ||||
-rw-r--r-- | services/surfaceflinger/Layer.h | 3 | ||||
-rw-r--r-- | services/surfaceflinger/Scheduler/LayerInfo.cpp | 8 | ||||
-rw-r--r-- | services/surfaceflinger/Scheduler/LayerInfo.h | 6 | ||||
-rw-r--r-- | services/surfaceflinger/tests/unittests/FrameRateSelectionStrategyTest.cpp | 30 | ||||
-rw-r--r-- | services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp | 36 |
10 files changed, 60 insertions, 57 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index fd8fc8d123..97a82be5f5 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -86,7 +86,7 @@ layer_state_t::layer_state_t() defaultFrameRateCompatibility(ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT), frameRateCategory(ANATIVEWINDOW_FRAME_RATE_CATEGORY_DEFAULT), frameRateCategorySmoothSwitchOnly(false), - frameRateSelectionStrategy(ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_SELF), + frameRateSelectionStrategy(ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_PROPAGATE), fixedTransformHint(ui::Transform::ROT_INVALID), autoRefresh(false), isTrustedOverlay(false), diff --git a/libs/nativewindow/include/system/window.h b/libs/nativewindow/include/system/window.h index 05838128d8..e41aa06541 100644 --- a/libs/nativewindow/include/system/window.h +++ b/libs/nativewindow/include/system/window.h @@ -1104,29 +1104,33 @@ enum { /** * Default value. The layer uses its own frame rate specifications, assuming it has any * specifications, instead of its parent's. If it does not have its own frame rate - * specifications, it will try to use its parent's. + * specifications, it will try to use its parent's. It will propagate its specifications to any + * descendants that do not have their own. * * However, FRAME_RATE_SELECTION_STRATEGY_OVERRIDE_CHILDREN on an ancestor layer - * supersedes this behavior, meaning that this layer will inherit the frame rate specifications - * of that ancestor layer. + * supersedes this behavior, meaning that this layer will inherit frame rate specifications + * regardless of whether it has its own. */ - ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_SELF = 0, + ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_PROPAGATE = 0, /** * The layer's frame rate specifications will propagate to and override those of its descendant * layers. - * The layer with this strategy has the ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_SELF - * behavior for itself. + * + * The layer itself has the FRAME_RATE_SELECTION_STRATEGY_PROPAGATE behavior. + * Thus, ancestor layer that also has the strategy + * FRAME_RATE_SELECTION_STRATEGY_OVERRIDE_CHILDREN will override this layer's + * frame rate specifications. */ ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_OVERRIDE_CHILDREN = 1, /** - * The layer's frame rate specifications will never propagate to its descendant - * layers. - * FRAME_RATE_SELECTION_STRATEGY_OVERRIDE_CHILDREN on an ancestor layer supersedes - * this behavior. + * The layer's frame rate specifications will not propagate to its descendant + * layers, even if the descendant layer has no frame rate specifications. + * However, FRAME_RATE_SELECTION_STRATEGY_OVERRIDE_CHILDREN on an ancestor + * layer supersedes this behavior. */ - ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_DO_NOT_PROPAGATE = 2, + ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_SELF = 2, }; static inline int native_window_set_frame_rate(struct ANativeWindow* window, float frameRate, diff --git a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp index a57cd0ad35..a92cc03831 100644 --- a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp +++ b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp @@ -817,7 +817,7 @@ void LayerSnapshotBuilder::updateSnapshot(LayerSnapshot& snapshot, const Args& a const bool shouldOverrideChildren = parentSnapshot.frameRateSelectionStrategy == scheduler::LayerInfo::FrameRateSelectionStrategy::OverrideChildren; const bool propagationAllowed = parentSnapshot.frameRateSelectionStrategy != - scheduler::LayerInfo::FrameRateSelectionStrategy::DoNotPropagate; + scheduler::LayerInfo::FrameRateSelectionStrategy::Self; if ((!requested.requestedFrameRate.isValid() && propagationAllowed) || shouldOverrideChildren) { snapshot.inheritedFrameRate = parentSnapshot.inheritedFrameRate; diff --git a/services/surfaceflinger/FrontEnd/RequestedLayerState.cpp b/services/surfaceflinger/FrontEnd/RequestedLayerState.cpp index b1a18aefb5..21172ca015 100644 --- a/services/surfaceflinger/FrontEnd/RequestedLayerState.cpp +++ b/services/surfaceflinger/FrontEnd/RequestedLayerState.cpp @@ -125,7 +125,7 @@ RequestedLayerState::RequestedLayerState(const LayerCreationArgs& args) frameRateCategory = static_cast<int8_t>(FrameRateCategory::Default); frameRateCategorySmoothSwitchOnly = false; frameRateSelectionStrategy = - static_cast<int8_t>(scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + static_cast<int8_t>(scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); dataspace = ui::Dataspace::V0_SRGB; gameMode = gui::GameMode::Unsupported; requestedFrameRate = {}; diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 602dae0feb..d654ada10f 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -193,7 +193,7 @@ Layer::Layer(const surfaceflinger::LayerCreationArgs& args) mDrawingState.dropInputMode = gui::DropInputMode::NONE; mDrawingState.dimmingEnabled = true; mDrawingState.defaultFrameRateCompatibility = FrameRateCompatibility::Default; - mDrawingState.frameRateSelectionStrategy = FrameRateSelectionStrategy::Self; + mDrawingState.frameRateSelectionStrategy = FrameRateSelectionStrategy::Propagate; if (args.flags & ISurfaceComposerClient::eNoColorFill) { // Set an invalid color so there is no color fill. diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index 790dfb569e..c772e0ea1b 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -1179,8 +1179,7 @@ private: } bool shouldPropagateFrameRate() const { - return getDrawingState().frameRateSelectionStrategy != - FrameRateSelectionStrategy::DoNotPropagate; + return getDrawingState().frameRateSelectionStrategy != FrameRateSelectionStrategy::Self; } // Cached properties computed from drawing state diff --git a/services/surfaceflinger/Scheduler/LayerInfo.cpp b/services/surfaceflinger/Scheduler/LayerInfo.cpp index db0aebf2a2..71ad45153f 100644 --- a/services/surfaceflinger/Scheduler/LayerInfo.cpp +++ b/services/surfaceflinger/Scheduler/LayerInfo.cpp @@ -526,12 +526,12 @@ FrameRateCategory LayerInfo::FrameRate::convertCategory(int8_t category) { LayerInfo::FrameRateSelectionStrategy LayerInfo::convertFrameRateSelectionStrategy( int8_t strategy) { switch (strategy) { - case ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_SELF: - return FrameRateSelectionStrategy::Self; + case ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_PROPAGATE: + return FrameRateSelectionStrategy::Propagate; case ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_OVERRIDE_CHILDREN: return FrameRateSelectionStrategy::OverrideChildren; - case ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_DO_NOT_PROPAGATE: - return FrameRateSelectionStrategy::DoNotPropagate; + case ANATIVEWINDOW_FRAME_RATE_SELECTION_STRATEGY_SELF: + return FrameRateSelectionStrategy::Self; default: LOG_ALWAYS_FATAL("Invalid frame rate selection strategy value %d", strategy); return FrameRateSelectionStrategy::Self; diff --git a/services/surfaceflinger/Scheduler/LayerInfo.h b/services/surfaceflinger/Scheduler/LayerInfo.h index c7b53fceae..c6ee69e355 100644 --- a/services/surfaceflinger/Scheduler/LayerInfo.h +++ b/services/surfaceflinger/Scheduler/LayerInfo.h @@ -81,11 +81,11 @@ public: using RefreshRateVotes = ftl::SmallVector<LayerInfo::LayerVote, 2>; enum class FrameRateSelectionStrategy { - Self, + Propagate, OverrideChildren, - DoNotPropagate, + Self, - ftl_last = DoNotPropagate + ftl_last = Self }; // Encapsulates the frame rate specifications of the layer. This information will be used diff --git a/services/surfaceflinger/tests/unittests/FrameRateSelectionStrategyTest.cpp b/services/surfaceflinger/tests/unittests/FrameRateSelectionStrategyTest.cpp index d791c4a3bc..5c742d7360 100644 --- a/services/surfaceflinger/tests/unittests/FrameRateSelectionStrategyTest.cpp +++ b/services/surfaceflinger/tests/unittests/FrameRateSelectionStrategyTest.cpp @@ -117,10 +117,10 @@ TEST_P(FrameRateSelectionStrategyTest, SetChildOverrideChildren) { child2->setFrameRateSelectionStrategy(FrameRateSelectionStrategy::OverrideChildren); commitTransaction(); EXPECT_EQ(FRAME_RATE_TREE, parent->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::Self, + EXPECT_EQ(FrameRateSelectionStrategy::Propagate, parent->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_TREE, child1->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::Self, + EXPECT_EQ(FrameRateSelectionStrategy::Propagate, child1->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_VOTE1, child2->getFrameRateForLayerTree()); EXPECT_EQ(FrameRateSelectionStrategy::OverrideChildren, @@ -151,24 +151,24 @@ TEST_P(FrameRateSelectionStrategyTest, SetParentOverrideChildren) { EXPECT_EQ(FrameRateSelectionStrategy::OverrideChildren, layer2->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_VOTE1, layer3->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::Self, + EXPECT_EQ(FrameRateSelectionStrategy::Propagate, layer3->getDrawingState().frameRateSelectionStrategy); - layer1->setFrameRateSelectionStrategy(FrameRateSelectionStrategy::Self); + layer1->setFrameRateSelectionStrategy(FrameRateSelectionStrategy::Propagate); commitTransaction(); EXPECT_EQ(FRAME_RATE_VOTE1, layer1->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::Self, + EXPECT_EQ(FrameRateSelectionStrategy::Propagate, layer1->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_VOTE2, layer2->getFrameRateForLayerTree()); EXPECT_EQ(FrameRateSelectionStrategy::OverrideChildren, layer2->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_VOTE2, layer3->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::Self, + EXPECT_EQ(FrameRateSelectionStrategy::Propagate, layer3->getDrawingState().frameRateSelectionStrategy); } -TEST_P(FrameRateSelectionStrategyTest, OverrideChildrenAndDoNotPropagate) { +TEST_P(FrameRateSelectionStrategyTest, OverrideChildrenAndSelf) { EXPECT_CALL(*mFlinger.scheduler(), scheduleFrame()).Times(1); const auto& layerFactory = GetParam(); @@ -180,17 +180,17 @@ TEST_P(FrameRateSelectionStrategyTest, OverrideChildrenAndDoNotPropagate) { layer1->setFrameRate(FRAME_RATE_VOTE1.vote); layer2->setFrameRate(FRAME_RATE_VOTE2.vote); - layer2->setFrameRateSelectionStrategy(FrameRateSelectionStrategy::DoNotPropagate); + layer2->setFrameRateSelectionStrategy(FrameRateSelectionStrategy::Self); commitTransaction(); EXPECT_EQ(FRAME_RATE_VOTE1, layer1->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::Self, + EXPECT_EQ(FrameRateSelectionStrategy::Propagate, layer1->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_VOTE2, layer2->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::DoNotPropagate, + EXPECT_EQ(FrameRateSelectionStrategy::Self, layer2->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_DEFAULT, layer3->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::Self, + EXPECT_EQ(FrameRateSelectionStrategy::Propagate, layer3->getDrawingState().frameRateSelectionStrategy); layer1->setFrameRateSelectionStrategy(FrameRateSelectionStrategy::OverrideChildren); @@ -200,10 +200,10 @@ TEST_P(FrameRateSelectionStrategyTest, OverrideChildrenAndDoNotPropagate) { EXPECT_EQ(FrameRateSelectionStrategy::OverrideChildren, layer1->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_VOTE1, layer2->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::DoNotPropagate, + EXPECT_EQ(FrameRateSelectionStrategy::Self, layer2->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_VOTE1, layer3->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::Self, + EXPECT_EQ(FrameRateSelectionStrategy::Propagate, layer3->getDrawingState().frameRateSelectionStrategy); layer1->setFrameRate(FRAME_RATE_DEFAULT.vote); @@ -213,10 +213,10 @@ TEST_P(FrameRateSelectionStrategyTest, OverrideChildrenAndDoNotPropagate) { EXPECT_EQ(FrameRateSelectionStrategy::OverrideChildren, layer1->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_VOTE2, layer2->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::DoNotPropagate, + EXPECT_EQ(FrameRateSelectionStrategy::Self, layer2->getDrawingState().frameRateSelectionStrategy); EXPECT_EQ(FRAME_RATE_VOTE2, layer3->getFrameRateForLayerTree()); - EXPECT_EQ(FrameRateSelectionStrategy::Self, + EXPECT_EQ(FrameRateSelectionStrategy::Propagate, layer3->getDrawingState().frameRateSelectionStrategy); } diff --git a/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp b/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp index 40d6ad31f4..040a3bfb3e 100644 --- a/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp +++ b/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp @@ -814,24 +814,24 @@ TEST_F(LayerSnapshotTest, frameRateSelectionStrategy) { EXPECT_EQ(getSnapshot({.id = 12})->frameRate.vote.type, scheduler::FrameRateCompatibility::NoVote); EXPECT_EQ(getSnapshot({.id = 12})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_TRUE(getSnapshot({.id = 12})->changes.test(RequestedLayerState::Changes::FrameRate)); EXPECT_FALSE(getSnapshot({.id = 121})->frameRate.vote.rate.isValid()); EXPECT_EQ(getSnapshot({.id = 121})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_EQ(getSnapshot({.id = 121})->frameRate.vote.type, scheduler::FrameRateCompatibility::Default); EXPECT_TRUE(getSnapshot({.id = 121})->changes.test(RequestedLayerState::Changes::FrameRate)); EXPECT_EQ(getSnapshot({.id = 122})->frameRate.vote.rate.getValue(), 123.f); EXPECT_EQ(getSnapshot({.id = 122})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_TRUE(getSnapshot({.id = 122})->changes.test(RequestedLayerState::Changes::FrameRate)); EXPECT_EQ(getSnapshot({.id = 1221})->frameRate.vote.rate.getValue(), 123.f); EXPECT_EQ(getSnapshot({.id = 1221})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_TRUE(getSnapshot({.id = 1221})->changes.test(RequestedLayerState::Changes::FrameRate)); } @@ -904,12 +904,12 @@ TEST_F(LayerSnapshotTest, frameRateSelectionStrategyWithCategory) { scheduler::FrameRateCompatibility::NoVote); EXPECT_EQ(getSnapshot({.id = 12})->frameRate.category, FrameRateCategory::Default); EXPECT_EQ(getSnapshot({.id = 12})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_TRUE(getSnapshot({.id = 12})->changes.test(RequestedLayerState::Changes::FrameRate)); EXPECT_FALSE(getSnapshot({.id = 12})->frameRate.vote.rate.isValid()); EXPECT_EQ(getSnapshot({.id = 121})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_EQ(getSnapshot({.id = 121})->frameRate.category, FrameRateCategory::Default); EXPECT_EQ(getSnapshot({.id = 121})->frameRate.vote.type, scheduler::FrameRateCompatibility::Default); @@ -917,21 +917,21 @@ TEST_F(LayerSnapshotTest, frameRateSelectionStrategyWithCategory) { EXPECT_EQ(getSnapshot({.id = 122})->frameRate.vote.rate.getValue(), 123.f); EXPECT_EQ(getSnapshot({.id = 122})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_EQ(getSnapshot({.id = 122})->frameRate.category, FrameRateCategory::Default); EXPECT_TRUE(getSnapshot({.id = 122})->changes.test(RequestedLayerState::Changes::FrameRate)); EXPECT_EQ(getSnapshot({.id = 1221})->frameRate.vote.rate.getValue(), 123.f); EXPECT_EQ(getSnapshot({.id = 1221})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_EQ(getSnapshot({.id = 1221})->frameRate.category, FrameRateCategory::Default); EXPECT_TRUE(getSnapshot({.id = 1221})->changes.test(RequestedLayerState::Changes::FrameRate)); } -TEST_F(LayerSnapshotTest, frameRateSelectionStrategyWithOverrideChildrenAndDoNotPropagate) { +TEST_F(LayerSnapshotTest, frameRateSelectionStrategyWithOverrideChildrenAndSelf) { // ROOT // ├── 1 - // │ ├── 11 (frame rate set to 11.f with strategy DoNotPropagate) + // │ ├── 11 (frame rate set to 11.f with strategy Self) // │ │ └── 111 (frame rate is not inherited) // │ ├── 12 (frame rate set to 244.f) // │ │ ├── 121 @@ -940,7 +940,7 @@ TEST_F(LayerSnapshotTest, frameRateSelectionStrategyWithOverrideChildrenAndDoNot // │ └── 13 // └── 2 setFrameRate(11, 11.f, 0, 0); - setFrameRateSelectionStrategy(11, 2 /* DoNotPropagate */); + setFrameRateSelectionStrategy(11, 2 /* Self */); setFrameRate(12, 244.f, 0, 0); setFrameRateSelectionStrategy(122, 1 /* OverrideChildren */); setFrameRate(1221, 123.f, 0, 0); @@ -951,29 +951,29 @@ TEST_F(LayerSnapshotTest, frameRateSelectionStrategyWithOverrideChildrenAndDoNot EXPECT_EQ(getSnapshot({.id = 1})->frameRate.vote.type, scheduler::FrameRateCompatibility::NoVote); EXPECT_EQ(getSnapshot({.id = 1})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_TRUE(getSnapshot({.id = 1})->changes.test(RequestedLayerState::Changes::FrameRate)); EXPECT_EQ(getSnapshot({.id = 11})->frameRate.vote.rate.getValue(), 11.f); EXPECT_EQ(getSnapshot({.id = 11})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::DoNotPropagate); + scheduler::LayerInfo::FrameRateSelectionStrategy::Self); EXPECT_TRUE(getSnapshot({.id = 11})->changes.test(RequestedLayerState::Changes::FrameRate)); // verify layer 11 does does not propagate its framerate to 111. EXPECT_FALSE(getSnapshot({.id = 111})->frameRate.vote.rate.isValid()); EXPECT_EQ(getSnapshot({.id = 111})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_TRUE(getSnapshot({.id = 111})->changes.test(RequestedLayerState::Changes::FrameRate)); // verify layer 12 and all descendants (121, 122, 1221) get the requested vote EXPECT_EQ(getSnapshot({.id = 12})->frameRate.vote.rate.getValue(), 244.f); EXPECT_EQ(getSnapshot({.id = 12})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_TRUE(getSnapshot({.id = 12})->changes.test(RequestedLayerState::Changes::FrameRate)); EXPECT_EQ(getSnapshot({.id = 121})->frameRate.vote.rate.getValue(), 244.f); EXPECT_EQ(getSnapshot({.id = 121})->frameRateSelectionStrategy, - scheduler::LayerInfo::FrameRateSelectionStrategy::Self); + scheduler::LayerInfo::FrameRateSelectionStrategy::Propagate); EXPECT_TRUE(getSnapshot({.id = 121})->changes.test(RequestedLayerState::Changes::FrameRate)); EXPECT_EQ(getSnapshot({.id = 122})->frameRate.vote.rate.getValue(), 244.f); @@ -988,13 +988,13 @@ TEST_F(LayerSnapshotTest, frameRateSelectionStrategyWithOverrideChildrenAndDoNot // ROOT // ├── 1 (frame rate set to 1.f with strategy OverrideChildren) - // │ ├── 11 (frame rate set to 11.f with strategy DoNotPropagate, but overridden by 1) + // │ ├── 11 (frame rate set to 11.f with strategy Self, but overridden by 1) // │ │ └── 111 (frame rate inherited from 11 due to override from 1) // ⋮ ⋮ setFrameRate(1, 1.f, 0, 0); setFrameRateSelectionStrategy(1, 1 /* OverrideChildren */); setFrameRate(11, 11.f, 0, 0); - setFrameRateSelectionStrategy(11, 2 /* DoNotPropagate */); + setFrameRateSelectionStrategy(11, 2 /* Self */); UPDATE_AND_VERIFY(mSnapshotBuilder, STARTING_ZORDER); EXPECT_EQ(getSnapshot({.id = 1})->frameRate.vote.rate.getValue(), 1.f); |