From patchwork Tue Sep 10 18:07:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 21217 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 6277CC324C for ; Tue, 10 Sep 2024 18:07:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0F5A4634FC; Tue, 10 Sep 2024 20:07:47 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="RYNtL4Tf"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2C526634F5 for ; Tue, 10 Sep 2024 20:07:43 +0200 (CEST) Received: from pyrite.hamster-moth.ts.net (213-229-8-243.static.upcbusiness.at [213.229.8.243]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EE0E118E5; Tue, 10 Sep 2024 20:06:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1725991586; bh=hWzvMQlYrOCQ70RdHH4U8zW9lFbfvRGA5TSw6I59YqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RYNtL4TfPjUyWW0oicZPOGGRZHnHiT3brEAilv9nMd56Cg8c52V+qP+CWsDVDCP1z Zlrls12CPqq6lWMeHLQre7v/BW20scvsQMWauo1IVoRZ46eyAS2RraZimmkolJvC9Y frm1Jv2/9u9vtgdX14TkCMMFhIKq7oj7i+PnDyCk= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder , stefan.klug@ideasonboard.com Subject: [PATCH 1/2] libcamera: controls: Add enum names and values map to ControlId Date: Tue, 10 Sep 2024 20:07:28 +0200 Message-Id: <20240910180729.2096985-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240910180729.2096985-1-paul.elder@ideasonboard.com> References: <20240910180729.2096985-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add to ControlId information about the names and values of enum, in the event that the ControlId is an enum type. This allows applications to query the ControlId for the names of the enum values, so that they can be displayed on a UI, for example. Without this, it was necessary to use macros of NameOfControlNameValueMap, which is difficult to use and is very inflexible. The main map is name -> value, as this was necessary for mapping names from tuning files to enum values. We reuse this generated code to reduce complexity, and generate a reverse map from it. Signed-off-by: Paul Elder --- include/libcamera/controls.h | 15 +++++++++------ src/libcamera/control_ids.cpp.in | 4 +++- src/libcamera/controls.cpp | 29 +++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 7c2bb2872..407a12256 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include #include #include @@ -213,14 +214,14 @@ private: class ControlId { public: - ControlId(unsigned int id, const std::string &name, ControlType type) - : id_(id), name_(name), type_(type) - { - } + ControlId(unsigned int id, const std::string &name, ControlType type, + const std::map &nameValueMap = {}); unsigned int id() const { return id_; } const std::string &name() const { return name_; } ControlType type() const { return type_; } + const std::map &nameValueMap() const { return nameValueMap_; } + const std::string enumName(int32_t value) const; private: LIBCAMERA_DISABLE_COPY_AND_MOVE(ControlId) @@ -228,6 +229,8 @@ private: unsigned int id_; std::string name_; ControlType type_; + std::map nameValueMap_; + std::map reverseMap_; }; static inline bool operator==(unsigned int lhs, const ControlId &rhs) @@ -256,8 +259,8 @@ class Control : public ControlId public: using type = T; - Control(unsigned int id, const char *name) - : ControlId(id, name, details::control_type>::value) + Control(unsigned int id, const char *name, const std::map &nameValueMap = {}) + : ControlId(id, name, details::control_type>::value, nameValueMap) { } diff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in index 05c8fb385..3a2049311 100644 --- a/src/libcamera/control_ids.cpp.in +++ b/src/libcamera/control_ids.cpp.in @@ -89,8 +89,10 @@ extern const std::map {{ctrl.name}}NameValueMap = { { "{{enum.name}}", {{enum.name}} }, {%- endfor %} }; -{% endif -%} +extern const Control<{{ctrl.type}}> {{ctrl.name}}({{ctrl.name|snake_case|upper}}, "{{ctrl.name}}", {{ctrl.name}}NameValueMap); +{% else -%} extern const Control<{{ctrl.type}}> {{ctrl.name}}({{ctrl.name|snake_case|upper}}, "{{ctrl.name}}"); +{% endif -%} {%- endfor %} {% if vendor != 'libcamera' %} diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index dba744042..1c7e7fde1 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -7,6 +7,8 @@ #include +#include +#include #include #include #include @@ -389,7 +391,15 @@ void ControlValue::reserve(ControlType type, bool isArray, std::size_t numElemen * \param[in] id The control numerical ID * \param[in] name The control name * \param[in] type The control data type + * \param[in] nameValueMap The map from enum names to values (optional) */ +ControlId::ControlId(unsigned int id, const std::string &name, ControlType type, + const std::map &nameValueMap) + : id_(id), name_(name), type_(type), nameValueMap_(nameValueMap) +{ + for (const auto &pair : nameValueMap_) + reverseMap_[pair.second] = pair.first; +} /** * \fn unsigned int ControlId::id() const @@ -409,6 +419,24 @@ void ControlValue::reserve(ControlType type, bool isArray, std::size_t numElemen * \return The control data type */ +/** + * \brief Retrieve the name of an enum value + * \return The name of the enum value + */ +const std::string ControlId::enumName(int32_t value) const +{ + if (reverseMap_.find(value) != reverseMap_.end()) + return reverseMap_.at(value); + + return "UNKNOWN"; +} + +/** + * \fn std::map ControlId::nameValueMap() const + * \brief Retrieve the map from enum names to enum values (if applicable) + * \return The map from enum names to enum values + */ + /** * \fn bool operator==(unsigned int lhs, const ControlId &rhs) * \brief Compare a ControlId with a control numerical ID @@ -459,6 +487,7 @@ void ControlValue::reserve(ControlType type, bool isArray, std::size_t numElemen * \brief Construct a Control instance * \param[in] id The control numerical ID * \param[in] name The control name + * \param[in] nameValueMap The map from enum names to values (optional) * * The control data type is automatically deduced from the template type T. */ From patchwork Tue Sep 10 18:07:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 21218 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 98481C324C for ; Tue, 10 Sep 2024 18:07:52 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2476D63501; Tue, 10 Sep 2024 20:07:48 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MuiK6QIh"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 57A58634F8 for ; Tue, 10 Sep 2024 20:07:43 +0200 (CEST) Received: from pyrite.hamster-moth.ts.net (213-229-8-243.static.upcbusiness.at [213.229.8.243]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3F6F91920; Tue, 10 Sep 2024 20:06:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1725991586; bh=Dl9F/Kph6lZE3WX7bi4SdDUqhda3P9BaEBW1002z5ac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MuiK6QIhL/0l+iikglditQPv4VqVKGhxalPOoDIx4OvfAqf78IolCyNfuY0Z/j5V5 xxkNsVzogWp1wfuawTpqOETdUv1/bB9iKM0dfQDAJpNmd0+3kJ/f4T7lq34IVVWY4N Ym+35OlSUpvFp5U6VnfoXI5Rm1eZPpHqGX+Rc05o= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder , stefan.klug@ideasonboard.com Subject: [PATCH 2/2] apps: cam: Print control enum values more nicely Date: Tue, 10 Sep 2024 20:07:29 +0200 Message-Id: <20240910180729.2096985-3-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240910180729.2096985-1-paul.elder@ideasonboard.com> References: <20240910180729.2096985-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Now that enum names can be obtained from ControlId, use that information to print out the list of supported enum values in --list-controls. Signed-off-by: Paul Elder --- src/apps/cam/camera_session.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp index 097dc4792..964f2e8c3 100644 --- a/src/apps/cam/camera_session.cpp +++ b/src/apps/cam/camera_session.cpp @@ -159,8 +159,16 @@ CameraSession::~CameraSession() void CameraSession::listControls() const { for (const auto &[id, info] : camera_->controls()) { - std::cout << "Control: " << id->name() << ": " - << info.toString() << std::endl; + if (info.values().size() == 0) { + std::cout << "Control: " << id->name() << ": " + << info.toString() << std::endl; + } else { + std::cout << "Control: " << id->name() << ": " << std::endl; + for (const auto &value : info.values()) { + int32_t val = value.get(); + std::cout << " - " << id->enumName(val) << " (" << val << ")" << std::endl; + } + } } }