From patchwork Wed Sep 11 15:35:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 21233 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 5C25EC324C for ; Wed, 11 Sep 2024 15:35:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A7E04634F9; Wed, 11 Sep 2024 17:35:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="DE15H+lu"; 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 280BA618FB for ; Wed, 11 Sep 2024 17:35:30 +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 50BF1C80; Wed, 11 Sep 2024 17:34:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1726068852; bh=SSRWWpB7JOvFzaXrKtraOVqDqvLvnk0SyPbDovE0rlU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DE15H+luB8LIhg3/cdUWXHNSBE0YR9lQhB/vk3iqsgBHuQ959nrbtZ1jfBPyebDcO djpNy5zED9YNke/Mw5gHIG9/ShxIUz1Q7rJ85px+Td7igTI3tQAPFpJZRoMcIbgon3 12r7TYP6yeSu+tGVQVQWOgWFdxk5ApgjbBoT6x98= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder Subject: [PATCH 1/2] libcamera: controls: Add array information to ControlId Date: Wed, 11 Sep 2024 17:35:22 +0200 Message-Id: <20240911153523.1756554-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911153523.1756554-1-paul.elder@ideasonboard.com> References: <20240911153523.1756554-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 on whether or not it is an array control, and the size of the control if it is an array control. Signed-off-by: Paul Elder Reviewed-by: Kieran Bingham --- include/libcamera/controls.h | 17 ++++++++++++++++- src/libcamera/controls.cpp | 16 ++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 8959dfcc2..b539159e1 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -46,50 +46,60 @@ struct control_type { template<> struct control_type { static constexpr ControlType value = ControlTypeNone; + static constexpr std::size_t size = 0; }; template<> struct control_type { static constexpr ControlType value = ControlTypeBool; + static constexpr std::size_t size = 0; }; template<> struct control_type { static constexpr ControlType value = ControlTypeByte; + static constexpr std::size_t size = 0; }; template<> struct control_type { static constexpr ControlType value = ControlTypeInteger32; + static constexpr std::size_t size = 0; }; template<> struct control_type { static constexpr ControlType value = ControlTypeInteger64; + static constexpr std::size_t size = 0; }; template<> struct control_type { static constexpr ControlType value = ControlTypeFloat; + static constexpr std::size_t size = 0; }; template<> struct control_type { static constexpr ControlType value = ControlTypeString; + static constexpr std::size_t size = 0; }; template<> struct control_type { static constexpr ControlType value = ControlTypeRectangle; + static constexpr std::size_t size = 0; }; template<> struct control_type { static constexpr ControlType value = ControlTypeSize; + static constexpr std::size_t size = 0; }; template struct control_type> : public control_type> { + static constexpr std::size_t size = N; }; } /* namespace details */ @@ -215,11 +225,14 @@ class ControlId { public: ControlId(unsigned int id, const std::string &name, ControlType type, + std::size_t size = 0, const std::map &enumStrMap = {}); unsigned int id() const { return id_; } const std::string &name() const { return name_; } ControlType type() const { return type_; } + bool isArray() const { return size_ > 0; } + std::size_t size() const { return size_; } const std::map &enumStrMap() const { return enumStrMap_; } const std::string enumToString(int32_t value) const; @@ -229,6 +242,7 @@ private: unsigned int id_; std::string name_; ControlType type_; + std::size_t size_; std::map enumStrMap_; std::map reverseMap_; }; @@ -260,7 +274,8 @@ public: using type = T; Control(unsigned int id, const char *name, const std::map &enumStrMap = {}) - : ControlId(id, name, details::control_type>::value, enumStrMap) + : ControlId(id, name, details::control_type>::value, + details::control_type>::size, enumStrMap) { } diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 0f83139fb..1530bdb9c 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -394,8 +394,8 @@ void ControlValue::reserve(ControlType type, bool isArray, std::size_t numElemen * \param[in] enumStrMap The map from enum names to values (optional) */ ControlId::ControlId(unsigned int id, const std::string &name, ControlType type, - const std::map &enumStrMap) - : id_(id), name_(name), type_(type), enumStrMap_(enumStrMap) + std::size_t size, const std::map &enumStrMap) + : id_(id), name_(name), type_(type), size_(size), enumStrMap_(enumStrMap) { for (const auto &pair : enumStrMap_) reverseMap_[pair.second] = pair.first; @@ -419,6 +419,18 @@ ControlId::ControlId(unsigned int id, const std::string &name, ControlType type, * \return The control data type */ +/** + * \fn bool isArray() const + * \brief Determine if the control is an array control + * \return True if the control is an array control, false otherwise + */ + +/** + * \fn std::size_t size() const + * \brief Retrieve the size of the control if it is an array control + * \return The size of the array control, size_t::max for dynamic extend, or 0 for non-array + */ + /** * \brief Retrieve the name of an enum value * \return The name of the enum value From patchwork Wed Sep 11 15:35:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 21234 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 18737C324C for ; Wed, 11 Sep 2024 15:35:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4957E634FC; Wed, 11 Sep 2024 17:35:37 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="gLwX1dKj"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 89001634F4 for ; Wed, 11 Sep 2024 17:35:30 +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 EBE0013D7; Wed, 11 Sep 2024 17:34:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1726068853; bh=cJgAYfssCVZfxrb0/7cTZTFNYc/HsSeJZouNT/9YJvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gLwX1dKjj/I7aS8rFUZD93J6uQZMS1TFRlQBa3V9kQ3kh5BW63yML4E8oO38OAjmS 7wdZlaXzv7mgl7Y7G6rUsCb+7bYfgDSZS3X62xxvZ3UxDDa3888bz+Zo+Pz8xl2Y/4 MtLNpznrBNf+YgtuQ/8nSnjepbGBWZ+s15FT/RbU= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder Subject: [PATCH 2/2] apps: cam: Print control array sizes Date: Wed, 11 Sep 2024 17:35:23 +0200 Message-Id: <20240911153523.1756554-3-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911153523.1756554-1-paul.elder@ideasonboard.com> References: <20240911153523.1756554-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 controls can be queried for array information, print it in --list-controls when applicable. Signed-off-by: Paul Elder Reviewed-by: Kieran Bingham --- src/apps/cam/camera_session.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp index 37de6c9f3..9c7f84993 100644 --- a/src/apps/cam/camera_session.cpp +++ b/src/apps/cam/camera_session.cpp @@ -169,6 +169,11 @@ void CameraSession::listControls() const std::cout << " - " << id->enumToString(val) << " (" << val << ")" << std::endl; } } + + if (id->isArray()) { + std::size_t size = id->size(); + std::cout << " Size: " << (size == std::numeric_limits::max() ? "n" : std::to_string(size)) << std::endl; + } } }