Patch Detail
Show a patch.
GET /api/patches/21596/?format=api
{ "id": 21596, "url": "https://patchwork.libcamera.org/api/patches/21596/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21596/", "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": "<20241011175653.3530945-3-chenghaoyang@chromium.org>", "date": "2024-10-11T17:55:12", "name": "[2/2] libcamera: Add Unsigned 16-bits Control Type", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "f9a7dabb73e77132cdb5ba2690608cf52f17d409", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21596/mbox/", "series": [ { "id": 4687, "url": "https://patchwork.libcamera.org/api/series/4687/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4687", "date": "2024-10-11T17:55:10", "name": "Add U16 & U32 support in controls", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4687/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21596/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21596/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 A585DC32F1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 11 Oct 2024 17:57:07 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 46BE36538D;\n\tFri, 11 Oct 2024 19:57:07 +0200 (CEST)", "from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com\n\t[IPv6:2607:f8b0:4864:20::62c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AF2206537D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 11 Oct 2024 19:57:02 +0200 (CEST)", "by mail-pl1-x62c.google.com with SMTP id\n\td9443c01a7336-20caccadbeeso7226875ad.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 11 Oct 2024 10:57:02 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(199.211.81.34.bc.googleusercontent.com. [34.81.211.199])\n\tby smtp.gmail.com with ESMTPSA id\n\td9443c01a7336-20c8c36d74bsm25855175ad.305.2024.10.11.10.56.59\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 11 Oct 2024 10:57:00 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"Sk4vh6OZ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1728669421; x=1729274221;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=U4EwM6KdWdGgdmknArb6Ok1ElhSNCrsZazTt++T7H4M=;\n\tb=Sk4vh6OZDZrrMWZP+Iv+3mjY90RSt8VXDQ/NZ/UuyNn5j6mKAWzuiJBUNEIjWVp7Vh\n\tybHrl6VsPZeB2eeJW+RsLlcj2uMjjNmlKIZ0pp4cwAOeajbILj8XG5KRU9Y5BI8zbebx\n\txW5AqadQUB6I48baIfpsZ9hCGN+FOcHmTttDI=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1728669421; x=1729274221;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=U4EwM6KdWdGgdmknArb6Ok1ElhSNCrsZazTt++T7H4M=;\n\tb=QjNg2CdJVCREfMAADL93zqMlzFVNPeiwUVkB5VY1r6jW37ao5BCJGUvbnO2J1NXISr\n\tm3TV/cssihnb1bpb9IF5+BRgJxCvOxRIVDfxDwK+8c7tRCL44t3lE7M0Nx1DtLeMgJNY\n\tX3ixZhYi1RMlncUmXXmgE4lX27pLI15VQBpaHyTtQtkrLJ3VLLAetgdcpFdejjC5RgPF\n\tSssx9jvNkhR0ieWjozk2PcsrTRAvjmj5ZNc7nnElmAFXRS5xS0tTpLsbDZIAytJsPNdp\n\tyxwuoBiOPvHDFzQECMUGrOGEMI7+Qj2+nx4bLzr3Zx1Hs1Ngf+TnrfWTeO3d/O2UdTaM\n\tHNmA==", "X-Gm-Message-State": "AOJu0YzmczUl8kZVv6+k3g7bezdzY6w8JhTkETp5ElvbIwQnlsxm8RyQ\n\t+pYZRUvyZV2sYebSXbH1N1DMtQ25CojvF13KL/95hQm2gJOt9Ai52jeWT3794MfYqCpgGHsVDEU\n\t=", "X-Google-Smtp-Source": "AGHT+IFeLhowiDXqtFKx1jLlmrvbPjMSskNgjpOMlaya0HovLx92p48UouvSactfzCwvq3r/S6UyPg==", "X-Received": "by 2002:a17:903:24b:b0:20c:7bee:a7d3 with SMTP id\n\td9443c01a7336-20ca16d2d99mr34987065ad.50.1728669420836; \n\tFri, 11 Oct 2024 10:57:00 -0700 (PDT)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Yudhistira Erlandinata <yerlandinata@google.com>,\n\tYudhistira Erlandinata <yerlandinata@chromium.org>,\n\tHarvey Yang <chenghaoyang@chromium.org>", "Subject": "[PATCH 2/2] libcamera: Add Unsigned 16-bits Control Type", "Date": "Fri, 11 Oct 2024 17:55:12 +0000", "Message-ID": "<20241011175653.3530945-3-chenghaoyang@chromium.org>", "X-Mailer": "git-send-email 2.47.0.rc1.288.g06298d1525-goog", "In-Reply-To": "<20241011175653.3530945-1-chenghaoyang@chromium.org>", "References": "<20241011175653.3530945-1-chenghaoyang@chromium.org>", "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": "From: Yudhistira Erlandinata <yerlandinata@google.com>\n\nSome camera metadata is of length 16-bits,\nfor example JPEG metadata headers.\n\nSigned-off-by: Yudhistira Erlandinata <yerlandinata@chromium.org>\nCo-developed-by: Harvey Yang <chenghaoyang@chromium.org>\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n include/libcamera/controls.h | 6 ++++++\n src/libcamera/controls.cpp | 8 ++++++++\n src/libcamera/v4l2_device.cpp | 9 +++++++++\n 3 files changed, 23 insertions(+)", "diff": "diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 25f68040d..1987ca5f5 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -29,6 +29,7 @@ enum ControlType {\n \tControlTypeNone,\n \tControlTypeBool,\n \tControlTypeByte,\n+\tControlTypeUnsigned16,\n \tControlTypeUnsigned32,\n \tControlTypeInteger32,\n \tControlTypeInteger64,\n@@ -63,6 +64,11 @@ struct control_type<uint8_t> {\n \tstatic constexpr std::size_t size = 0;\n };\n \n+template<>\n+struct control_type<uint16_t> {\n+\tstatic constexpr ControlType value = ControlTypeUnsigned16;\n+};\n+\n template<>\n struct control_type<uint32_t> {\n \tstatic constexpr ControlType value = ControlTypeUnsigned32;\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex 8ae295191..3a840bb22 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -54,6 +54,7 @@ static constexpr size_t ControlValueSize[] = {\n \t[ControlTypeNone]\t\t= 0,\n \t[ControlTypeBool]\t\t= sizeof(bool),\n \t[ControlTypeByte]\t\t= sizeof(uint8_t),\n+\t[ControlTypeUnsigned16]\t\t= sizeof(uint16_t),\n \t[ControlTypeUnsigned32]\t\t= sizeof(uint32_t),\n \t[ControlTypeInteger32]\t\t= sizeof(int32_t),\n \t[ControlTypeInteger64]\t\t= sizeof(int64_t),\n@@ -75,6 +76,8 @@ static constexpr size_t ControlValueSize[] = {\n * The control stores a boolean value\n * \\var ControlTypeByte\n * The control stores a byte value as an unsigned 8-bit integer\n+ * \\var ControlTypeUnsigned16\n+ * The control stores an unsigned 16-bit integer value\n * \\var ControlTypeUnsigned32\n * The control stores an unsigned 32-bit integer value\n * \\var ControlTypeInteger32\n@@ -233,6 +236,11 @@ std::string ControlValue::toString() const\n \t\t\tstr += std::to_string(*value);\n \t\t\tbreak;\n \t\t}\n+\t\tcase ControlTypeUnsigned16: {\n+\t\t\tconst uint16_t *value = reinterpret_cast<const uint16_t *>(data);\n+\t\t\tstr += std::to_string(*value);\n+\t\t\tbreak;\n+\t\t}\n \t\tcase ControlTypeUnsigned32: {\n \t\t\tconst uint32_t *value = reinterpret_cast<const uint32_t *>(data);\n \t\t\tstr += std::to_string(*value);\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex f3454ba24..cb7327171 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -492,6 +492,9 @@ ControlType V4L2Device::v4l2CtrlType(uint32_t ctrlType)\n \tcase V4L2_CTRL_TYPE_BOOLEAN:\n \t\treturn ControlTypeBool;\n \n+\tcase V4L2_CTRL_TYPE_U16:\n+\t\treturn ControlTypeUnsigned16;\n+\n \tcase V4L2_CTRL_TYPE_U32:\n \t\treturn ControlTypeUnsigned32;\n \n@@ -543,6 +546,11 @@ std::optional<ControlInfo> V4L2Device::v4l2ControlInfo(const v4l2_query_ext_ctrl\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_U16:\n+\t\treturn ControlInfo(static_cast<uint16_t>(ctrl.minimum),\n+\t\t\t\t static_cast<uint16_t>(ctrl.maximum),\n+\t\t\t\t static_cast<uint16_t>(ctrl.default_value));\n+\n \tcase V4L2_CTRL_TYPE_U32:\n \t\treturn ControlInfo(static_cast<uint32_t>(ctrl.minimum),\n \t\t\t\t static_cast<uint32_t>(ctrl.maximum),\n@@ -634,6 +642,7 @@ void V4L2Device::listControls()\n \t\tcase V4L2_CTRL_TYPE_BITMASK:\n \t\tcase V4L2_CTRL_TYPE_INTEGER_MENU:\n \t\tcase V4L2_CTRL_TYPE_U8:\n+\t\tcase V4L2_CTRL_TYPE_U16:\n \t\tcase V4L2_CTRL_TYPE_U32:\n \t\t\tbreak;\n \t\t/* \\todo Support other control types. */\n", "prefixes": [ "2/2" ] }