Patch Detail
Show a patch.
GET /api/patches/2620/?format=api
{ "id": 2620, "url": "https://patchwork.libcamera.org/api/patches/2620/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2620/", "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": "<20200113164245.52535-6-jacopo@jmondi.org>", "date": "2020-01-13T16:42:27", "name": "[libcamera-devel,05/23] libcamera: controls: Add default to ControlRange", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b12dc8483d0ec4eb166749c0fe1ac6744fa4ea8d", "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/2620/mbox/", "series": [ { "id": 618, "url": "https://patchwork.libcamera.org/api/series/618/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=618", "date": "2020-01-13T16:42:22", "name": "Properties and compound controls", "version": 1, "mbox": "https://patchwork.libcamera.org/series/618/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2620/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2620/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F30AC606F6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 13 Jan 2020 17:40:27 +0100 (CET)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 34CAC100003;\n\tMon, 13 Jan 2020 16:40:27 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 13 Jan 2020 17:42:27 +0100", "Message-Id": "<20200113164245.52535-6-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.24.0", "In-Reply-To": "<20200113164245.52535-1-jacopo@jmondi.org>", "References": "<20200113164245.52535-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 05/23] libcamera: controls: Add default to\n\tControlRange", "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>", "X-List-Received-Date": "Mon, 13 Jan 2020 16:40:28 -0000" }, "content": "Augment the the ControlRange class to store the control default value.\n\nThis is particularly relevant for v4l2 controls used to create\nCamera properties, which are constructed using immutable video device\nproperties, whose value won't change at runtime.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n include/libcamera/controls.h | 5 ++++-\n src/libcamera/controls.cpp | 12 ++++++++++--\n src/libcamera/v4l2_controls.cpp | 9 ++++++---\n 3 files changed, 20 insertions(+), 6 deletions(-)", "diff": "diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex b1b73367e874..458b84e8fa8c 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -114,10 +114,12 @@ class ControlRange\n {\n public:\n \texplicit ControlRange(const ControlValue &min = 0,\n-\t\t\t const ControlValue &max = 0);\n+\t\t\t const ControlValue &max = 0,\n+\t\t\t const ControlValue &def = 0);\n \n \tconst ControlValue &min() const { return min_; }\n \tconst ControlValue &max() const { return max_; }\n+\tconst ControlValue &def() const { return def_; }\n \n \tstd::string toString() const;\n \n@@ -134,6 +136,7 @@ public:\n private:\n \tControlValue min_;\n \tControlValue max_;\n+\tControlValue def_;\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 7d8a0e97ee3a..123a6f19974a 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -357,10 +357,12 @@ Control<int64_t>::Control(unsigned int id, const char *name)\n * \\brief Construct a ControlRange with minimum and maximum range 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 */\n ControlRange::ControlRange(const ControlValue &min,\n-\t\t\t const ControlValue &max)\n-\t: min_(min), max_(max)\n+\t\t\t const ControlValue &max,\n+\t\t\t const ControlValue &def)\n+\t: min_(min), max_(max), def_(def)\n {\n }\n \n@@ -376,6 +378,12 @@ ControlRange::ControlRange(const ControlValue &min,\n * \\return A ControlValue with the maximum value for the control\n */\n \n+/**\n+ * \\fn ControlRange::def()\n+ * \\brief Retrieve the default value of the control\n+ * \\return A ControlValue with the default value for the control\n+ */\n+\n /**\n * \\brief Provide a string representation of the ControlRange\n */\ndiff --git a/src/libcamera/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp\nindex b6547a7c627c..7446c3880330 100644\n--- a/src/libcamera/v4l2_controls.cpp\n+++ b/src/libcamera/v4l2_controls.cpp\n@@ -121,17 +121,20 @@ V4L2ControlRange::V4L2ControlRange(const struct v4l2_query_ext_ctrl &ctrl)\n \tswitch (ctrl.type) {\n \tcase V4L2_CTRL_TYPE_BOOLEAN:\n \t\tControlRange::operator=(ControlRange(static_cast<bool>(ctrl.minimum),\n-\t\t\t\t\t\t static_cast<bool>(ctrl.maximum)));\n+\t\t\t\t\t\t static_cast<bool>(ctrl.maximum),\n+\t\t\t\t\t\t static_cast<bool>(ctrl.default_value)));\n \t\tbreak;\n \n \tcase V4L2_CTRL_TYPE_INTEGER64:\n \t\tControlRange::operator=(ControlRange(static_cast<int64_t>(ctrl.minimum),\n-\t\t\t\t\t\t static_cast<int64_t>(ctrl.maximum)));\n+\t\t\t\t\t\t static_cast<int64_t>(ctrl.maximum),\n+\t\t\t\t\t\t static_cast<int64_t>(ctrl.default_value)));\n \t\tbreak;\n \n \tdefault:\n \t\tControlRange::operator=(ControlRange(static_cast<int32_t>(ctrl.minimum),\n-\t\t\t\t\t\t static_cast<int32_t>(ctrl.maximum)));\n+\t\t\t\t\t\t static_cast<int32_t>(ctrl.maximum),\n+\t\t\t\t\t\t static_cast<int32_t>(ctrl.default_value)));\n \t\tbreak;\n \t}\n }\n", "prefixes": [ "libcamera-devel", "05/23" ] }