Patch Detail
Show a patch.
GET /api/patches/12546/?format=api
{ "id": 12546, "url": "https://patchwork.libcamera.org/api/patches/12546/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12546/", "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": "<20210610082539.529739-2-hiroh@chromium.org>", "date": "2021-06-10T08:25:35", "name": "[libcamera-devel,v8,2/6] libcamera: V4L2Device: Support v4l2 menu control", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9d65c36424fb51d42ef72ce35784f90a0fe23873", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/12546/mbox/", "series": [ { "id": 2117, "url": "https://patchwork.libcamera.org/api/series/2117/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2117", "date": "2021-06-10T08:25:34", "name": "[libcamera-devel,v8,1/6] libcamera: controls: Add sensor test pattern mode", "version": 8, "mbox": "https://patchwork.libcamera.org/series/2117/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12546/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12546/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 B9DC0BD78E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 10 Jun 2021 08:25:49 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7A4AF6892B;\n\tThu, 10 Jun 2021 10:25:49 +0200 (CEST)", "from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com\n\t[IPv6:2607:f8b0:4864:20::102c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 48AAF602C5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 10 Jun 2021 10:25:48 +0200 (CEST)", "by mail-pj1-x102c.google.com with SMTP id h16so3205220pjv.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 10 Jun 2021 01:25:48 -0700 (PDT)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:98e0:b356:1c8a:25d4])\n\tby smtp.gmail.com with ESMTPSA id\n\tx3sm2087011pgx.8.2021.06.10.01.25.45\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 10 Jun 2021 01:25:46 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"MyeSSwbE\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=aXPp9utSmFRdgbvjmka9zrFr9zhgWAhDypHo5gIOfiE=;\n\tb=MyeSSwbECIaZfTeiP+bZnOTTob9t5jEYG7+veB7lhmDGrtmYUqBVCO7/6eGz72D2Yl\n\tt5pVP8GdzOrYXl3lFH0VH4djk7kC6Tr5kDqqspWYko5wqmJRycgsajSikfSnJTr6vyFp\n\t8fOs1Jf69E2iLIrt6vHu/ipL9EnMf8bzXhvZM=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=aXPp9utSmFRdgbvjmka9zrFr9zhgWAhDypHo5gIOfiE=;\n\tb=O3yD7dG4ZKH9FboF1PfrO8cV9fYn734DPRIJcWZfjsk14M7+xW234J0krJ5Po1XQnQ\n\tFTpFPaieWlnsa9LcaAqHrElLCdeLLWJWJrlzBhF63nNku97Vx/HcHFITlCeDKPpeAZ7+\n\tGSbu1k0aSx6+Ng0jRrSvJtgtneKm8Az8E/N3pddYPIjWapq9vqTszcAo+tY6e1AJFAJf\n\t7hTQJa6SNRXdCy2CyCvBgRc8ErQIsJ0aRtBN2dI+4cY6+A0r7baUZ4BqabBgJpbHVusF\n\tSIovwehnzWBnKQeZ/ZtUuGAXMwooNNgKxVbVfjcEAZpY8suD39mkYYaNvINJJEMZqLeH\n\tUS8g==", "X-Gm-Message-State": "AOAM530g+Hc5blemwbUwVds4XkraXLFhjPUUNExvFM1+oNYGzYN/C7Ze\n\tVBbrKU95P37g+InZexi+2959jjlyuyyy/w==", "X-Google-Smtp-Source": "ABdhPJxqI+lhoglcy0wuj0fd4qgzrKkiojLKuPTjLFvs/DESNQG2Z3JYioyjrPq1uZl0LBbja4Vl0g==", "X-Received": "by 2002:a17:90a:4dc1:: with SMTP id\n\tr1mr2203353pjl.192.1623313546565; \n\tThu, 10 Jun 2021 01:25:46 -0700 (PDT)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 10 Jun 2021 17:25:35 +0900", "Message-Id": "<20210610082539.529739-2-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.32.0.rc1.229.g3e70b5a671-goog", "In-Reply-To": "<20210610082539.529739-1-hiroh@chromium.org>", "References": "<20210610082539.529739-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v8 2/6] libcamera: V4L2Device: Support\n\tv4l2 menu control", "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": "This adds a support of v4l2 menu. The control info for v4l2 menu\ncontains indices without names and 64bit values of querymenu.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/libcamera/internal/v4l2_device.h | 5 +\n src/libcamera/v4l2_device.cpp | 186 +++++++++++++++--------\n 2 files changed, 127 insertions(+), 64 deletions(-)", "diff": "diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h\nindex b82e2a14..c318e976 100644\n--- a/include/libcamera/internal/v4l2_device.h\n+++ b/include/libcamera/internal/v4l2_device.h\n@@ -56,6 +56,11 @@ protected:\n \tint fd() const { return fd_; }\n \n private:\n+\tstatic ControlType v4l2CtrlType(uint32_t ctrlType);\n+\tstatic std::unique_ptr<ControlId> v4l2ControlId(const v4l2_query_ext_ctrl &ctrl);\n+\tControlInfo v4l2ControlInfo(const v4l2_query_ext_ctrl &ctrl);\n+\tControlInfo v4l2MenuControlInfo(const v4l2_query_ext_ctrl &ctrl);\n+\n \tvoid listControls();\n \tvoid updateControls(ControlList *ctrls,\n \t\t\t Span<const v4l2_ext_control> v4l2Ctrls);\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex b39c6266..cda3769a 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -32,69 +32,6 @@ LOG_DEFINE_CATEGORY(V4L2)\n \n namespace {\n \n-ControlType v4l2CtrlType(uint32_t ctrlType)\n-{\n-\tswitch (ctrlType) {\n-\tcase V4L2_CTRL_TYPE_U8:\n-\t\treturn ControlTypeByte;\n-\n-\tcase V4L2_CTRL_TYPE_BOOLEAN:\n-\t\treturn ControlTypeBool;\n-\n-\tcase V4L2_CTRL_TYPE_INTEGER:\n-\t\treturn ControlTypeInteger32;\n-\n-\tcase V4L2_CTRL_TYPE_INTEGER64:\n-\t\treturn ControlTypeInteger64;\n-\n-\tcase V4L2_CTRL_TYPE_MENU:\n-\tcase V4L2_CTRL_TYPE_BUTTON:\n-\tcase V4L2_CTRL_TYPE_BITMASK:\n-\tcase V4L2_CTRL_TYPE_INTEGER_MENU:\n-\t\t/*\n-\t\t * More precise types may be needed, for now use a 32-bit\n-\t\t * integer type.\n-\t\t */\n-\t\treturn ControlTypeInteger32;\n-\n-\tdefault:\n-\t\treturn ControlTypeNone;\n-\t}\n-}\n-\n-std::unique_ptr<ControlId> v4l2ControlId(const v4l2_query_ext_ctrl &ctrl)\n-{\n-\tconst size_t len = strnlen(ctrl.name, sizeof(ctrl.name));\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-}\n-\n-ControlInfo v4l2ControlInfo(const v4l2_query_ext_ctrl &ctrl)\n-{\n-\tswitch (ctrl.type) {\n-\tcase V4L2_CTRL_TYPE_U8:\n-\t\treturn ControlInfo(static_cast<uint8_t>(ctrl.minimum),\n-\t\t\t\t static_cast<uint8_t>(ctrl.maximum),\n-\t\t\t\t static_cast<uint8_t>(ctrl.default_value));\n-\n-\tcase V4L2_CTRL_TYPE_BOOLEAN:\n-\t\treturn ControlInfo(static_cast<bool>(ctrl.minimum),\n-\t\t\t\t static_cast<bool>(ctrl.maximum),\n-\t\t\t\t static_cast<bool>(ctrl.default_value));\n-\n-\tcase V4L2_CTRL_TYPE_INTEGER64:\n-\t\treturn ControlInfo(static_cast<int64_t>(ctrl.minimum),\n-\t\t\t\t static_cast<int64_t>(ctrl.maximum),\n-\t\t\t\t static_cast<int64_t>(ctrl.default_value));\n-\n-\tdefault:\n-\t\treturn ControlInfo(static_cast<int32_t>(ctrl.minimum),\n-\t\t\t\t static_cast<int32_t>(ctrl.maximum),\n-\t\t\t\t static_cast<int32_t>(ctrl.default_value));\n-\t}\n-}\n } /* namespace */\n \n /**\n@@ -524,6 +461,121 @@ int V4L2Device::ioctl(unsigned long request, void *argp)\n * \\return The V4L2 device file descriptor, -1 if the device node is not open\n */\n \n+/**\n+ * \\brief Retrieve ControlType for V4L2 control type\n+ * \\param[in] ctrlType V4L2 control type\n+ *\n+ * \\return ControlType for \\a ctrlType\n+ */\n+ControlType V4L2Device::v4l2CtrlType(uint32_t ctrlType)\n+{\n+\tswitch (ctrlType) {\n+\tcase V4L2_CTRL_TYPE_U8:\n+\t\treturn ControlTypeByte;\n+\n+\tcase V4L2_CTRL_TYPE_BOOLEAN:\n+\t\treturn ControlTypeBool;\n+\n+\tcase V4L2_CTRL_TYPE_INTEGER:\n+\t\treturn ControlTypeInteger32;\n+\n+\tcase V4L2_CTRL_TYPE_INTEGER64:\n+\t\treturn ControlTypeInteger64;\n+\n+\tcase V4L2_CTRL_TYPE_MENU:\n+\tcase V4L2_CTRL_TYPE_BUTTON:\n+\tcase V4L2_CTRL_TYPE_BITMASK:\n+\tcase V4L2_CTRL_TYPE_INTEGER_MENU:\n+\t\t/*\n+\t\t * More precise types may be needed, for now use a 32-bit\n+\t\t * integer type.\n+\t\t */\n+\t\treturn ControlTypeInteger32;\n+\n+\tdefault:\n+\t\treturn ControlTypeNone;\n+\t}\n+}\n+\n+/**\n+ * \\brief Create ControlId for v4l2_query_ext_ctrl\n+ * \\param[in] ctrl v4l2_query_ext_ctrl\n+ *\n+ * \\return ControlId for \\a ctrl\n+ */\n+std::unique_ptr<ControlId> V4L2Device::v4l2ControlId(const v4l2_query_ext_ctrl &ctrl)\n+{\n+\tconst size_t len = strnlen(ctrl.name, sizeof(ctrl.name));\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+}\n+\n+/**\n+ * \\brief Create ControlInfo from v4l2_query_ext_ctrl\n+ * \\param[in] ctrl v4l2_query_ext_ctrl\n+ *\n+ * \\return ControlInfo from \\a v4l2_query_ext_ctrl\n+ */\n+ControlInfo V4L2Device::v4l2ControlInfo(const v4l2_query_ext_ctrl &ctrl)\n+{\n+\tswitch (ctrl.type) {\n+\tcase V4L2_CTRL_TYPE_U8:\n+\t\treturn ControlInfo(static_cast<uint8_t>(ctrl.minimum),\n+\t\t\t\t static_cast<uint8_t>(ctrl.maximum),\n+\t\t\t\t static_cast<uint8_t>(ctrl.default_value));\n+\n+\tcase V4L2_CTRL_TYPE_BOOLEAN:\n+\t\treturn ControlInfo(static_cast<bool>(ctrl.minimum),\n+\t\t\t\t static_cast<bool>(ctrl.maximum),\n+\t\t\t\t static_cast<bool>(ctrl.default_value));\n+\n+\tcase V4L2_CTRL_TYPE_INTEGER64:\n+\t\treturn ControlInfo(static_cast<int64_t>(ctrl.minimum),\n+\t\t\t\t static_cast<int64_t>(ctrl.maximum),\n+\t\t\t\t static_cast<int64_t>(ctrl.default_value));\n+\n+\tcase V4L2_CTRL_TYPE_INTEGER_MENU:\n+\tcase V4L2_CTRL_TYPE_MENU:\n+\t\treturn v4l2MenuControlInfo(ctrl);\n+\n+\tdefault:\n+\t\treturn ControlInfo(static_cast<int32_t>(ctrl.minimum),\n+\t\t\t\t static_cast<int32_t>(ctrl.maximum),\n+\t\t\t\t static_cast<int32_t>(ctrl.default_value));\n+\t}\n+}\n+\n+/**\n+ * \\brief Create ControlInfo for a V4L2 menu control\n+ * \\param[in] ctrl The v4l2_query_ext_ctrl that represents a menu\n+ *\n+ * The created ControlInfo contains indices acquired by VIDIOC_QUERYMENU.\n+ *\n+ * \\return ControlInfo for a V4L2 menu control\n+ */\n+ControlInfo V4L2Device::v4l2MenuControlInfo(const struct v4l2_query_ext_ctrl &ctrl)\n+{\n+\tstd::vector<ControlValue> indices;\n+\tstruct v4l2_querymenu menu = {};\n+\tmenu.id = ctrl.id;\n+\n+\tif (ctrl.minimum < 0)\n+\t\treturn ControlInfo();\n+\n+\tfor (int32_t index = ctrl.minimum; index <= ctrl.maximum; ++index) {\n+\t\tmenu.index = index;\n+\t\tif (ioctl(VIDIOC_QUERYMENU, &menu) != 0)\n+\t\t\tcontinue;\n+\n+\t\tindices.push_back(index);\n+\t}\n+\n+\treturn ControlInfo(indices,\n+\t\t\t ControlValue(static_cast<int32_t>(ctrl.default_value)));\n+}\n+\n /*\n * \\brief List and store information about all controls supported by the\n * V4L2 device\n@@ -533,7 +585,6 @@ void V4L2Device::listControls()\n \tControlInfoMap::Map ctrls;\n \tstruct v4l2_query_ext_ctrl ctrl = {};\n \n-\t/* \\todo Add support for menu controls. */\n \twhile (1) {\n \t\tctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL |\n \t\t\t V4L2_CTRL_FLAG_NEXT_COMPOUND;\n@@ -562,6 +613,9 @@ void V4L2Device::listControls()\n \t\t\tcontinue;\n \t\t}\n \n+\t\tLOG(V4L2, Debug) << \"Control: \" << ctrl.name\n+\t\t\t\t << \" (\" << utils::hex(ctrl.id) << \")\";\n+\n \t\tcontrolIds_.emplace_back(v4l2ControlId(ctrl));\n \t\tcontrolInfo_.emplace(ctrl.id, ctrl);\n \n@@ -630,6 +684,10 @@ void V4L2Device::updateControls(ControlList *ctrls,\n \t\t\tvalue.set<int64_t>(v4l2Ctrl.value64);\n \t\t\tbreak;\n \n+\t\tcase ControlTypeInteger32:\n+\t\t\tvalue.set<int32_t>(v4l2Ctrl.value);\n+\t\t\tbreak;\n+\n \t\tcase ControlTypeByte:\n \t\t\t/*\n \t\t\t * No action required, the VIDIOC_[GS]_EXT_CTRLS ioctl\n", "prefixes": [ "libcamera-devel", "v8", "2/6" ] }