Merge changes from topic "revert-21585493-b218588089-GJWXNTRALQ" into udc-dev (397bfe16) · Commits · e / os / android_hardware_interfaces

automotive/evs/aidl/impl/default/Android.bp

+3 −46

Original line number	Diff line number	Diff line
		@@ -24,56 +24,13 @@ package {
		cc_binary {
		name: "android.hardware.automotive.evs-aidl-default-service",
		defaults: ["EvsHalDefaults"],
		vintf_fragments: ["manifest_evs-default-service.xml"],
		local_include_dirs: ["include"],
		vintf_fragments: ["evs-default-service.xml"],
		init_rc: ["evs-default-service.rc"],
		vendor: true,
		relative_install_path: "hw",
		cflags: [
		"-DGL_GLEXT_PROTOTYPES",
		"-DEGL_EGLEXT_PROTOTYPES",
		"-Wall",
		"-Wextra",
		"-Werror",
		"-Wthread-safety",
		],
		srcs: [
		":libgui_frame_event_aidl",
		"src/*.cpp"
		],
		srcs: ["src/*.cpp"],
		shared_libs: [
		"android.hardware.graphics.bufferqueue@1.0",
		"android.hardware.graphics.bufferqueue@2.0",
		"android.hidl.token@1.0-utils",
		"libEGL",
		"libGLESv2",
		"libbase",
		"libbinder_ndk",
		"libbufferqueueconverter",
		"libcamera_metadata",
		"libhardware_legacy",
		"libhidlbase",
		"liblog",
		"libnativewindow",
		"libtinyxml2",
		"libui",
		"libutils",
		"libyuv",
		],
		static_libs: [
		"android.frameworks.automotive.display-V1-ndk",
		"android.hardware.automotive.evs-V1-ndk",
		"android.hardware.common-V2-ndk",
		"libaidlcommonsupport",
		"libcutils",
		],
		local_include_dirs: ["include"],
		include_dirs: ["frameworks/native/include/"],
		required: ["evs_mock_hal_configuration.xml"],
		}

		prebuilt_etc {
		name: "evs_mock_hal_configuration.xml",
		soc_specific: true,
		src: "resources/evs_mock_configuration.xml",
		sub_dir: "automotive/evs",
		}

automotive/evs/aidl/impl/default/evs-default-service.rc

+2 −5

Original line number	Diff line number	Diff line
		service vendor.evs-hal-default /vendor/bin/hw/android.hardware.automotive.evs-aidl-default-service
		class early_hal
		priority -20
		user graphics
		group automotive_evs camera
		onrestart restart cardisplayproxyd
		onrestart restart evsmanagerd
		user automotive_evs
		group automotive_evs
		disabled

automotive/evs/aidl/impl/default/manifest_evs-default-service.xml→automotive/evs/aidl/impl/default/evs-default-service.xml

+11 −0

Original line number	Diff line number	Diff line
		<manifest version="1.0" type="device">
		<hal format="aidl">
		<name>android.hardware.automotive.evs</name>
		<fqname>IEvsEnumerator/hw/0</fqname>
		<transport>hwbinder</transport>
		<version>1</version>
		<interface>
		<name>IEvsEnumerator</name>
		<instance>hw/0</instance>
		</interface>
		</hal>
		</manifest>

automotive/evs/aidl/impl/default/include/ConfigManager.h

deleted100644 → 0

+0 −384

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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 "ConfigManagerUtil.h"

		#include <aidl/android/hardware/automotive/evs/CameraParam.h>
		#include <aidl/android/hardware/graphics/common/PixelFormat.h>
		#include <android-base/logging.h>
		#include <system/camera_metadata.h>

		#include <tinyxml2.h>

		#include <string>
		#include <string_view>
		#include <unordered_map>
		#include <unordered_set>
		#include <vector>

		/*
		* Please note that this is different from what is defined in
		* libhardware/modules/camera/3_4/metadata/types.h; this has one additional
		* field to store a framerate.
		*/
		typedef struct {
		int id;
		int width;
		int height;
		::aidl::android::hardware::graphics::common::PixelFormat format;
		int type;
		int framerate;
		} StreamConfiguration;

		class ConfigManager final {
		public:
		static std::unique_ptr<ConfigManager> Create();
		ConfigManager(const ConfigManager&) = delete;
		ConfigManager& operator=(const ConfigManager&) = delete;

		/* Camera device's capabilities and metadata */
		class CameraInfo {
		public:
		CameraInfo() : characteristics(nullptr) {}

		virtual ~CameraInfo();

		/* Allocate memory for camera_metadata_t */
		bool allocate(size_t entry_cap, size_t data_cap) {
		if (characteristics != nullptr) {
		LOG(ERROR) << "Camera metadata is already allocated";
		return false;
		}

		characteristics = allocate_camera_metadata(entry_cap, data_cap);
		return characteristics != nullptr;
		}

		/*
		* List of supported controls that the primary client can program.
		* Paraemters are stored with its valid range
		*/
		std::unordered_map<::aidl::android::hardware::automotive::evs::CameraParam,
		std::tuple<int32_t, int32_t, int32_t>>
		controls;

		/*
		* List of supported output stream configurations.
		*/
		std::unordered_map<int32_t, StreamConfiguration> streamConfigurations;

		/*
		* Internal storage for camera metadata. Each entry holds a pointer to
		* data and number of elements
		*/
		std::unordered_map<camera_metadata_tag_t, std::pair<void*, size_t>> cameraMetadata;

		/* Camera module characteristics */
		camera_metadata_t* characteristics;
		};

		class CameraGroupInfo : public CameraInfo {
		public:
		CameraGroupInfo() {}

		/* ID of member camera devices */
		std::unordered_set<std::string> devices;

		/* The capture operation of member camera devices are synchronized */
		int32_t synchronized = 0;
		};

		class SystemInfo {
		public:
		/* number of available cameras */
		int32_t numCameras = 0;
		};

		class DisplayInfo {
		public:
		/*
		* List of supported input stream configurations.
		*/
		std::unordered_map<int32_t, StreamConfiguration> streamConfigurations;
		};

		/*
		* Return system information
		*
		* @return SystemInfo
		* Constant reference of SystemInfo.
		*/
		const SystemInfo& getSystemInfo() {
		std::unique_lock<std::mutex> lock(mConfigLock);
		mConfigCond.wait(lock, [this] { return mIsReady; });
		return mSystemInfo;
		}

		/*
		* Return a list of camera identifiers
		*
		* This function assumes that it is not being called frequently.
		*
		* @return std::vector<std::string>
		* A vector that contains unique camera device identifiers.
		*/
		std::vector<std::string> getCameraIdList() {
		std::unique_lock<std::mutex> lock(mConfigLock);
		mConfigCond.wait(lock, [this] { return mIsReady; });

		std::vector<std::string> aList;
		aList.reserve(mCameraInfo.size());
		for (auto&& v : mCameraInfo) {
		aList.push_back(v.first);
		}

		return aList;
		}

		/*
		* Return a list of camera group identifiers
		*
		* This function assumes that it is not being called frequently.
		*
		* @return std::vector<std::string>
		* A vector that contains unique camera device identifiers.
		*/
		std::vector<std::string> getCameraGroupIdList() {
		std::unique_lock<std::mutex> lock(mConfigLock);
		mConfigCond.wait(lock, [this] { return mIsReady; });

		std::vector<std::string> aList;
		aList.reserve(mCameraGroups.size());
		for (auto&& v : mCameraGroups) {
		aList.push_back(v.first);
		}

		return aList;
		}

		/*
		* Return a pointer to the camera group
		*
		* @return CameraGroup
		* A pointer to a camera group identified by a given id.
		*/
		std::unique_ptr<CameraGroupInfo>& getCameraGroupInfo(const std::string& gid) {
		std::unique_lock<std::mutex> lock(mConfigLock);
		mConfigCond.wait(lock, [this] { return mIsReady; });

		return mCameraGroups[gid];
		}

		/*
		* Return a camera metadata
		*
		* @param cameraId
		* Unique camera node identifier in string
		*
		* @return unique_ptr<CameraInfo>
		* A pointer to CameraInfo that is associated with a given camera
		* ID. This returns a null pointer if this does not recognize a
		* given camera identifier.
		*/
		std::unique_ptr<CameraInfo>& getCameraInfo(const std::string& cameraId) noexcept {
		std::unique_lock<std::mutex> lock(mConfigLock);
		mConfigCond.wait(lock, [this] { return mIsReady; });

		return mCameraInfo[cameraId];
		}

		/*
		* Tell whether the configuration data is ready to be used
		*
		* @return bool
		* True if configuration data is ready to be consumed.
		*/
		bool isReady() const { return mIsReady; }

		private:
		/* Constructors */
		ConfigManager() : mBinaryFilePath("") {}

		static std::string_view sConfigDefaultPath;
		static std::string_view sConfigOverridePath;

		/* System configuration */
		SystemInfo mSystemInfo;

		/* Internal data structure for camera device information */
		std::unordered_map<std::string, std::unique_ptr<CameraInfo>> mCameraInfo;

		/* Internal data structure for camera device information */
		std::unordered_map<std::string, std::unique_ptr<DisplayInfo>> mDisplayInfo;

		/* Camera groups are stored in <groud id, CameraGroup> hash map */
		std::unordered_map<std::string, std::unique_ptr<CameraGroupInfo>> mCameraGroups;

		/*
		* Camera positions are stored in <position, camera id set> hash map.
		* The position must be one of front, rear, left, and right.
		*/
		std::unordered_map<std::string, std::unordered_set<std::string>> mCameraPosition;

		/* Configuration data lock */
		mutable std::mutex mConfigLock;

		/*
		* This condition is signalled when it completes a configuration data
		* preparation.
		*/
		std::condition_variable mConfigCond;

		/* A path to a binary configuration file */
		const char* mBinaryFilePath;

		/* Configuration data readiness */
		bool mIsReady = false;

		/*
		* Parse a given EVS configuration file and store the information
		* internally.
		*
		* @return bool
		* True if it completes parsing a file successfully.
		*/
		bool readConfigDataFromXML() noexcept;

		/*
		* read the information of the vehicle
		*
		* @param aSysElem
		* A pointer to "system" XML element.
		*/
		void readSystemInfo(const tinyxml2::XMLElement* const aSysElem);

		/*
		* read the information of camera devices
		*
		* @param aCameraElem
		* A pointer to "camera" XML element that may contain multiple
		* "device" elements.
		*/
		void readCameraInfo(const tinyxml2::XMLElement* const aCameraElem);

		/*
		* read display device information
		*
		* @param aDisplayElem
		* A pointer to "display" XML element that may contain multiple
		* "device" elements.
		*/
		void readDisplayInfo(const tinyxml2::XMLElement* const aDisplayElem);

		/*
		* read camera device information
		*
		* @param aCamera
		* A pointer to CameraInfo that will be completed by this
		* method.
		* aDeviceElem
		* A pointer to "device" XML element that contains camera module
		* capability info and its characteristics.
		*
		* @return bool
		* Return false upon any failure in reading and processing camera
		* device information.
		*/
		bool readCameraDeviceInfo(CameraInfo* aCamera, const tinyxml2::XMLElement* aDeviceElem);

		/*
		* read camera metadata
		*
		* @param aCapElem
		* A pointer to "cap" XML element.
		* @param aCamera
		* A pointer to CameraInfo that is being filled by this method.
		* @param dataSize
		* Required size of memory to store camera metadata found in this
		* method. This is calculated in this method and returned to the
		* caller for camera_metadata allocation.
		*
		* @return size_t
		* Number of camera metadata entries
		*/
		size_t readCameraCapabilities(const tinyxml2::XMLElement* const aCapElem, CameraInfo* aCamera,
		size_t& dataSize);

		/*
		* read camera metadata
		*
		* @param aParamElem
		* A pointer to "characteristics" XML element.
		* @param aCamera
		* A pointer to CameraInfo that is being filled by this method.
		* @param dataSize
		* Required size of memory to store camera metadata found in this
		* method.
		*
		* @return size_t
		* Number of camera metadata entries
		*/
		size_t readCameraMetadata(const tinyxml2::XMLElement* const aParamElem, CameraInfo* aCamera,
		size_t& dataSize);

		/*
		* construct camera_metadata_t from camera capabilities and metadata
		*
		* @param aCamera
		* A pointer to CameraInfo that is being filled by this method.
		* @param totalEntries
		* Number of camera metadata entries to be added.
		* @param totalDataSize
		* Sum of sizes of camera metadata entries to be added.
		*
		* @return bool
		* False if either it fails to allocate memory for camera metadata
		* or its size is not large enough to add all found camera metadata
		* entries.
		*/
		bool constructCameraMetadata(CameraInfo* aCamera, const size_t totalEntries,
		const size_t totalDataSize);

		/*
		* Read configuration data from the binary file
		*
		* @return bool
		* True if it succeeds to read configuration data from a binary
		* file.
		*/
		bool readConfigDataFromBinary();

		/*
		* Store configuration data to the file
		*
		* @return bool
		* True if it succeeds to serialize mCameraInfo to the file.
		*/
		bool writeConfigDataToBinary();

		/*
		* debugging method to print out all XML elements and their attributes in
		* logcat message.
		*
		* @param aNode
		* A pointer to the root XML element to navigate.
		* @param prefix
		* A prefix to XML string.
		*/
		void printElementNames(const tinyxml2::XMLElement* aNode, const std::string& prefix = "") const;
		};

automotive/evs/aidl/impl/default/include/ConfigManagerUtil.h

deleted100644 → 0

+0 −62

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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 <aidl/android/hardware/automotive/evs/CameraParam.h>
		#include <aidl/android/hardware/graphics/common/PixelFormat.h>
		#include <android-base/macros.h>
		#include <system/camera_metadata.h>

		#include <string>
		#include <utility>

		class ConfigManagerUtil final {
		public:
		/**
		* Convert a given string into V4L2_CID_*
		*/
		static bool convertToEvsCameraParam(
		const std::string& id,
		::aidl::android::hardware::automotive::evs::CameraParam& camParam);
		/**
		* Convert a given string into android.hardware.graphics.common.PixelFormat
		*/
		static bool convertToPixelFormat(const std::string& in,
		::aidl::android::hardware::graphics::common::PixelFormat& out);
		/**
		* Convert a given string into corresponding camera metadata data tag defined in
		* system/media/camera/include/system/camera_metadata_tags.h
		*/
		static bool convertToMetadataTag(const char* name, camera_metadata_tag& aTag);
		/**
		* Convert a given string into a floating value array
		*/
		static float* convertFloatArray(const char* sz, const char* vals, size_t& count,
		const char delimiter = ',');
		/**
		* Trim a string
		*/
		static std::string trimString(const std::string& src, const std::string& ws = " \n\r\t\f\v");

		/**
		* Convert a given string to corresponding camera capabilities
		*/
		static bool convertToCameraCapability(
		const char* name, camera_metadata_enum_android_request_available_capabilities_t& cap);

		DISALLOW_IMPLICIT_CONSTRUCTORS(ConfigManagerUtil);
		};