{"id":10222,"url":"https://patchwork.libcamera.org/api/patches/10222/?format=json","web_url":"https://patchwork.libcamera.org/patch/10222/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20201023171116.24899-4-jacopo@jmondi.org>","date":"2020-10-23T17:11:07","name":"[libcamera-devel,v4,03/12] libcamera: controls: Construct from valid values","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e66287ddff3a9d2bdc7ad28bafd14fd279e284cb","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10222/mbox/","series":[{"id":1410,"url":"https://patchwork.libcamera.org/api/series/1410/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1410","date":"2020-10-23T17:11:04","name":"libcamera: Introduce draft controls","version":4,"mbox":"https://patchwork.libcamera.org/series/1410/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10222/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10222/checks/","tags":{},"headers":{"Return-Path":"","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 C0711BDB13\n\tfor ;\n\tFri, 23 Oct 2020 17:11:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 122CB615D2;\n\tFri, 23 Oct 2020 19:11:29 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A054E615D2\n\tfor ;\n\tFri, 23 Oct 2020 19:11:25 +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 relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 454F21C0006;\n\tFri, 23 Oct 2020 17:11:25 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 23 Oct 2020 19:11:07 +0200","Message-Id":"<20201023171116.24899-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201023171116.24899-1-jacopo@jmondi.org>","References":"<20201023171116.24899-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 03/12] libcamera: controls: Construct\n\tfrom valid values","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add two constructors to the ControlInfo class that allows creating\na class instance from the list of the control valid values with\nan optional default one.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/controls.h | 5 ++++\n src/libcamera/controls.cpp | 47 ++++++++++++++++++++++++++++++++++++\n 2 files changed, 52 insertions(+)","diff":"diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 80944efc133a..0ae4fd002726 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -268,10 +268,14 @@ 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+\texplicit ControlInfo(const ControlValue *values, unsigned int numValues,\n+\t\t\t const ControlValue &def);\n+\texplicit ControlInfo(const ControlValue *values, unsigned int numValues);\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 &values() const { return values_; }\n \n \tstd::string toString() const;\n \n@@ -289,6 +293,7 @@ private:\n \tControlValue min_;\n \tControlValue max_;\n \tControlValue def_;\n+\tstd::vector values_;\n };\n \n using ControlIdMap = std::unordered_map;\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex dca782667d88..2a2f04a598b6 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -491,6 +491,42 @@ ControlInfo::ControlInfo(const ControlValue &min,\n {\n }\n \n+/**\n+ * \\brief Construct a ControlInfo from the list of values values and a default\n+ * \\param[in] values The control valid values\n+ * \\param[in] numValues The number or valid values\n+ * \\param[in] def The control default value\n+ *\n+ * Construct a ControlInfo from a list of valid values. The ControlInfo\n+ * minimum and maximum values are assigned to the first and last members of\n+ * the values list respectively.\n+ */\n+ControlInfo::ControlInfo(const ControlValue *values, unsigned int numValues,\n+\t\t\t const ControlValue &def)\n+\t: def_(def)\n+{\n+\tmin_ = values[0];\n+\tmax_ = values[numValues - 1];\n+\n+\tfor (unsigned int i = 0; i < numValues; ++i)\n+\t\tvalues_.push_back(values[i]);\n+}\n+\n+/**\n+ * \\brief Construct a ControlInfo from the list of valid values\n+ * \\param[in] values The control valid values\n+ * \\param[in] numValues The number or valid values\n+ *\n+ * Construct a ControlInfo from a list of valid values. The ControlInfo\n+ * minimum and maximum values are assigned to the first and last members of\n+ * the values list respectively. The ControlInfo default value is set to be\n+ * equal to the minimum one.\n+ */\n+ControlInfo::ControlInfo(const ControlValue *values, unsigned int numValues)\n+\t: ControlInfo(values, numValues, values[0])\n+{\n+}\n+\n /**\n * \\fn ControlInfo::min()\n * \\brief Retrieve the minimum value of the control\n@@ -519,6 +555,17 @@ 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 list of valid values\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+ * \\return A vector of ControlValue representing the control valid values\n+ */\n+\n /**\n * \\brief Provide a string representation of the ControlInfo\n */\n","prefixes":["libcamera-devel","v4","03/12"]}