SF: Deprecate content detection v1 (27fa3ded) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -155,9 +155,7 @@ filegroup {
		"Scheduler/DispSyncSource.cpp",
		"Scheduler/EventThread.cpp",
		"Scheduler/OneShotTimer.cpp",
		"Scheduler/LayerHistory.cpp",
		"Scheduler/LayerHistoryV2.cpp",
		"Scheduler/LayerInfo.cpp",
		"Scheduler/LayerInfoV2.cpp",
		"Scheduler/MessageQueue.cpp",
		"Scheduler/RefreshRateConfigs.cpp",

services/surfaceflinger/Scheduler/LayerHistory.cpp

deleted100644 → 0

+0 −205

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#undef LOG_TAG
		#define LOG_TAG "LayerHistory"
		#define ATRACE_TAG ATRACE_TAG_GRAPHICS

		#include "LayerHistory.h"

		#include <android-base/stringprintf.h>
		#include <cutils/properties.h>
		#include <utils/Log.h>
		#include <utils/Timers.h>
		#include <utils/Trace.h>

		#include <algorithm>
		#include <cmath>
		#include <string>
		#include <utility>

		#include "../Layer.h"
		#include "LayerInfo.h"
		#include "SchedulerUtils.h"

		namespace android::scheduler::impl {

		namespace {

		bool isLayerActive(const Layer& layer, const LayerInfo& info, nsecs_t threshold) {
		if (layer.getFrameRateForLayerTree().rate > 0) {
		return layer.isVisible();
		}
		return layer.isVisible() && info.getLastUpdatedTime() >= threshold;
		}

		bool traceEnabled() {
		char value[PROPERTY_VALUE_MAX];
		property_get("debug.sf.layer_history_trace", value, "0");
		return atoi(value);
		}

		bool useFrameRatePriority() {
		char value[PROPERTY_VALUE_MAX];
		property_get("debug.sf.use_frame_rate_priority", value, "1");
		return atoi(value);
		}

		void trace(const wp<Layer>& weak, int fps) {
		const auto layer = weak.promote();
		if (!layer) return;

		const auto& name = layer->getName();
		const auto tag = "LFPS " + name;
		ATRACE_INT(tag.c_str(), fps);
		ALOGD("%s: %s @ %d Hz", __FUNCTION__, name.c_str(), fps);
		}
		} // namespace

		LayerHistory::LayerHistory()
		: mTraceEnabled(traceEnabled()), mUseFrameRatePriority(useFrameRatePriority()) {}
		LayerHistory::~LayerHistory() = default;

		void LayerHistory::registerLayer(Layer* layer, float lowRefreshRate, float highRefreshRate,
		LayerVoteType /type/) {
		auto info = std::make_unique<LayerInfo>(lowRefreshRate, highRefreshRate);
		std::lock_guard lock(mLock);
		mLayerInfos.emplace_back(layer, std::move(info));
		}

		void LayerHistory::record(Layer* layer, nsecs_t presentTime, nsecs_t now,
		LayerUpdateType /updateType/) {
		std::lock_guard lock(mLock);

		const auto it = std::find_if(mLayerInfos.begin(), mLayerInfos.end(),
		[layer](const auto& pair) { return pair.first == layer; });
		LOG_FATAL_IF(it == mLayerInfos.end(), "%s: unknown layer %p", __FUNCTION__, layer);

		const auto& info = it->second;
		info->setLastPresentTime(presentTime, now);

		// Activate layer if inactive.
		if (const auto end = activeLayers().end(); it >= end) {
		std::iter_swap(it, end);
		mActiveLayersEnd++;
		}
		}

		LayerHistory::Summary LayerHistory::summarize(nsecs_t now) {
		ATRACE_CALL();
		std::lock_guard lock(mLock);

		partitionLayers(now);

		LayerHistory::Summary summary;
		for (const auto& [weakLayer, info] : activeLayers()) {
		const bool recent = info->isRecentlyActive(now);
		auto layer = weakLayer.promote();
		// Only use the layer if the reference still exists.
		if (layer \|\| CC_UNLIKELY(mTraceEnabled)) {
		const auto layerFocused =
		Layer::isLayerFocusedBasedOnPriority(layer->getFrameRateSelectionPriority());
		// Check if frame rate was set on layer.
		const auto frameRate = layer->getFrameRateForLayerTree();
		if (frameRate.rate > 0.f) {
		const auto voteType = [&]() {
		switch (frameRate.type) {
		case Layer::FrameRateCompatibility::Default:
		return LayerVoteType::ExplicitDefault;
		case Layer::FrameRateCompatibility::ExactOrMultiple:
		return LayerVoteType::ExplicitExactOrMultiple;
		case Layer::FrameRateCompatibility::NoVote:
		return LayerVoteType::NoVote;
		}
		}();
		summary.push_back(
		RefreshRateConfigs::LayerRequirement{.name = layer->getName(),
		.vote = voteType,
		.desiredRefreshRate = frameRate.rate,
		.seamlessness = frameRate.seamlessness,
		.weight = 1.0f,
		.focused = layerFocused});
		} else if (recent) {
		summary.push_back(
		RefreshRateConfigs::LayerRequirement{.name = layer->getName(),
		.vote = LayerVoteType::Heuristic,
		.desiredRefreshRate =
		info->getRefreshRate(now),
		.seamlessness =
		Seamlessness::OnlySeamless,
		.weight = 1.0f,
		.focused = layerFocused});
		}

		if (CC_UNLIKELY(mTraceEnabled)) {
		trace(weakLayer, round<int>(frameRate.rate));
		}
		}
		}

		return summary;
		}

		void LayerHistory::partitionLayers(nsecs_t now) {
		const nsecs_t threshold = getActiveLayerThreshold(now);

		// Collect expired and inactive layers after active layers.
		size_t i = 0;
		while (i < mActiveLayersEnd) {
		auto& [weak, info] = mLayerInfos[i];
		if (const auto layer = weak.promote(); layer && isLayerActive(layer, info, threshold)) {
		i++;
		continue;
		}

		if (CC_UNLIKELY(mTraceEnabled)) {
		trace(weak, 0);
		}

		info->clearHistory();
		std::swap(mLayerInfos[i], mLayerInfos[--mActiveLayersEnd]);
		}

		// Collect expired layers after inactive layers.
		size_t end = mLayerInfos.size();
		while (i < end) {
		if (mLayerInfos[i].first.promote()) {
		i++;
		} else {
		std::swap(mLayerInfos[i], mLayerInfos[--end]);
		}
		}

		mLayerInfos.erase(mLayerInfos.begin() + static_cast<long>(end), mLayerInfos.end());
		}

		void LayerHistory::clear() {
		std::lock_guard lock(mLock);

		for (const auto& [layer, info] : activeLayers()) {
		info->clearHistory();
		}

		mActiveLayersEnd = 0;
		}

		std::string LayerHistory::dump() const {
		std::lock_guard lock(mLock);
		return base::StringPrintf("LayerHistory{size=%zu, active=%zu}", mLayerInfos.size(),
		mActiveLayersEnd);
		}

		} // namespace android::scheduler::impl

services/surfaceflinger/Scheduler/LayerHistory.h

+0 −60

Original line number	Diff line number	Diff line
		@@ -76,66 +76,6 @@ public:
		};

		namespace impl {
		// Records per-layer history of scheduling-related information (primarily present time),
		// heuristically categorizes layers as active or inactive, and summarizes stats about
		// active layers (primarily maximum refresh rate). See go/content-fps-detection-in-scheduler.
		class LayerHistory : public android::scheduler::LayerHistory {
		public:
		LayerHistory();
		virtual ~LayerHistory();

		// Layers are unregistered when the weak reference expires.
		void registerLayer(Layer*, float lowRefreshRate, float highRefreshRate,
		LayerVoteType type) override;

		void setDisplayArea(uint32_t /displayArea/) override {}

		void setConfigChangePending(bool /pending/) override {}

		// Marks the layer as active, and records the given state to its history.
		void record(Layer*, nsecs_t presentTime, nsecs_t now, LayerUpdateType updateType) override;

		// Rebuilds sets of active/inactive layers, and accumulates stats for active layers.
		android::scheduler::LayerHistory::Summary summarize(nsecs_t now) override;

		void clear() override;
		std::string dump() const override;

		private:
		friend class android::scheduler::LayerHistoryTest;
		friend TestableScheduler;

		using LayerPair = std::pair<wp<Layer>, std::unique_ptr<LayerInfo>>;
		using LayerInfos = std::vector<LayerPair>;

		struct ActiveLayers {
		LayerInfos& infos;
		const size_t index;

		auto begin() { return infos.begin(); }
		auto end() { return begin() + static_cast<long>(index); }
		};

		ActiveLayers activeLayers() REQUIRES(mLock) { return {mLayerInfos, mActiveLayersEnd}; }

		// Iterates over layers in a single pass, swapping pairs such that active layers precede
		// inactive layers, and inactive layers precede expired layers. Removes expired layers by
		// truncating after inactive layers.
		void partitionLayers(nsecs_t now) REQUIRES(mLock);

		mutable std::mutex mLock;

		// Partitioned such that active layers precede inactive layers. For fast lookup, the few active
		// layers are at the front, and weak pointers are stored in contiguous memory to hit the cache.
		LayerInfos mLayerInfos GUARDED_BY(mLock);
		size_t mActiveLayersEnd GUARDED_BY(mLock) = 0;

		// Whether to emit systrace output and debug logs.
		const bool mTraceEnabled;

		// Whether to use priority sent from WindowManager to determine the relevancy of the layer.
		const bool mUseFrameRatePriority;
		};

		class LayerHistoryV2 : public android::scheduler::LayerHistory {
		public:

services/surfaceflinger/Scheduler/LayerInfo.cpp

deleted100644 → 0

+0 −49

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "LayerInfo.h"

		#include <algorithm>
		#include <utility>

		namespace android::scheduler {

		LayerInfo::LayerInfo(float lowRefreshRate, float highRefreshRate)
		: mLowRefreshRate(lowRefreshRate), mHighRefreshRate(highRefreshRate) {}

		void LayerInfo::setLastPresentTime(nsecs_t lastPresentTime, nsecs_t now) {
		lastPresentTime = std::max(lastPresentTime, static_cast<nsecs_t>(0));

		// Buffers can come with a present time far in the future. That keeps them relevant.
		mLastUpdatedTime = std::max(lastPresentTime, now);
		mPresentTimeHistory.insertPresentTime(mLastUpdatedTime);

		if (mLastPresentTime == 0) {
		// First frame
		mLastPresentTime = lastPresentTime;
		return;
		}

		const nsecs_t period = lastPresentTime - mLastPresentTime;
		mLastPresentTime = lastPresentTime;
		// Ignore time diff that are too high - those are stale values
		if (period > MAX_ACTIVE_LAYER_PERIOD_NS.count()) return;

		const float fps = std::min(1e9f / period, mHighRefreshRate);
		mRefreshRateHistory.insertRefreshRate(fps);
		}

		} // namespace android::scheduler

services/surfaceflinger/Scheduler/LayerInfo.h

deleted100644 → 0

+0 −170

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#pragma once

		#include <utils/Timers.h>

		#include <chrono>
		#include <deque>

		#include "SchedulerUtils.h"

		namespace android {

		class Layer;

		namespace scheduler {

		using namespace std::chrono_literals;

		// Maximum period between presents for a layer to be considered active.
		constexpr std::chrono::nanoseconds MAX_ACTIVE_LAYER_PERIOD_NS = 1200ms;

		// Earliest present time for a layer to be considered active.
		constexpr nsecs_t getActiveLayerThreshold(nsecs_t now) {
		return now - MAX_ACTIVE_LAYER_PERIOD_NS.count();
		}

		// Stores history of present times and refresh rates for a layer.
		class LayerInfo {
		// Layer is considered frequent if the earliest value in the window of most recent present times
		// is within a threshold. If a layer is infrequent, its average refresh rate is disregarded in
		// favor of a low refresh rate.
		static constexpr size_t FREQUENT_LAYER_WINDOW_SIZE = 3;
		static constexpr std::chrono::nanoseconds MAX_FREQUENT_LAYER_PERIOD_NS = 250ms;

		/**
		* Struct that keeps the information about the refresh rate for last
		* HISTORY_SIZE frames. This is used to better determine the refresh rate
		* for individual layers.
		*/
		class RefreshRateHistory {
		public:
		explicit RefreshRateHistory(float highRefreshRate) : mHighRefreshRate(highRefreshRate) {}

		void insertRefreshRate(float refreshRate) {
		mElements.push_back(refreshRate);
		if (mElements.size() > HISTORY_SIZE) {
		mElements.pop_front();
		}
		}

		float getRefreshRateAvg() const {
		return mElements.empty() ? mHighRefreshRate : calculate_mean(mElements);
		}

		void clearHistory() { mElements.clear(); }

		private:
		const float mHighRefreshRate;

		static constexpr size_t HISTORY_SIZE = 30;
		std::deque<float> mElements;
		};

		/**
		* Struct that keeps the information about the present time for last
		* HISTORY_SIZE frames. This is used to better determine whether the given layer
		* is still relevant and it's refresh rate should be considered.
		*/
		class PresentTimeHistory {
		public:
		static constexpr size_t HISTORY_SIZE = 90;

		void insertPresentTime(nsecs_t presentTime) {
		mElements.push_back(presentTime);
		if (mElements.size() > HISTORY_SIZE) {
		mElements.pop_front();
		}
		}

		// Returns whether the earliest present time is within the active threshold.
		bool isRecentlyActive(nsecs_t now) const {
		if (mElements.size() < 2) {
		return false;
		}

		// The layer had to publish at least HISTORY_SIZE or HISTORY_DURATION of updates
		if (mElements.size() < HISTORY_SIZE &&
		mElements.back() - mElements.front() < HISTORY_DURATION.count()) {
		return false;
		}

		return mElements.back() >= getActiveLayerThreshold(now);
		}

		bool isFrequent(nsecs_t now) const {
		// Assume layer is infrequent if too few present times have been recorded.
		if (mElements.size() < FREQUENT_LAYER_WINDOW_SIZE) {
		return false;
		}

		// Layer is frequent if the earliest value in the window of most recent present times is
		// within threshold.
		const auto it = mElements.end() - FREQUENT_LAYER_WINDOW_SIZE;
		const nsecs_t threshold = now - MAX_FREQUENT_LAYER_PERIOD_NS.count();
		return *it >= threshold;
		}

		void clearHistory() { mElements.clear(); }

		private:
		std::deque<nsecs_t> mElements;
		static constexpr std::chrono::nanoseconds HISTORY_DURATION = 1s;
		};

		friend class LayerHistoryTest;

		public:
		LayerInfo(float lowRefreshRate, float highRefreshRate);

		LayerInfo(const LayerInfo&) = delete;
		LayerInfo& operator=(const LayerInfo&) = delete;

		// Records the last requested oresent time. It also stores information about when
		// the layer was last updated. If the present time is farther in the future than the
		// updated time, the updated time is the present time.
		void setLastPresentTime(nsecs_t lastPresentTime, nsecs_t now);

		bool isRecentlyActive(nsecs_t now) const { return mPresentTimeHistory.isRecentlyActive(now); }
		bool isFrequent(nsecs_t now) const { return mPresentTimeHistory.isFrequent(now); }

		float getRefreshRate(nsecs_t now) const {
		return isFrequent(now) ? mRefreshRateHistory.getRefreshRateAvg() : mLowRefreshRate;
		}

		// Return the last updated time. If the present time is farther in the future than the
		// updated time, the updated time is the present time.
		nsecs_t getLastUpdatedTime() const { return mLastUpdatedTime; }

		void clearHistory() {
		mRefreshRateHistory.clearHistory();
		mPresentTimeHistory.clearHistory();
		}

		private:
		const float mLowRefreshRate;
		const float mHighRefreshRate;

		nsecs_t mLastUpdatedTime = 0;
		nsecs_t mLastPresentTime = 0;
		RefreshRateHistory mRefreshRateHistory{mHighRefreshRate};
		PresentTimeHistory mPresentTimeHistory;
		};

		} // namespace scheduler
		} // namespace android