{"id":21753,"url":"https://patchwork.libcamera.org/api/patches/21753/?format=json","web_url":"https://patchwork.libcamera.org/patch/21753/","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":"<20241025053111.519449-3-chenghaoyang@chromium.org>","date":"2024-10-25T05:30:14","name":"[v3,2/2] libcamera: Add Unsigned 16-bits Control Type","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ceafe5a706ae1bb4a7db68392eea8fe3d25f2bd2","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/21753/mbox/","series":[{"id":4743,"url":"https://patchwork.libcamera.org/api/series/4743/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4743","date":"2024-10-25T05:30:12","name":"Add U16 & U32 support in controls","version":3,"mbox":"https://patchwork.libcamera.org/series/4743/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21753/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21753/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 4C024C32A2\n\tfor ;\n\tFri, 25 Oct 2024 05:31:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BE79F65397;\n\tFri, 25 Oct 2024 07:31:26 +0200 (CEST)","from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com\n\t[IPv6:2607:f8b0:4864:20::52a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8980765391\n\tfor ;\n\tFri, 25 Oct 2024 07:31:22 +0200 (CEST)","by mail-pg1-x52a.google.com with SMTP id\n\t41be03b00d2f7-7d4f85766f0so1092238a12.2\n\tfor ;\n\tThu, 24 Oct 2024 22:31:22 -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\td2e1a72fcca58-72057a1fe53sm317992b3a.162.2024.10.24.22.31.18\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 24 Oct 2024 22:31:19 -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=\"nySzdu+s\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1729834280; x=1730439080;\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=r386/93w3W3Hz+QYkzYzNrZ6/8Zqa0TUG2MyR6Zo87s=;\n\tb=nySzdu+sCUbHR8+6FUhKmLoiPW8A7RDcdmHJHDjq9z4vkF9HzK/FJ/T7JAJiB88pyq\n\tawQZY80fXAxy/HsMRe/F+pEbRQK4IJTJHZHuLGqsWuIzEOG+X3WobHBQvfbXXCAw0rJl\n\tb9CKlXG20iEwo40PjiyRFxJmO9UOsdYYyN6FU=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1729834280; x=1730439080;\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=r386/93w3W3Hz+QYkzYzNrZ6/8Zqa0TUG2MyR6Zo87s=;\n\tb=Gc2QdBNzUnigxi2WJ7q5Qd91ukFh3zwxlMzAFulDN6BN7xReW0vhdb89lxwrmZRTNg\n\tDVLfJoxInovv5tUqidnpWIM/XW2vSqXfJ1Sr1YOYsFzMDIdgtAsAfpmJFgz+WOi2ZAu8\n\tdxrDQWMtexnuwlwqzzWrCauESAAXvfU42XCMS0Nk9nYNd5dwRpXbcwGQJsZk9KhVFo8q\n\ttTGRVIP1dTRts8rTDKmmwv+rVZ4HXmBP1ydMdN99nRAo5NjuuS6vsuYqdfdOfryryzaw\n\tpdQXkMYoPPzIG8vRq9krgI/x68F/RaUmcq8Xi6fmFyVRUNpBh9xXfGwdY+1yl5LMFdBK\n\tveMQ==","X-Gm-Message-State":"AOJu0YwTEfOJAgroly7BXanWs8V36X+yCTiqpy6bUi3fXPB2YSjguSLv\n\tNV26IjGqwpBqBuOQDKM4H5ThnVYQUITKAd3HbY2bHpnKThZTFYSw0rLW6TL1tEXmPbc5PnvRCG0\n\t=","X-Google-Smtp-Source":"AGHT+IGJ4khaXO3q28jAkRhpeMtAWzgeEPumM/wzJDO5p1OC7DJ1BRwEQpnyMBacniJgGFCQusaDAg==","X-Received":"by 2002:a05:6a21:3941:b0:1d9:18e2:e09d with SMTP id\n\tadf61e73a8af0-1d978bb2bb7mr10219899637.44.1729834280191; \n\tThu, 24 Oct 2024 22:31:20 -0700 (PDT)","From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Yudhistira Erlandinata ,\n\tHarvey Yang ","Subject":"[PATCH v3 2/2] libcamera: Add Unsigned 16-bits Control Type","Date":"Fri, 25 Oct 2024 05:30:14 +0000","Message-ID":"<20241025053111.519449-3-chenghaoyang@chromium.org>","X-Mailer":"git-send-email 2.47.0.163.g1226f6d8fa-goog","In-Reply-To":"<20241025053111.519449-1-chenghaoyang@chromium.org>","References":"<20241025053111.519449-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\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 \nCo-developed-by: Harvey Yang \nSigned-off-by: Harvey Yang \n---\n include/libcamera/controls.h | 7 ++++++\n src/libcamera/controls.cpp | 8 +++++++\n src/libcamera/v4l2_device.cpp | 9 ++++++++\n test/controls/control_value.cpp | 40 +++++++++++++++++++++++++++++++++\n 4 files changed, 64 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 {\n \tstatic constexpr std::size_t size = 0;\n };\n \n+template<>\n+struct control_type {\n+\tstatic constexpr ControlType value = ControlTypeUnsigned16;\n+\tstatic constexpr std::size_t size = 0;\n+};\n+\n template<>\n struct control_type {\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(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(data);\n \t\t\tstr += std::to_string(*value);\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 0ba8dcfa0..f1b5a25a0 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 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_U16:\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_U32:\n \t\treturn ControlInfo(static_cast(ctrl.minimum),\n \t\t\t\t static_cast(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. */\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(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() != 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 uint16s{ 3, 14, 15, 9 };\n+\t\tvalue.set(Span(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 uint16sResult = value.get>();\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":["v3","2/2"]}