Revert "SurfaceFlinger: override frame rate for applications that use setFrameRate" (dbb6dcfd) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/Layer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -883,7 +883,7 @@ public:
		*/
		bool hasInputInfo() const;

		virtual uid_t getOwnerUid() const { return mOwnerUid; }
		uid_t getOwnerUid() { return mOwnerUid; }

		pid_t getOwnerPid() { return mOwnerPid; }

services/surfaceflinger/Scheduler/LayerHistory.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -142,8 +142,8 @@ LayerHistory::Summary LayerHistory::summarize(nsecs_t now) {

		const float layerArea = transformed.getWidth() * transformed.getHeight();
		float weight = mDisplayArea ? layerArea / mDisplayArea : 0.0f;
		summary.push_back({strong->getName(), strong->getOwnerUid(), vote.type, vote.fps,
		vote.seamlessness, weight, layerFocused});
		summary.push_back(
		{strong->getName(), vote.type, vote.fps, vote.seamlessness, weight, layerFocused});

		if (CC_UNLIKELY(mTraceEnabled)) {
		trace(layer, *info, vote.type, vote.fps.getIntValue());

services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp

+128 −201

Original line number	Diff line number	Diff line
		@@ -71,84 +71,16 @@ std::string RefreshRateConfigs::Policy::toString() const {

		std::pair<nsecs_t, nsecs_t> RefreshRateConfigs::getDisplayFrames(nsecs_t layerPeriod,
		nsecs_t displayPeriod) const {
		auto [quotient, remainder] = std::div(layerPeriod, displayPeriod);
		if (remainder <= MARGIN_FOR_PERIOD_CALCULATION \|\|
		std::abs(remainder - displayPeriod) <= MARGIN_FOR_PERIOD_CALCULATION) {
		quotient++;
		remainder = 0;
		auto [displayFramesQuot, displayFramesRem] = std::div(layerPeriod, displayPeriod);
		if (displayFramesRem <= MARGIN_FOR_PERIOD_CALCULATION \|\|
		std::abs(displayFramesRem - displayPeriod) <= MARGIN_FOR_PERIOD_CALCULATION) {
		displayFramesQuot++;
		displayFramesRem = 0;
		}

		return {quotient, remainder};
		return {displayFramesQuot, displayFramesRem};
		}

		float RefreshRateConfigs::calculateLayerScoreLocked(const LayerRequirement& layer,
		const RefreshRate& refreshRate,
		bool isSeamlessSwitch) const {
		// Slightly prefer seamless switches.
		constexpr float kSeamedSwitchPenalty = 0.95f;
		const float seamlessness = isSeamlessSwitch ? 1.0f : kSeamedSwitchPenalty;

		// If the layer wants Max, give higher score to the higher refresh rate
		if (layer.vote == LayerVoteType::Max) {
		const auto ratio =
		refreshRate.fps.getValue() / mAppRequestRefreshRates.back()->fps.getValue();
		// use ratio^2 to get a lower score the more we get further from peak
		return ratio * ratio;
		}

		const auto displayPeriod = refreshRate.getVsyncPeriod();
		const auto layerPeriod = layer.desiredRefreshRate.getPeriodNsecs();
		if (layer.vote == LayerVoteType::ExplicitDefault) {
		// Find the actual rate the layer will render, assuming
		// that layerPeriod is the minimal time to render a frame
		auto actualLayerPeriod = displayPeriod;
		int multiplier = 1;
		while (layerPeriod > actualLayerPeriod + MARGIN_FOR_PERIOD_CALCULATION) {
		multiplier++;
		actualLayerPeriod = displayPeriod * multiplier;
		}
		return std::min(1.0f,
		static_cast<float>(layerPeriod) / static_cast<float>(actualLayerPeriod));
		}

		if (layer.vote == LayerVoteType::ExplicitExactOrMultiple \|\|
		layer.vote == LayerVoteType::Heuristic) {
		// Calculate how many display vsyncs we need to present a single frame for this
		// layer
		const auto [displayFramesQuotient, displayFramesRemainder] =
		getDisplayFrames(layerPeriod, displayPeriod);
		static constexpr size_t MAX_FRAMES_TO_FIT = 10; // Stop calculating when score < 0.1
		if (displayFramesRemainder == 0) {
		// Layer desired refresh rate matches the display rate.
		return 1.0f * seamlessness;
		}

		if (displayFramesQuotient == 0) {
		// Layer desired refresh rate is higher than the display rate.
		return (static_cast<float>(layerPeriod) / static_cast<float>(displayPeriod)) *
		(1.0f / (MAX_FRAMES_TO_FIT + 1));
		}

		// Layer desired refresh rate is lower than the display rate. Check how well it fits
		// the cadence.
		auto diff = std::abs(displayFramesRemainder - (displayPeriod - displayFramesRemainder));
		int iter = 2;
		while (diff > MARGIN_FOR_PERIOD_CALCULATION && iter < MAX_FRAMES_TO_FIT) {
		diff = diff - (displayPeriod - diff);
		iter++;
		}

		return (1.0f / iter) * seamlessness;
		}

		return 0;
		}

		struct RefreshRateScore {
		const RefreshRate* refreshRate;
		float score;
		};

		const RefreshRate& RefreshRateConfigs::getBestRefreshRate(
		const std::vector<LayerRequirement>& layers, const GlobalSignals& globalSignals,
		GlobalSignals* outSignalsConsidered) const {
		@@ -233,11 +165,11 @@ const RefreshRate& RefreshRateConfigs::getBestRefreshRate(
		}

		// Find the best refresh rate based on score
		std::vector<RefreshRateScore> scores;
		std::vector<std::pair<const RefreshRate*, float>> scores;
		scores.reserve(mAppRequestRefreshRates.size());

		for (const auto refreshRate : mAppRequestRefreshRates) {
		scores.emplace_back(RefreshRateScore{refreshRate, 0.0f});
		scores.emplace_back(refreshRate, 0.0f);
		}

		const auto& defaultConfig = mRefreshRates.at(policy->defaultConfig);
		@@ -252,13 +184,12 @@ const RefreshRate& RefreshRateConfigs::getBestRefreshRate(
		auto weight = layer.weight;

		for (auto i = 0u; i < scores.size(); i++) {
		const bool isSeamlessSwitch = scores[i].refreshRate->getConfigGroup() ==
		mCurrentRefreshRate->getConfigGroup();
		const bool isSeamlessSwitch =
		scores[i].first->getConfigGroup() == mCurrentRefreshRate->getConfigGroup();

		if (layer.seamlessness == Seamlessness::OnlySeamless && !isSeamlessSwitch) {
		ALOGV("%s ignores %s to avoid non-seamless switch. Current config = %s",
		formatLayerInfo(layer, weight).c_str(),
		scores[i].refreshRate->toString().c_str(),
		formatLayerInfo(layer, weight).c_str(), scores[i].first->toString().c_str(),
		mCurrentRefreshRate->toString().c_str());
		continue;
		}
		@@ -267,8 +198,7 @@ const RefreshRate& RefreshRateConfigs::getBestRefreshRate(
		!layer.focused) {
		ALOGV("%s ignores %s because it's not focused and the switch is going to be seamed."
		" Current config = %s",
		formatLayerInfo(layer, weight).c_str(),
		scores[i].refreshRate->toString().c_str(),
		formatLayerInfo(layer, weight).c_str(), scores[i].first->toString().c_str(),
		mCurrentRefreshRate->toString().c_str());
		continue;
		}
		@@ -279,20 +209,18 @@ const RefreshRate& RefreshRateConfigs::getBestRefreshRate(
		// from the default, this means a layer with seamlessness=SeamedAndSeamless has just
		// disappeared.
		const bool isInPolicyForDefault = seamedLayers > 0
		? scores[i].refreshRate->getConfigGroup() ==
		mCurrentRefreshRate->getConfigGroup()
		: scores[i].refreshRate->getConfigGroup() == defaultConfig->getConfigGroup();
		? scores[i].first->getConfigGroup() == mCurrentRefreshRate->getConfigGroup()
		: scores[i].first->getConfigGroup() == defaultConfig->getConfigGroup();

		if (layer.seamlessness == Seamlessness::Default && !isInPolicyForDefault &&
		!layer.focused) {
		ALOGV("%s ignores %s. Current config = %s", formatLayerInfo(layer, weight).c_str(),
		scores[i].refreshRate->toString().c_str(),
		mCurrentRefreshRate->toString().c_str());
		scores[i].first->toString().c_str(), mCurrentRefreshRate->toString().c_str());
		continue;
		}

		bool inPrimaryRange = scores[i].refreshRate->inPolicy(policy->primaryRange.min,
		policy->primaryRange.max);
		bool inPrimaryRange =
		scores[i].first->inPolicy(policy->primaryRange.min, policy->primaryRange.max);
		if ((primaryRangeIsSingleRate \|\| !inPrimaryRange) &&
		!(layer.focused && layer.vote == LayerVoteType::ExplicitDefault)) {
		// Only focused layers with ExplicitDefault frame rate settings are allowed to score
		@@ -300,11 +228,81 @@ const RefreshRate& RefreshRateConfigs::getBestRefreshRate(
		continue;
		}

		const auto layerScore =
		calculateLayerScoreLocked(layer, *scores[i].refreshRate, isSeamlessSwitch);
		// If the layer wants Max, give higher score to the higher refresh rate
		if (layer.vote == LayerVoteType::Max) {
		const auto ratio =
		scores[i].first->fps.getValue() / scores.back().first->fps.getValue();
		// use ratio^2 to get a lower score the more we get further from peak
		const auto layerScore = ratio * ratio;
		ALOGV("%s gives %s score of %.2f", formatLayerInfo(layer, weight).c_str(),
		scores[i].first->getName().c_str(), layerScore);
		scores[i].second += weight * layerScore;
		continue;
		}

		const auto displayPeriod = scores[i].first->hwcConfig->getVsyncPeriod();
		const auto layerPeriod = layer.desiredRefreshRate.getPeriodNsecs();
		if (layer.vote == LayerVoteType::ExplicitDefault) {
		const auto layerScore = [&]() {
		// Find the actual rate the layer will render, assuming
		// that layerPeriod is the minimal time to render a frame
		auto actualLayerPeriod = displayPeriod;
		int multiplier = 1;
		while (layerPeriod > actualLayerPeriod + MARGIN_FOR_PERIOD_CALCULATION) {
		multiplier++;
		actualLayerPeriod = displayPeriod * multiplier;
		}
		return std::min(1.0f,
		static_cast<float>(layerPeriod) /
		static_cast<float>(actualLayerPeriod));
		}();

		ALOGV("%s gives %s score of %.2f", formatLayerInfo(layer, weight).c_str(),
		scores[i].first->getName().c_str(), layerScore);
		scores[i].second += weight * layerScore;
		continue;
		}

		if (layer.vote == LayerVoteType::ExplicitExactOrMultiple \|\|
		layer.vote == LayerVoteType::Heuristic) {
		const auto layerScore = [&] {
		// Calculate how many display vsyncs we need to present a single frame for this
		// layer
		const auto [displayFramesQuot, displayFramesRem] =
		getDisplayFrames(layerPeriod, displayPeriod);
		static constexpr size_t MAX_FRAMES_TO_FIT =
		10; // Stop calculating when score < 0.1
		if (displayFramesRem == 0) {
		// Layer desired refresh rate matches the display rate.
		return 1.0f;
		}

		if (displayFramesQuot == 0) {
		// Layer desired refresh rate is higher the display rate.
		return (static_cast<float>(layerPeriod) /
		static_cast<float>(displayPeriod)) *
		(1.0f / (MAX_FRAMES_TO_FIT + 1));
		}

		// Layer desired refresh rate is lower the display rate. Check how well it fits
		// the cadence
		auto diff = std::abs(displayFramesRem - (displayPeriod - displayFramesRem));
		int iter = 2;
		while (diff > MARGIN_FOR_PERIOD_CALCULATION && iter < MAX_FRAMES_TO_FIT) {
		diff = diff - (displayPeriod - diff);
		iter++;
		}

		return 1.0f / iter;
		}();
		// Slightly prefer seamless switches.
		constexpr float kSeamedSwitchPenalty = 0.95f;
		const float seamlessness = isSeamlessSwitch ? 1.0f : kSeamedSwitchPenalty;
		ALOGV("%s gives %s score of %.2f", formatLayerInfo(layer, weight).c_str(),
		scores[i].refreshRate->getName().c_str(), layerScore);
		scores[i].score += weight * layerScore;
		scores[i].first->getName().c_str(), layerScore);
		scores[i].second += weight * layerScore * seamlessness;
		continue;
		}
		}
		}

		@@ -319,7 +317,7 @@ const RefreshRate& RefreshRateConfigs::getBestRefreshRate(
		// If we never scored any layers, then choose the rate from the primary
		// range instead of picking a random score from the app range.
		if (std::all_of(scores.begin(), scores.end(),
		[](RefreshRateScore score) { return score.score == 0; })) {
		[](std::pair<const RefreshRate*, float> p) { return p.second == 0; })) {
		ALOGV("layers not scored - choose %s",
		getMaxRefreshRateByPolicyLocked().getName().c_str());
		return getMaxRefreshRateByPolicyLocked();
		@@ -344,110 +342,11 @@ const RefreshRate& RefreshRateConfigs::getBestRefreshRate(
		return *bestRefreshRate;
		}

		std::unordered_map<uid_t, std::vector<const RefreshRateConfigs::LayerRequirement*>>
		groupLayersByUid(const std::vector<RefreshRateConfigs::LayerRequirement>& layers) {
		std::unordered_map<uid_t, std::vector<const RefreshRateConfigs::LayerRequirement*>> layersByUid;
		for (const auto& layer : layers) {
		auto iter = layersByUid.emplace(layer.ownerUid,
		std::vector<const RefreshRateConfigs::LayerRequirement*>());
		auto& layersWithSameUid = iter.first->second;
		layersWithSameUid.push_back(&layer);
		}

		// Remove uids that can't have a frame rate override
		for (auto iter = layersByUid.begin(); iter != layersByUid.end();) {
		const auto& layersWithSameUid = iter->second;
		bool skipUid = false;
		for (const auto& layer : layersWithSameUid) {
		if (layer->vote == RefreshRateConfigs::LayerVoteType::Max \|\|
		layer->vote == RefreshRateConfigs::LayerVoteType::Heuristic) {
		skipUid = true;
		break;
		}
		}
		if (skipUid) {
		iter = layersByUid.erase(iter);
		} else {
		++iter;
		}
		}

		return layersByUid;
		}

		std::vector<RefreshRateScore> initializeScoresForAllRefreshRates(
		const AllRefreshRatesMapType& refreshRates) {
		std::vector<RefreshRateScore> scores;
		scores.reserve(refreshRates.size());
		for (const auto& [ignored, refreshRate] : refreshRates) {
		scores.emplace_back(RefreshRateScore{refreshRate.get(), 0.0f});
		}
		std::sort(scores.begin(), scores.end(),
		[](const auto& a, const auto& b) { return a.refreshRate < b.refreshRate; });
		return scores;
		}

		RefreshRateConfigs::UidToFrameRateOverride RefreshRateConfigs::getFrameRateOverrides(
		const std::vector<LayerRequirement>& layers, Fps displayFrameRate) const {
		ATRACE_CALL();
		ALOGV("getFrameRateOverrides %zu layers", layers.size());

		std::lock_guard lock(mLock);
		std::vector<RefreshRateScore> scores = initializeScoresForAllRefreshRates(mRefreshRates);
		std::unordered_map<uid_t, std::vector<const LayerRequirement*>> layersByUid =
		groupLayersByUid(layers);
		UidToFrameRateOverride frameRateOverrides;
		for (const auto& [uid, layersWithSameUid] : layersByUid) {
		for (auto& score : scores) {
		score.score = 0;
		}

		for (const auto& layer : layersWithSameUid) {
		if (layer->vote == LayerVoteType::NoVote \|\| layer->vote == LayerVoteType::Min) {
		continue;
		}

		LOG_ALWAYS_FATAL_IF(layer->vote != LayerVoteType::ExplicitDefault &&
		layer->vote != LayerVoteType::ExplicitExactOrMultiple);
		for (RefreshRateScore& score : scores) {
		const auto layerScore = calculateLayerScoreLocked(layer, score.refreshRate,
		/isSeamlessSwitch/ true);
		score.score += layer->weight * layerScore;
		}
		}

		// We just care about the refresh rates which are a divider of the
		// display refresh rate
		auto iter =
		std::remove_if(scores.begin(), scores.end(), [&](const RefreshRateScore& score) {
		return getFrameRateDivider(displayFrameRate, score.refreshRate->getFps()) == 0;
		});
		scores.erase(iter, scores.end());

		// If we never scored any layers, we don't have a preferred frame rate
		if (std::all_of(scores.begin(), scores.end(),
		[](const RefreshRateScore& score) { return score.score == 0; })) {
		continue;
		}

		// Now that we scored all the refresh rates we need to pick the one that got the highest
		// score.
		const RefreshRate* bestRefreshRate = getBestRefreshRate(scores.begin(), scores.end());

		// If the nest refresh rate is the current one, we don't have an override
		if (!bestRefreshRate->getFps().equalsWithMargin(displayFrameRate)) {
		frameRateOverrides.emplace(uid, bestRefreshRate->getFps());
		}
		}

		return frameRateOverrides;
		}

		template <typename Iter>
		const RefreshRate* RefreshRateConfigs::getBestRefreshRate(Iter begin, Iter end) const {
		constexpr auto EPSILON = 0.001f;
		const RefreshRate* bestRefreshRate = begin->refreshRate;
		float max = begin->score;
		const RefreshRate* bestRefreshRate = begin->first;
		float max = begin->second;
		for (auto i = begin; i != end; ++i) {
		const auto [refreshRate, score] = *i;
		ALOGV("%s scores %.2f", refreshRate->getName().c_str(), score);
		@@ -746,22 +645,50 @@ RefreshRateConfigs::KernelIdleTimerAction RefreshRateConfigs::getIdleTimerAction
		return RefreshRateConfigs::KernelIdleTimerAction::TurnOn;
		}

		int RefreshRateConfigs::getFrameRateDivider(Fps displayFrameRate, Fps layerFrameRate) {
		void RefreshRateConfigs::setPreferredRefreshRateForUid(FrameRateOverride frameRateOverride) {
		if (frameRateOverride.frameRateHz > 0 && frameRateOverride.frameRateHz < 1) {
		return;
		}

		std::lock_guard lock(mLock);
		if (frameRateOverride.frameRateHz != 0) {
		mPreferredRefreshRateForUid[frameRateOverride.uid] = Fps(frameRateOverride.frameRateHz);
		} else {
		mPreferredRefreshRateForUid.erase(frameRateOverride.uid);
		}
		}

		int RefreshRateConfigs::getRefreshRateDividerForUid(uid_t uid) const {
		std::lock_guard lock(mLock);

		const auto iter = mPreferredRefreshRateForUid.find(uid);
		if (iter == mPreferredRefreshRateForUid.end()) {
		return 1;
		}

		// This calculation needs to be in sync with the java code
		// in DisplayManagerService.getDisplayInfoForFrameRateOverride
		constexpr float kThreshold = 0.1f;
		const auto numPeriods = displayFrameRate.getValue() / layerFrameRate.getValue();
		const auto refreshRateHz = iter->second;
		const auto numPeriods = mCurrentRefreshRate->getFps().getValue() / refreshRateHz.getValue();
		const auto numPeriodsRounded = std::round(numPeriods);
		if (std::abs(numPeriods - numPeriodsRounded) > kThreshold) {
		return 0;
		return 1;
		}

		return static_cast<int>(numPeriodsRounded);
		}

		int RefreshRateConfigs::getRefreshRateDivider(Fps frameRate) const {
		std::vector<FrameRateOverride> RefreshRateConfigs::getFrameRateOverrides() {
		std::lock_guard lock(mLock);
		return getFrameRateDivider(mCurrentRefreshRate->getFps(), frameRate);
		std::vector<FrameRateOverride> overrides;
		overrides.reserve(mPreferredRefreshRateForUid.size());

		for (const auto [uid, frameRate] : mPreferredRefreshRateForUid) {
		overrides.emplace_back(FrameRateOverride{uid, frameRate.getValue()});
		}

		return overrides;
		}

		void RefreshRateConfigs::dump(std::string& result) const {

services/surfaceflinger/Scheduler/RefreshRateConfigs.h

+12 −18

Original line number	Diff line number	Diff line
		@@ -221,8 +221,6 @@ public:
		struct LayerRequirement {
		// Layer's name. Used for debugging purposes.
		std::string name;
		// Layer's owner uid
		uid_t ownerUid = static_cast<uid_t>(-1);
		// Layer vote type.
		LayerVoteType vote = LayerVoteType::NoVote;
		// Layer's desired refresh rate, if applicable.
		@@ -318,16 +316,18 @@ public:
		// refresh rates.
		KernelIdleTimerAction getIdleTimerAction() const;

		// Returns a divider for the current refresh rate
		int getRefreshRateDivider(Fps frameRate) const EXCLUDES(mLock);
		// Stores the preferred refresh rate that an app should run at.
		// FrameRateOverride.refreshRateHz == 0 means no preference.
		void setPreferredRefreshRateForUid(FrameRateOverride) EXCLUDES(mLock);

		// Returns the frame rate override for each uid
		using UidToFrameRateOverride = std::map<uid_t, Fps>;
		UidToFrameRateOverride getFrameRateOverrides(const std::vector<LayerRequirement>& layers,
		Fps displayFrameRate) const EXCLUDES(mLock);
		// Returns a divider for the current refresh rate
		int getRefreshRateDividerForUid(uid_t) const EXCLUDES(mLock);

		void dump(std::string& result) const EXCLUDES(mLock);

		// Returns the current frame rate overrides
		std::vector<FrameRateOverride> getFrameRateOverrides() EXCLUDES(mLock);

		private:
		friend class RefreshRateConfigsTest;

		@@ -364,16 +364,6 @@ private:
		const Policy* getCurrentPolicyLocked() const REQUIRES(mLock);
		bool isPolicyValid(const Policy& policy);

		// Return the display refresh rate divider to match the layer
		// frame rate, or 0 if the display refresh rate is not a multiple of the
		// layer refresh rate.
		static int getFrameRateDivider(Fps displayFrameRate, Fps layerFrameRate);

		// calculates a score for a layer. Used to determine the display refresh rate
		// and the frame rate override for certains applications.
		float calculateLayerScoreLocked(const LayerRequirement&, const RefreshRate&,
		bool isSeamlessSwitch) const REQUIRES(mLock);

		// The list of refresh rates, indexed by display config ID. This must not change after this
		// object is initialized.
		AllRefreshRatesMapType mRefreshRates;
		@@ -395,6 +385,10 @@ private:
		Policy mDisplayManagerPolicy GUARDED_BY(mLock);
		std::optional<Policy> mOverridePolicy GUARDED_BY(mLock);

		// A mapping between a UID and a preferred refresh rate that this app would
		// run at.
		std::unordered_map<uid_t, Fps> mPreferredRefreshRateForUid GUARDED_BY(mLock);

		// The min and max refresh rates supported by the device.
		// This will not change at runtime.
		const RefreshRate* mMinSupportedRefreshRate;

services/surfaceflinger/Scheduler/Scheduler.cpp

+15 −131

File changed.

Preview size limit exceeded, changes collapsed.