Add Fps class
Add a class to wrap a fps value. This is useful because across
the code we
- convert between vsyncPeriod and fps
- compare with tolerance (this ensures we use consistent tolerance)
- consistent toString method
Bug: 159590486
Test: presubmit
Change-Id: Iebb77a33a2f822056642aa61bd6fac6514aa656d
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 90396dd..949227b 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -1425,7 +1425,8 @@
// First traverse the tree and count how many layers has votes
int layersWithVote = 0;
traverseTree([&layersWithVote](Layer* layer) {
- const auto layerVotedWithDefaultCompatibility = layer->mCurrentState.frameRate.rate > 0 &&
+ const auto layerVotedWithDefaultCompatibility =
+ layer->mCurrentState.frameRate.rate.isValid() &&
layer->mCurrentState.frameRate.type == FrameRateCompatibility::Default;
const auto layerVotedWithNoVote =
layer->mCurrentState.frameRate.type == FrameRateCompatibility::NoVote;
@@ -1486,14 +1487,14 @@
Layer::FrameRate Layer::getFrameRateForLayerTree() const {
const auto frameRate = getDrawingState().frameRate;
- if (frameRate.rate > 0 || frameRate.type == FrameRateCompatibility::NoVote) {
+ if (frameRate.rate.isValid() || frameRate.type == FrameRateCompatibility::NoVote) {
return frameRate;
}
// This layer doesn't have a frame rate. If one of its ancestors or successors
// have a vote, return a NoVote for ancestors/successors to set the vote
if (getDrawingState().treeHasFrameRateVote) {
- return {0, FrameRateCompatibility::NoVote};
+ return {Fps(0.0f), FrameRateCompatibility::NoVote};
}
return frameRate;
@@ -1687,9 +1688,9 @@
const FloatRect& crop = outputLayerState.sourceCrop;
StringAppendF(&result, "%6.1f %6.1f %6.1f %6.1f | ", crop.left, crop.top, crop.right,
crop.bottom);
- if (layerState.frameRate.rate != 0 ||
+ if (layerState.frameRate.rate.isValid() ||
layerState.frameRate.type != FrameRateCompatibility::Default) {
- StringAppendF(&result, "% 6.2ffps %15s seamless=%s", layerState.frameRate.rate,
+ StringAppendF(&result, "%s %15s seamless=%s", to_string(layerState.frameRate.rate).c_str(),
frameRateCompatibilityString(layerState.frameRate.type).c_str(),
toString(layerState.frameRate.seamlessness).c_str());
} else {