{"id":21595,"url":"https://patchwork.libcamera.org/api/patches/21595/?format=json","web_url":"https://patchwork.libcamera.org/patch/21595/","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":"<20241011175653.3530945-2-chenghaoyang@chromium.org>","date":"2024-10-11T17:55:11","name":"[1/2] libcamera: Allow enumerating u32 control type","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ce784cbb85c7d7f1328ee5c3e899ed645b26c533","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21595/mbox/","series":[{"id":4687,"url":"https://patchwork.libcamera.org/api/series/4687/?format=json","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/21595/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21595/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 F3944C326B\n\tfor ;\n\tFri, 11 Oct 2024 17:57:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1688965388;\n\tFri, 11 Oct 2024 19:57:04 +0200 (CEST)","from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com\n\t[IPv6:2607:f8b0:4864:20::62b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5684F65383\n\tfor ;\n\tFri, 11 Oct 2024 19:57:01 +0200 (CEST)","by mail-pl1-x62b.google.com with SMTP id\n\td9443c01a7336-20b7259be6fso24808085ad.0\n\tfor ;\n\tFri, 11 Oct 2024 10:57:01 -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.58\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 11 Oct 2024 10:56:59 -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=\"YkbS3lKW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1728669419; x=1729274219;\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=mmDThpciV/k1pBewkba7V92lzxFvadVrPr43Qa8Sabo=;\n\tb=YkbS3lKWCqBbTVHa1/Qp+oOUsyNNhG+6EizJB5j7uEhXbyld3bRktwOEpQQVv9AbxQ\n\t6hWtGHo16FZq2ejei/1CzJ07xKRRx0+icSwnfCTSxIaYtF4JUhV9C7VEoWcdF/b4QkBN\n\t+E/E+R1BlU0BxSB/+hx689N9lZqdFAykZjids=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1728669419; x=1729274219;\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=mmDThpciV/k1pBewkba7V92lzxFvadVrPr43Qa8Sabo=;\n\tb=n1dCGfxV5dW1TWHt9kn7K/qhGhAYP34MpBn46twa2dl0ikTIj0/3rbhRTu7h038uKz\n\tfeTBxnLOnr737/vJy9oNCkSVRfWk/SE0ekgENe2xjV+xqIjrSvf+NFN2F1ZacGVMeaYB\n\txABS8o7ExrypeFvrUz4KzhNMoPf720ha7MsMjBQcYIuevU2zCq6lJKy0fOxIGkJv1y63\n\tlqYVf5MteuU3BMg97Xur1IewgECV5NzHLIY+MF/ALalAdN/5iVOJWqxSPKQTlz5Ntq0B\n\tNsx5R7zPIEn7hTA2995fSf1JccY3qLf5kJH9zohVEWWQd3ydfrtaCWQE9GY2gEriuvFs\n\trtlg==","X-Gm-Message-State":"AOJu0Yzj2ySneA28vSTpnFhNjEUv4Giw2ed3ZXngFZR99DU0UAgkAHqz\n\taLBUzEim6T/gVGNytyb5cNiJwz8BekYXDRKn5rcD2klwKtt7L3a7vglWkMrjC3sQWNLlG1hNtSY\n\t=","X-Google-Smtp-Source":"AGHT+IGcR060EsR0IALdCs35Z+O+iz9qpFuHhOyTob/TJ+Jo8P5ZdA1QjzDKiPJeh+Omk4INqm/U/w==","X-Received":"by 2002:a17:903:186:b0:20b:b238:9d25 with SMTP id\n\td9443c01a7336-20ca169e7aamr49931745ad.38.1728669419345; \n\tFri, 11 Oct 2024 10:56:59 -0700 (PDT)","From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Yudhistira Erlandinata ,\n\tYudhistira Erlandinata ,\n\tHarvey Yang ","Subject":"[PATCH 1/2] libcamera: Allow enumerating u32 control type","Date":"Fri, 11 Oct 2024 17:55:11 +0000","Message-ID":"<20241011175653.3530945-2-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Yudhistira Erlandinata \n\nOnly allowing V4L2_CTRL_TYPE_U32 control type to be listed in the\nV4L2Device::controls_, so it can be used together with function\nV4L2Device::setExtControl. Like many other control types, this type\nis still not supported in the V4L2Device::getControls and\nV4L2Device::setControls.\n\nSigned-off-by: Yudhistira Erlandinata \nCo-developed-by: Harvey Yang \nSigned-off-by: Harvey Yang \n---\n include/libcamera/controls.h | 6 ++++++\n src/libcamera/controls.cpp | 12 ++++++++++--\n src/libcamera/v4l2_device.cpp | 16 +++++++++++++++-\n 3 files changed, 31 insertions(+), 3 deletions(-)","diff":"diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex ca60bbaca..25f68040d 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+\tControlTypeUnsigned32,\n \tControlTypeInteger32,\n \tControlTypeInteger64,\n \tControlTypeFloat,\n@@ -62,6 +63,11 @@ struct control_type {\n \tstatic constexpr std::size_t size = 0;\n };\n \n+template<>\n+struct control_type {\n+\tstatic constexpr ControlType value = ControlTypeUnsigned32;\n+};\n+\n template<>\n struct control_type {\n \tstatic constexpr ControlType value = ControlTypeInteger32;\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex 62185d643..8ae295191 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[ControlTypeUnsigned32]\t\t= sizeof(uint32_t),\n \t[ControlTypeInteger32]\t\t= sizeof(int32_t),\n \t[ControlTypeInteger64]\t\t= sizeof(int64_t),\n \t[ControlTypeFloat]\t\t= sizeof(float),\n@@ -74,10 +75,12 @@ 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 ControlTypeUnsigned32\n+ * The control stores an unsigned 32-bit integer value\n * \\var ControlTypeInteger32\n- * The control stores a 32-bit integer value\n+ * The control stores a signed 32-bit integer value\n * \\var ControlTypeInteger64\n- * The control stores a 64-bit integer value\n+ * The control stores a signed 64-bit integer value\n * \\var ControlTypeFloat\n * The control stores a 32-bit floating point value\n * \\var ControlTypeString\n@@ -230,6 +233,11 @@ std::string ControlValue::toString() const\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(data);\n+\t\t\tstr += std::to_string(*value);\n+\t\t\tbreak;\n+\t\t}\n \t\tcase ControlTypeInteger32: {\n \t\t\tconst int32_t *value = reinterpret_cast(data);\n \t\t\tstr += std::to_string(*value);\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 68add4f2e..f3454ba24 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -9,6 +9,7 @@\n \n #include \n #include \n+#include \n #include \n #include \n #include \n@@ -17,11 +18,14 @@\n #include \n \n #include \n+#include \n \n #include \n #include \n #include \n \n+#include \n+\n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/sysfs.h\"\n \n@@ -488,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_U32:\n+\t\treturn ControlTypeUnsigned32;\n+\n \tcase V4L2_CTRL_TYPE_INTEGER:\n \t\treturn ControlTypeInteger32;\n \n@@ -536,6 +543,11 @@ std::optional V4L2Device::v4l2ControlInfo(const v4l2_query_ext_ctrl\n \t\t\t\t static_cast(ctrl.maximum),\n \t\t\t\t static_cast(ctrl.default_value));\n \n+\tcase V4L2_CTRL_TYPE_U32:\n+\t\treturn ControlInfo(static_cast(ctrl.minimum),\n+\t\t\t\t static_cast(ctrl.maximum),\n+\t\t\t\t static_cast(ctrl.default_value));\n+\n \tcase V4L2_CTRL_TYPE_BOOLEAN:\n \t\treturn ControlInfo(static_cast(ctrl.minimum),\n \t\t\t\t static_cast(ctrl.maximum),\n@@ -622,12 +634,14 @@ 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_U32:\n \t\t\tbreak;\n \t\t/* \\todo Support other control types. */\n \t\tdefault:\n \t\t\tLOG(V4L2, Debug)\n \t\t\t\t<< \"Control \" << utils::hex(ctrl.id)\n-\t\t\t\t<< \" has unsupported type \" << ctrl.type;\n+\t\t\t\t<< \" has unsupported type \" << ctrl.type\n+\t\t\t\t<< \". Name: \" << ctrl.name;\n \t\t\tcontinue;\n \t\t}\n \n","prefixes":["1/2"]}