Remove legacy proto helper functions (6aac09ec) · Commits · e / os / android_frameworks_native

services/surfaceflinger/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,7 @@ cc_defaults {
	"libtimestats_deps",		"libtimestats_deps",
	"libsurfaceflinger_common_deps",		"libsurfaceflinger_common_deps",
	"surfaceflinger_defaults",		"surfaceflinger_defaults",
			"libsurfaceflinger_proto_deps",
	],		],
	cflags: [		cflags: [
	"-DLOG_TAG=\"SurfaceFlinger\"",		"-DLOG_TAG=\"SurfaceFlinger\"",
	@@ -93,7 +94,6 @@ cc_defaults {
	"libcompositionengine",		"libcompositionengine",
	"libframetimeline",		"libframetimeline",
	"libgui_aidl_static",		"libgui_aidl_static",
	"liblayers_proto",
	"libperfetto_client_experimental",		"libperfetto_client_experimental",
	"librenderengine",		"librenderengine",
	"libscheduler",		"libscheduler",

services/surfaceflinger/CompositionEngine/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@ cc_defaults {
	"librenderengine_deps",		"librenderengine_deps",
	"libtimestats_deps",		"libtimestats_deps",
	"surfaceflinger_defaults",		"surfaceflinger_defaults",
			"libsurfaceflinger_proto_deps",
	],		],
	cflags: [		cflags: [
	"-DLOG_TAG=\"CompositionEngine\"",		"-DLOG_TAG=\"CompositionEngine\"",
	@@ -41,7 +42,6 @@ cc_defaults {
	"libutils",		"libutils",
	],		],
	static_libs: [		static_libs: [
	"liblayers_proto",
	"libmath",		"libmath",
	"librenderengine",		"librenderengine",
	"libtimestats",		"libtimestats",

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@
	#include <gui/Surface.h>		#include <gui/Surface.h>
	#include <gui/SurfaceComposerClient.h>		#include <gui/SurfaceComposerClient.h>
	#include <hidl/ServiceManagement.h>		#include <hidl/ServiceManagement.h>
	#include <layerproto/LayerProtoParser.h>		#include <layerproto/LayerProtoHeader.h>
	#include <linux/sched/types.h>		#include <linux/sched/types.h>
	#include <log/log.h>		#include <log/log.h>
	#include <private/android_filesystem_config.h>		#include <private/android_filesystem_config.h>

services/surfaceflinger/layerproto/Android.bp

+9 −23

Original line number	Original line	Diff line number	Diff line
	@@ -8,14 +8,9 @@ package {
	default_team: "trendy_team_android_core_graphics_stack",		default_team: "trendy_team_android_core_graphics_stack",
	}		}

	cc_library {		cc_defaults {
	name: "liblayers_proto",		name: "libsurfaceflinger_proto_deps",
	export_include_dirs: ["include"],		export_include_dirs: ["include"],

	srcs: [
	"LayerProtoParser.cpp",
	],

	static_libs: [		static_libs: [
	"libperfetto_client_experimental",		"libperfetto_client_experimental",
	],		],
	@@ -31,24 +26,15 @@ cc_library {
	],		],

	shared_libs: [		shared_libs: [
	"android.hardware.graphics.common@1.1",
	"libgui",
	"libui",
	"libprotobuf-cpp-lite",		"libprotobuf-cpp-lite",
	"libbase",
	],		],

	cppflags: [		header_libs: [
	"-Werror",		"libsurfaceflinger_proto_headers",
	"-Wno-unused-parameter",
	"-Wno-format",
	"-Wno-c++98-compat-pedantic",
	"-Wno-float-conversion",
	"-Wno-disabled-macro-expansion",
	"-Wno-float-equal",
	"-Wno-sign-conversion",
	"-Wno-padded",
	"-Wno-old-style-cast",
	"-Wno-undef",
	],		],
	}		}

			cc_library_headers {
			name: "libsurfaceflinger_proto_headers",
			export_include_dirs: ["include"],
			}

services/surfaceflinger/layerproto/LayerProtoParser.cpp

deleted100644 → 0

+0 −328

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2017 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 <android-base/stringprintf.h>
	#include <layerproto/LayerProtoParser.h>
	#include <ui/DebugUtils.h>

	using android::base::StringAppendF;
	using android::base::StringPrintf;

	namespace android {
	namespace surfaceflinger {

	bool sortLayers(LayerProtoParser::Layer* lhs, const LayerProtoParser::Layer* rhs) {
	uint32_t ls = lhs->layerStack;
	uint32_t rs = rhs->layerStack;
	if (ls != rs) return ls < rs;

	int32_t lz = lhs->z;
	int32_t rz = rhs->z;
	if (lz != rz) {
	return lz < rz;
	}

	return lhs->id < rhs->id;
	}

	LayerProtoParser::LayerTree LayerProtoParser::generateLayerTree(
	const perfetto::protos::LayersProto& layersProto) {
	LayerTree layerTree;
	layerTree.allLayers = generateLayerList(layersProto);

	// find and sort the top-level layers
	for (Layer& layer : layerTree.allLayers) {
	if (layer.parent == nullptr) {
	layerTree.topLevelLayers.push_back(&layer);
	}
	}
	std::sort(layerTree.topLevelLayers.begin(), layerTree.topLevelLayers.end(), sortLayers);

	return layerTree;
	}

	std::vector<LayerProtoParser::Layer> LayerProtoParser::generateLayerList(
	const perfetto::protos::LayersProto& layersProto) {
	std::vector<Layer> layerList;
	std::unordered_map<int32_t, Layer*> layerMap;

	// build the layer list and the layer map
	layerList.reserve(layersProto.layers_size());
	layerMap.reserve(layersProto.layers_size());
	for (int i = 0; i < layersProto.layers_size(); i++) {
	layerList.emplace_back(generateLayer(layersProto.layers(i)));
	// this works because layerList never changes capacity
	layerMap[layerList.back().id] = &layerList.back();
	}

	// fix up children and relatives
	for (int i = 0; i < layersProto.layers_size(); i++) {
	updateChildrenAndRelative(layersProto.layers(i), layerMap);
	}

	return layerList;
	}

	LayerProtoParser::Layer LayerProtoParser::generateLayer(
	const perfetto::protos::LayerProto& layerProto) {
	Layer layer;
	layer.id = layerProto.id();
	layer.name = layerProto.name();
	layer.type = layerProto.type();
	layer.transparentRegion = generateRegion(layerProto.transparent_region());
	layer.visibleRegion = generateRegion(layerProto.visible_region());
	layer.damageRegion = generateRegion(layerProto.damage_region());
	layer.layerStack = layerProto.layer_stack();
	layer.z = layerProto.z();
	layer.position = {layerProto.position().x(), layerProto.position().y()};
	layer.requestedPosition = {layerProto.requested_position().x(),
	layerProto.requested_position().y()};
	layer.size = {layerProto.size().w(), layerProto.size().h()};
	layer.crop = generateRect(layerProto.crop());
	layer.isOpaque = layerProto.is_opaque();
	layer.invalidate = layerProto.invalidate();
	layer.dataspace = layerProto.dataspace();
	layer.pixelFormat = layerProto.pixel_format();
	layer.color = {layerProto.color().r(), layerProto.color().g(), layerProto.color().b(),
	layerProto.color().a()};
	layer.requestedColor = {layerProto.requested_color().r(), layerProto.requested_color().g(),
	layerProto.requested_color().b(), layerProto.requested_color().a()};
	layer.flags = layerProto.flags();
	layer.transform = generateTransform(layerProto.transform());
	layer.requestedTransform = generateTransform(layerProto.requested_transform());
	layer.activeBuffer = generateActiveBuffer(layerProto.active_buffer());
	layer.bufferTransform = generateTransform(layerProto.buffer_transform());
	layer.queuedFrames = layerProto.queued_frames();
	layer.refreshPending = layerProto.refresh_pending();
	layer.isProtected = layerProto.is_protected();
	layer.isTrustedOverlay = layerProto.is_trusted_overlay();
	layer.cornerRadius = layerProto.corner_radius();
	layer.backgroundBlurRadius = layerProto.background_blur_radius();
	for (const auto& entry : layerProto.metadata()) {
	const std::string& dataStr = entry.second;
	std::vector<uint8_t>& outData = layer.metadata.mMap[entry.first];
	outData.resize(dataStr.size());
	memcpy(outData.data(), dataStr.data(), dataStr.size());
	}
	layer.cornerRadiusCrop = generateFloatRect(layerProto.corner_radius_crop());
	layer.shadowRadius = layerProto.shadow_radius();
	layer.ownerUid = layerProto.owner_uid();
	return layer;
	}

	LayerProtoParser::Region LayerProtoParser::generateRegion(
	const perfetto::protos::RegionProto& regionProto) {
	LayerProtoParser::Region region;
	for (int i = 0; i < regionProto.rect_size(); i++) {
	const perfetto::protos::RectProto& rectProto = regionProto.rect(i);
	region.rects.push_back(generateRect(rectProto));
	}

	return region;
	}

	LayerProtoParser::Rect LayerProtoParser::generateRect(
	const perfetto::protos::RectProto& rectProto) {
	LayerProtoParser::Rect rect;
	rect.left = rectProto.left();
	rect.top = rectProto.top();
	rect.right = rectProto.right();
	rect.bottom = rectProto.bottom();

	return rect;
	}

	LayerProtoParser::FloatRect LayerProtoParser::generateFloatRect(
	const perfetto::protos::FloatRectProto& rectProto) {
	LayerProtoParser::FloatRect rect;
	rect.left = rectProto.left();
	rect.top = rectProto.top();
	rect.right = rectProto.right();
	rect.bottom = rectProto.bottom();

	return rect;
	}

	LayerProtoParser::Transform LayerProtoParser::generateTransform(
	const perfetto::protos::TransformProto& transformProto) {
	LayerProtoParser::Transform transform;
	transform.dsdx = transformProto.dsdx();
	transform.dtdx = transformProto.dtdx();
	transform.dsdy = transformProto.dsdy();
	transform.dtdy = transformProto.dtdy();

	return transform;
	}

	LayerProtoParser::ActiveBuffer LayerProtoParser::generateActiveBuffer(
	const perfetto::protos::ActiveBufferProto& activeBufferProto) {
	LayerProtoParser::ActiveBuffer activeBuffer;
	activeBuffer.width = activeBufferProto.width();
	activeBuffer.height = activeBufferProto.height();
	activeBuffer.stride = activeBufferProto.stride();
	activeBuffer.format = activeBufferProto.format();

	return activeBuffer;
	}

	void LayerProtoParser::updateChildrenAndRelative(const perfetto::protos::LayerProto& layerProto,
	std::unordered_map<int32_t, Layer*>& layerMap) {
	auto currLayer = layerMap[layerProto.id()];

	for (int i = 0; i < layerProto.children_size(); i++) {
	if (layerMap.count(layerProto.children(i)) > 0) {
	currLayer->children.push_back(layerMap[layerProto.children(i)]);
	}
	}

	for (int i = 0; i < layerProto.relatives_size(); i++) {
	if (layerMap.count(layerProto.relatives(i)) > 0) {
	currLayer->relatives.push_back(layerMap[layerProto.relatives(i)]);
	}
	}

	if (layerProto.has_parent()) {
	if (layerMap.count(layerProto.parent()) > 0) {
	currLayer->parent = layerMap[layerProto.parent()];
	}
	}

	if (layerProto.has_z_order_relative_of()) {
	if (layerMap.count(layerProto.z_order_relative_of()) > 0) {
	currLayer->zOrderRelativeOf = layerMap[layerProto.z_order_relative_of()];
	}
	}
	}

	std::string LayerProtoParser::layerTreeToString(const LayerTree& layerTree) {
	std::string result;
	for (const LayerProtoParser::Layer* layer : layerTree.topLevelLayers) {
	if (layer->zOrderRelativeOf != nullptr) {
	continue;
	}
	result.append(layerToString(layer));
	}

	return result;
	}

	std::string LayerProtoParser::layerToString(const LayerProtoParser::Layer* layer) {
	std::string result;

	std::vector<Layer*> traverse(layer->relatives);
	for (LayerProtoParser::Layer* child : layer->children) {
	if (child->zOrderRelativeOf != nullptr) {
	continue;
	}

	traverse.push_back(child);
	}

	std::sort(traverse.begin(), traverse.end(), sortLayers);

	size_t i = 0;
	for (; i < traverse.size(); i++) {
	auto& relative = traverse[i];
	if (relative->z >= 0) {
	break;
	}
	result.append(layerToString(relative));
	}
	result.append(layer->to_string());
	result.append("\n");
	for (; i < traverse.size(); i++) {
	auto& relative = traverse[i];
	result.append(layerToString(relative));
	}

	return result;
	}

	std::string LayerProtoParser::ActiveBuffer::to_string() const {
	return StringPrintf("[%4ux%4u:%4u,%s]", width, height, stride,
	decodePixelFormat(format).c_str());
	}

	std::string LayerProtoParser::Transform::to_string() const {
	return StringPrintf("[%.2f, %.2f][%.2f, %.2f]", static_cast<double>(dsdx),
	static_cast<double>(dtdx), static_cast<double>(dsdy),
	static_cast<double>(dtdy));
	}

	std::string LayerProtoParser::Rect::to_string() const {
	return StringPrintf("[%3d, %3d, %3d, %3d]", left, top, right, bottom);
	}

	std::string LayerProtoParser::FloatRect::to_string() const {
	return StringPrintf("[%.2f, %.2f, %.2f, %.2f]", left, top, right, bottom);
	}

	std::string LayerProtoParser::Region::to_string(const char* what) const {
	std::string result =
	StringPrintf(" Region %s (this=%lx count=%d)\n", what, static_cast<unsigned long>(id),
	static_cast<int>(rects.size()));

	for (auto& rect : rects) {
	StringAppendF(&result, " %s\n", rect.to_string().c_str());
	}

	return result;
	}

	std::string LayerProtoParser::Layer::to_string() const {
	std::string result;
	StringAppendF(&result, "+ %s (%s) uid=%d\n", type.c_str(), name.c_str(), ownerUid);
	result.append(transparentRegion.to_string("TransparentRegion").c_str());
	result.append(visibleRegion.to_string("VisibleRegion").c_str());
	result.append(damageRegion.to_string("SurfaceDamageRegion").c_str());

	StringAppendF(&result, " layerStack=%4d, z=%9d, pos=(%g,%g), size=(%4d,%4d), ", layerStack,
	z, static_cast<double>(position.x), static_cast<double>(position.y), size.x,
	size.y);

	StringAppendF(&result, "crop=%s, ", crop.to_string().c_str());
	StringAppendF(&result, "cornerRadius=%f, ", cornerRadius);
	StringAppendF(&result, "isProtected=%1d, ", isProtected);
	StringAppendF(&result, "isTrustedOverlay=%1d, ", isTrustedOverlay);
	StringAppendF(&result, "isOpaque=%1d, invalidate=%1d, ", isOpaque, invalidate);
	StringAppendF(&result, "dataspace=%s, ", dataspace.c_str());
	StringAppendF(&result, "defaultPixelFormat=%s, ", pixelFormat.c_str());
	StringAppendF(&result, "backgroundBlurRadius=%1d, ", backgroundBlurRadius);
	StringAppendF(&result, "color=(%.3f,%.3f,%.3f,%.3f), flags=0x%08x, ",
	static_cast<double>(color.r), static_cast<double>(color.g),
	static_cast<double>(color.b), static_cast<double>(color.a), flags);
	StringAppendF(&result, "tr=%s", transform.to_string().c_str());
	result.append("\n");
	StringAppendF(&result, " parent=%s\n", parent == nullptr ? "none" : parent->name.c_str());
	StringAppendF(&result, " zOrderRelativeOf=%s\n",
	zOrderRelativeOf == nullptr ? "none" : zOrderRelativeOf->name.c_str());
	StringAppendF(&result, " activeBuffer=%s,", activeBuffer.to_string().c_str());
	StringAppendF(&result, " tr=%s", bufferTransform.to_string().c_str());
	StringAppendF(&result, " queued-frames=%d", queuedFrames);
	StringAppendF(&result, " metadata={");
	bool first = true;
	for (const auto& entry : metadata.mMap) {
	if (!first) result.append(", ");
	first = false;
	result.append(metadata.itemToString(entry.first, ":"));
	}
	result.append("},");
	StringAppendF(&result, " cornerRadiusCrop=%s, ", cornerRadiusCrop.to_string().c_str());
	StringAppendF(&result, " shadowRadius=%.3f, ", shadowRadius);
	return result;
	}

	} // namespace surfaceflinger
	} // namespace android