Patch Detail
Show a patch.
GET /api/1.1/patches/21638/?format=api
{ "id": 21638, "url": "https://patchwork.libcamera.org/api/1.1/patches/21638/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21638/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20241016111943.1411372-2-paul.elder@ideasonboard.com>", "date": "2024-10-16T11:19:41", "name": "[v2,1/3] libcamera: controls: Add vendor information to ControlId", "commit_ref": "aafa406edd39d04689bfcd4ff5239f918a0885ce", "pull_url": null, "state": "accepted", "archived": false, "hash": "3f77644ac11a7f95b5cfba16a74d7f2e4981041f", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21638/mbox/", "series": [ { "id": 4704, "url": "https://patchwork.libcamera.org/api/1.1/series/4704/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4704", "date": "2024-10-16T11:19:40", "name": "libcamera: controls: Add namespace to ControlId", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4704/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21638/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21638/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E6416C32FA\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 16 Oct 2024 11:20:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E829E65384;\n\tWed, 16 Oct 2024 13:19:58 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 47F7B6537F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 16 Oct 2024 13:19:54 +0200 (CEST)", "from neptunite.flets-east.jp (unknown\n\t[IPv6:2404:7a81:160:2100:b5b2:fcb4:385e:af78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 016F4A57;\n\tWed, 16 Oct 2024 13:18:10 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"iu6bS/0e\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1729077492;\n\tbh=/y439VphDzFwze+CWNoLBbwebUQ1NiJBIq3EjdNwWA0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=iu6bS/0eHUXpVpj3rK4JZr0T00+W5cDWGKp5sHvs4KXdHI7Pbtp16QdFXKv2NIZ7N\n\toUnaAM2DgWEM7suFr/fgF42D1PwksqQ84Dx8ZpNjSOsx9C2xBMfzsQGn2hwf5YOiVq\n\tUNrUUPLchZ8ZVTYs9VMcElddep2ZH2xsY4g4m1M8=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Paul Elder <paul.elder@ideasonboard.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v2 1/3] libcamera: controls: Add vendor information to\n\tControlId", "Date": "Wed, 16 Oct 2024 20:19:41 +0900", "Message-Id": "<20241016111943.1411372-2-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.39.2", "In-Reply-To": "<20241016111943.1411372-1-paul.elder@ideasonboard.com>", "References": "<20241016111943.1411372-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add vendor/namespace information to ControlId, so that the vendor can be\nqueried from it. This is expected to be used by applications either\nsimply to display the vendor or for it to be used for grouping in a\nUI.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\nChanges in v2:\n- reorder code so that vendor comes immediately after name\n---\n include/libcamera/controls.h | 11 +++++++----\n src/libcamera/control_ids.cpp.in | 4 ++--\n src/libcamera/control_serializer.cpp | 2 +-\n src/libcamera/controls.cpp | 19 +++++++++++++++----\n src/libcamera/v4l2_device.cpp | 2 +-\n 5 files changed, 26 insertions(+), 12 deletions(-)", "diff": "diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex ca60bbacad17..4c28240812bf 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -234,12 +234,13 @@ private:\n class ControlId\n {\n public:\n-\tControlId(unsigned int id, const std::string &name, ControlType type,\n-\t\t std::size_t size = 0,\n+\tControlId(unsigned int id, const std::string &name, const std::string &vendor,\n+\t\t ControlType type, std::size_t size = 0,\n \t\t const std::map<std::string, int32_t> &enumStrMap = {});\n \n \tunsigned int id() const { return id_; }\n \tconst std::string &name() const { return name_; }\n+\tconst std::string &vendor() const { return vendor_; }\n \tControlType type() const { return type_; }\n \tbool isArray() const { return size_ > 0; }\n \tstd::size_t size() const { return size_; }\n@@ -250,6 +251,7 @@ private:\n \n \tunsigned int id_;\n \tstd::string name_;\n+\tstd::string vendor_;\n \tControlType type_;\n \tstd::size_t size_;\n \tstd::map<std::string, int32_t> enumStrMap_;\n@@ -282,8 +284,9 @@ class Control : public ControlId\n public:\n \tusing type = T;\n \n-\tControl(unsigned int id, const char *name, const std::map<std::string, int32_t> &enumStrMap = {})\n-\t\t: ControlId(id, name, details::control_type<std::remove_cv_t<T>>::value,\n+\tControl(unsigned int id, const char *name, const char *vendor,\n+\t\tconst std::map<std::string, int32_t> &enumStrMap = {})\n+\t\t: ControlId(id, name, vendor, details::control_type<std::remove_cv_t<T>>::value,\n \t\t\t details::control_type<std::remove_cv_t<T>>::size, enumStrMap)\n \t{\n \t}\ndiff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in\nindex 3a20493119bb..afe9e2c96610 100644\n--- a/src/libcamera/control_ids.cpp.in\n+++ b/src/libcamera/control_ids.cpp.in\n@@ -89,9 +89,9 @@ extern const std::map<std::string, {{ctrl.type}}> {{ctrl.name}}NameValueMap = {\n \t{ \"{{enum.name}}\", {{enum.name}} },\n {%- endfor %}\n };\n-extern const Control<{{ctrl.type}}> {{ctrl.name}}({{ctrl.name|snake_case|upper}}, \"{{ctrl.name}}\", {{ctrl.name}}NameValueMap);\n+extern const Control<{{ctrl.type}}> {{ctrl.name}}({{ctrl.name|snake_case|upper}}, \"{{ctrl.name}}\", \"{{vendor}}\", {{ctrl.name}}NameValueMap);\n {% else -%}\n-extern const Control<{{ctrl.type}}> {{ctrl.name}}({{ctrl.name|snake_case|upper}}, \"{{ctrl.name}}\");\n+extern const Control<{{ctrl.type}}> {{ctrl.name}}({{ctrl.name|snake_case|upper}}, \"{{ctrl.name}}\", \"{{vendor}}\");\n {% endif -%}\n {%- endfor %}\n \ndiff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp\nindex 52fd714fb4bd..0a5e8220a0ff 100644\n--- a/src/libcamera/control_serializer.cpp\n+++ b/src/libcamera/control_serializer.cpp\n@@ -498,7 +498,7 @@ ControlInfoMap ControlSerializer::deserialize<ControlInfoMap>(ByteStreamBuffer &\n \t\t\t * debugging purpose.\n \t\t\t */\n \t\t\tcontrolIds_.emplace_back(std::make_unique<ControlId>(entry->id,\n-\t\t\t\t\t\t\t\t\t \"\", type));\n+\t\t\t\t\t\t\t\t\t \"\", \"local\", type));\n \t\t\t(*localIdMap)[entry->id] = controlIds_.back().get();\n \t\t}\n \ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex 62185d643ecd..2efecf0fc52b 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -394,13 +394,17 @@ void ControlValue::reserve(ControlType type, bool isArray, std::size_t numElemen\n * \\brief Construct a ControlId instance\n * \\param[in] id The control numerical ID\n * \\param[in] name The control name\n+ * \\param[in] vendor The vendor name\n * \\param[in] type The control data type\n * \\param[in] size The size of the array control, or 0 if scalar control\n * \\param[in] enumStrMap The map from enum names to values (optional)\n */\n-ControlId::ControlId(unsigned int id, const std::string &name, ControlType type,\n-\t\t std::size_t size, const std::map<std::string, int32_t> &enumStrMap)\n-\t: id_(id), name_(name), type_(type), size_(size), enumStrMap_(enumStrMap)\n+ControlId::ControlId(unsigned int id, const std::string &name,\n+\t\t const std::string &vendor, ControlType type,\n+\t\t std::size_t size,\n+\t\t const std::map<std::string, int32_t> &enumStrMap)\n+\t: id_(id), name_(name), vendor_(vendor), type_(type), size_(size),\n+\t enumStrMap_(enumStrMap)\n {\n \tfor (const auto &pair : enumStrMap_)\n \t\treverseMap_[pair.second] = pair.first;\n@@ -418,6 +422,12 @@ ControlId::ControlId(unsigned int id, const std::string &name, ControlType type,\n * \\return The control name\n */\n \n+/**\n+ * \\fn const std::string &ControlId::vendor() const\n+ * \\brief Retrieve the vendor name\n+ * \\return The vendor name, as a string\n+ */\n+\n /**\n * \\fn ControlType ControlId::type() const\n * \\brief Retrieve the control data type\n@@ -489,10 +499,11 @@ ControlId::ControlId(unsigned int id, const std::string &name, ControlType type,\n */\n \n /**\n- * \\fn Control::Control(unsigned int id, const char *name)\n+ * \\fn Control::Control(unsigned int id, const char *name, const char *vendor)\n * \\brief Construct a Control instance\n * \\param[in] id The control numerical ID\n * \\param[in] name The control name\n+ * \\param[in] vendor The vendor name\n * \\param[in] enumStrMap The map from enum names to values (optional)\n *\n * The control data type is automatically deduced from the template type T.\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 68add4f2e642..7d21cf15fec1 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -520,7 +520,7 @@ std::unique_ptr<ControlId> V4L2Device::v4l2ControlId(const v4l2_query_ext_ctrl &\n \tconst std::string name(static_cast<const char *>(ctrl.name), len);\n \tconst ControlType type = v4l2CtrlType(ctrl.type);\n \n-\treturn std::make_unique<ControlId>(ctrl.id, name, type);\n+\treturn std::make_unique<ControlId>(ctrl.id, name, \"v4l2\", type);\n }\n \n /**\n", "prefixes": [ "v2", "1/3" ] }