Patch Detail
Show a patch.
GET /api/patches/10136/?format=api
{ "id": 10136, "url": "https://patchwork.libcamera.org/api/patches/10136/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10136/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20201020180534.36855-4-jacopo@jmondi.org>", "date": "2020-10-20T18:05:24", "name": "[libcamera-devel,v2,03/13] libcamera: controls: Add supported values to ControlInfo", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b7d03b701e21c527f4b8ed95f3363ec640d17b9d", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/10136/mbox/", "series": [ { "id": 1391, "url": "https://patchwork.libcamera.org/api/series/1391/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1391", "date": "2020-10-20T18:05:21", "name": "libcamera: Introduce draft controls", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1391/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10136/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10136/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 90E8CBDB1F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 20 Oct 2020 16:05:19 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4E2C161DD5;\n\tTue, 20 Oct 2020 18:05:19 +0200 (CEST)", "from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 056A061DAB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 20 Oct 2020 18:05:16 +0200 (CEST)", "from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id 69B50240012;\n\tTue, 20 Oct 2020 16:05:15 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 20 Oct 2020 20:05:24 +0200", "Message-Id": "<20201020180534.36855-4-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20201020180534.36855-1-jacopo@jmondi.org>", "References": "<20201020180534.36855-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 03/13] libcamera: controls: Add\n\tsupported values to ControlInfo", "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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add to the ControlInfo class a list of supported values that can be\nprovided at construction time and retrieved through an accessor method.\n\nThis is meant to support controls that have an enumerated list of\nsupported values.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n include/libcamera/controls.h | 5 ++++-\n src/libcamera/controls.cpp | 22 +++++++++++++++++++---\n 2 files changed, 23 insertions(+), 4 deletions(-)", "diff": "diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 80944efc133a..d1f6d4490c35 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -267,11 +267,13 @@ class ControlInfo\n public:\n \texplicit ControlInfo(const ControlValue &min = 0,\n \t\t\t const ControlValue &max = 0,\n-\t\t\t const ControlValue &def = 0);\n+\t\t\t const ControlValue &def = 0,\n+\t\t\t const std::vector<ControlValue> &values = {});\n \n \tconst ControlValue &min() const { return min_; }\n \tconst ControlValue &max() const { return max_; }\n \tconst ControlValue &def() const { return def_; }\n+\tconst std::vector<ControlValue> &values() const { return values_; }\n \n \tstd::string toString() const;\n \n@@ -289,6 +291,7 @@ private:\n \tControlValue min_;\n \tControlValue max_;\n \tControlValue def_;\n+\tstd::vector<ControlValue> values_;\n };\n \n using ControlIdMap = std::unordered_map<unsigned int, const ControlId *>;\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex dca782667d88..61feee37a1b8 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -479,15 +479,17 @@ void ControlValue::reserve(ControlType type, bool isArray, std::size_t numElemen\n */\n \n /**\n- * \\brief Construct a ControlInfo with minimum and maximum range parameters\n+ * \\brief Construct a ControlInfo with parameters\n * \\param[in] min The control minimum value\n * \\param[in] max The control maximum value\n * \\param[in] def The control default value\n+ * \\param[in] values The control supported values\n */\n ControlInfo::ControlInfo(const ControlValue &min,\n \t\t\t const ControlValue &max,\n-\t\t\t const ControlValue &def)\n-\t: min_(min), max_(max), def_(def)\n+\t\t\t const ControlValue &def,\n+\t\t\t const std::vector<ControlValue> &values)\n+\t: min_(min), max_(max), def_(def), values_(values)\n {\n }\n \n@@ -519,6 +521,20 @@ ControlInfo::ControlInfo(const ControlValue &min,\n * \\return A ControlValue with the default value for the control\n */\n \n+/**\n+ * \\fn ControlInfo::values()\n+ * \\brief Retrieve the values supported by the control\n+ *\n+ * For controls that support a pre-defined number of values, the enumeration of\n+ * those is reported through a vector of ControlValue instances accessible with\n+ * this method.\n+ *\n+ * If the control reports a list of supported values, setting values outside\n+ * of the reported ones results in undefined behaviour.\n+ *\n+ * \\return A vector of ControlValue instances with the supported values\n+ */\n+\n /**\n * \\brief Provide a string representation of the ControlInfo\n */\n", "prefixes": [ "libcamera-devel", "v2", "03/13" ] }