Patch Detail
Show a patch.
GET /api/1.1/patches/21772/?format=api
{ "id": 21772, "url": "https://patchwork.libcamera.org/api/1.1/patches/21772/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21772/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20241029161117.1197603-3-chenghaoyang@chromium.org>", "date": "2024-10-29T16:07:13", "name": "[v5,2/2] libcamera: Extend u16 control type", "commit_ref": "d711a4c015e74c7a77cfeba17b621909385f4494", "pull_url": null, "state": "accepted", "archived": false, "hash": "ef9c9dc7527967ef5307b704c555b15d7a33e255", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21772/mbox/", "series": [ { "id": 4753, "url": "https://patchwork.libcamera.org/api/1.1/series/4753/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4753", "date": "2024-10-29T16:07:11", "name": "Add U16 & U32 support in controls", "version": 5, "mbox": "https://patchwork.libcamera.org/series/4753/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21772/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21772/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 3050FC31E9\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 29 Oct 2024 16:11:33 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8BD7E653AA;\n\tTue, 29 Oct 2024 17:11:32 +0100 (CET)", "from mail-pl1-x632.google.com (mail-pl1-x632.google.com\n\t[IPv6:2607:f8b0:4864:20::632])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D5BD7653A8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 29 Oct 2024 17:11:26 +0100 (CET)", "by mail-pl1-x632.google.com with SMTP id\n\td9443c01a7336-20c7edf2872so49298745ad.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 29 Oct 2024 09:11:26 -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-210bc04575esm68048695ad.235.2024.10.29.09.11.23\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 29 Oct 2024 09:11:24 -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=\"eNUTb2Be\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1730218285; x=1730823085;\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=IIgUwdgzpvVX+cyiu3Ca0jmC/Fh4QVeSpoNVpNhIIIE=;\n\tb=eNUTb2BegRniu2rB/uBje4N22CBNjH1BkHiDTAgWcwuFldBrWg6FLvXJG/pE1SQfH/\n\t+JjWr+EeFWxOXd6jmlN9scoO7xzPCwzVV1zTFBX7b0dduxi0ufgatTJ7NLtqeTIHdk0I\n\tGm0BsP1V7McmwLT6mtAq9n75QQiTg0JcI8xvQ=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1730218285; x=1730823085;\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=IIgUwdgzpvVX+cyiu3Ca0jmC/Fh4QVeSpoNVpNhIIIE=;\n\tb=QoUvDniJE3h9HqdMsiQ6wYzHurp55EK8UJIU6wvghYx1zA3UcDgGXXFyn7jjNHG8Je\n\tfglZwp8M0r/0fFwRgUBtSZfTus1aP2sVv+9otzqBXDWkDKkkbLDc2w4qD17WgkRChXkF\n\tItkA6fM4geZxPOJ7ZRgwj78p3TJ2sDOM6CxUcXj4D0a4MVLQKimHdH+vM51y3dJbQu63\n\tb8jlPfB5xAhDwLea2R6StirHilT50WPo7nAZLokOhTnGUxnM9Xhw4qCzt4WvYuC93MaB\n\t2tl00SOaMvyOzNZ7Knt2FnjTJ/p8hPxfPhhtXfHlq4KoHN4gbliWeLK93M967XDIgTKK\n\tIVVA==", "X-Gm-Message-State": "AOJu0YzcjvG6ge525CjEM+GUXbiQ6Kckor6GfOjbocvgI4DH5XYOlm4O\n\tWmg5IQZ6M6KKVhZWNX15Ru5wZc9Pvp9uImkQh85l6WF+OfKkQAjSrJYELtQYy8m7eZvVIV/cuyQ\n\t=", "X-Google-Smtp-Source": "AGHT+IE+qXWhWjcX2MbCeUnK0qjosuUoSNZtLQGYJ5fCIfIMiaM8gT9ts94Aj3b/re6XXrGxR3JSkA==", "X-Received": "by 2002:a17:902:e751:b0:20b:db4:d913 with SMTP id\n\td9443c01a7336-210ed3f11demr41814995ad.11.1730218284868; \n\tTue, 29 Oct 2024 09:11:24 -0700 (PDT)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Yudhistira Erlandinata <yerlandinata@chromium.org>,\n\tHarvey Yang <chenghaoyang@chromium.org>", "Subject": "[PATCH v5 2/2] libcamera: Extend u16 control type", "Date": "Tue, 29 Oct 2024 16:07:13 +0000", "Message-ID": "<20241029161117.1197603-3-chenghaoyang@chromium.org>", "X-Mailer": "git-send-email 2.47.0.163.g1226f6d8fa-goog", "In-Reply-To": "<20241029161117.1197603-1-chenghaoyang@chromium.org>", "References": "<20241029161117.1197603-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@chromium.org>\n\nV4L2 Controls support a wide variety of types not yet supported by the\nControlValue type system.\n\nExtend the libcamera ControlValue types to support an explicit 16 bit\nunsigned integer type, and map that to the corresponding\nV4L2_CTRL_TYPE_U16 type within the v4l2_device support class.\n\nIt's used on some camera metadata that 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 | 7 ++++++\n src/libcamera/controls.cpp | 8 +++++++\n src/libcamera/v4l2_device.cpp | 28 +++++++++++++++++++++++\n test/controls/control_value.cpp | 40 +++++++++++++++++++++++++++++++++\n 4 files changed, 83 insertions(+)", "diff": "diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 6da8ad2c3..162115bb5 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,12 @@ 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+\tstatic constexpr std::size_t size = 0;\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 90fa6b278..f0c6fa63d 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -216,6 +216,13 @@ ControlList V4L2Device::getControls(const std::vector<uint32_t> &ids)\n \t\t\t\tv4l2Ctrl.p_u8 = data.data();\n \t\t\t\tbreak;\n \n+\t\t\tcase V4L2_CTRL_TYPE_U16:\n+\t\t\t\ttype = ControlTypeUnsigned16;\n+\t\t\t\tvalue.reserve(type, true, info.elems);\n+\t\t\t\tdata = value.data();\n+\t\t\t\tv4l2Ctrl.p_u16 = reinterpret_cast<uint16_t *>(data.data());\n+\t\t\t\tbreak;\n+\n \t\t\tcase V4L2_CTRL_TYPE_U32:\n \t\t\t\ttype = ControlTypeUnsigned32;\n \t\t\t\tvalue.reserve(type, true, info.elems);\n@@ -307,6 +314,18 @@ int V4L2Device::setControls(ControlList *ctrls)\n \t\t/* Set the v4l2_ext_control value for the write operation. */\n \t\tControlValue &value = ctrl->second;\n \t\tswitch (iter->first->type()) {\n+\t\tcase ControlTypeUnsigned16: {\n+\t\t\tif (value.isArray()) {\n+\t\t\t\tSpan<uint8_t> data = value.data();\n+\t\t\t\tv4l2Ctrl.p_u16 = reinterpret_cast<uint16_t *>(data.data());\n+\t\t\t\tv4l2Ctrl.size = data.size();\n+\t\t\t} else {\n+\t\t\t\tv4l2Ctrl.value = value.get<uint16_t>();\n+\t\t\t}\n+\n+\t\t\tbreak;\n+\t\t}\n+\n \t\tcase ControlTypeUnsigned32: {\n \t\t\tif (value.isArray()) {\n \t\t\t\tSpan<uint8_t> data = value.data();\n@@ -508,6 +527,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@@ -559,6 +581,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@@ -650,6 +677,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. */\ndiff --git a/test/controls/control_value.cpp b/test/controls/control_value.cpp\nindex 6ca85b739..5084fd0cf 100644\n--- a/test/controls/control_value.cpp\n+++ b/test/controls/control_value.cpp\n@@ -109,6 +109,46 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\t/*\n+\t\t * Unsigned Integer16 type.\n+\t\t */\n+\t\tvalue.set(static_cast<uint16_t>(42));\n+\t\tif (value.isNone() || value.isArray() ||\n+\t\t value.type() != ControlTypeUnsigned16) {\n+\t\t\tcerr << \"Control type mismatch after setting to uint16_t\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (value.get<uint16_t>() != 42) {\n+\t\t\tcerr << \"Control value mismatch after setting to uint16_t\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (value.toString() != \"42\") {\n+\t\t\tcerr << \"Control string mismatch after setting to uint16_t\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tstd::array<uint16_t, 4> uint16s{ 3, 14, 15, 9 };\n+\t\tvalue.set(Span<uint16_t>(uint16s));\n+\t\tif (value.isNone() || !value.isArray() ||\n+\t\t value.type() != ControlTypeUnsigned16) {\n+\t\t\tcerr << \"Control type mismatch after setting to uint16_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tSpan<const uint16_t> uint16sResult = value.get<Span<const uint16_t>>();\n+\t\tif (uint16s.size() != uint16sResult.size() ||\n+\t\t !std::equal(uint16s.begin(), uint16s.end(), uint16sResult.begin())) {\n+\t\t\tcerr << \"Control value mismatch after setting to uint16_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (value.toString() != \"[ 3, 14, 15, 9 ]\") {\n+\t\t\tcerr << \"Control string mismatch after setting to uint16_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n \t\t/*\n \t\t * Unsigned Integer32 type.\n \t\t */\n", "prefixes": [ "v5", "2/2" ] }