From patchwork Tue Apr 1 13:19:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 23095 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id CEF62C3213 for ; Tue, 1 Apr 2025 13:19:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6739368988; Tue, 1 Apr 2025 15:19:47 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Sjqr8d4W"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5B74B68981 for ; Tue, 1 Apr 2025 15:19:43 +0200 (CEST) Received: from pb-laptop.local (185.221.143.221.nat.pool.zt.hu [185.221.143.221]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 019718DB for ; Tue, 1 Apr 2025 15:17:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1743513471; bh=L9N1rXNqi3I/kPFv6P1DWnLaWWql86AGQ6C3Ml2pQ+g=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Sjqr8d4WLiKbwxdqOcl8fq964/QY6HMxlsG81j7liEaKPHxtVSxlVfJ7b5iSXxTn5 qP13xvkv/x+l8qq60X9Q5n2AyiphwDCgJX6CXFu1PL46wY4X4oRXMT1O2zJ75MzoL1 YkAhuZ34bP1SfY54SWJVdw0BIY/fI/AoU8Edxv1I= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 1/4] libcamera: controls: Simplify SFINAE template parameter Date: Tue, 1 Apr 2025 15:19:36 +0200 Message-ID: <20250401131939.749583-2-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250401131939.749583-1-barnabas.pocze@ideasonboard.com> References: <20250401131939.749583-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Just use `void` instead of `std::void_t<>`. Signed-off-by: Barnabás Pőcze Reviewed-by: Laurent Pinchart --- include/libcamera/controls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 4bfe9615c..c1919d864 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -43,7 +43,7 @@ enum ControlType { namespace details { -template> +template struct control_type { }; From patchwork Tue Apr 1 13:19:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 23096 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 7AEA1C3213 for ; Tue, 1 Apr 2025 13:19:52 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3A6866898C; Tue, 1 Apr 2025 15:19:48 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="kYrtYFQQ"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8306868985 for ; Tue, 1 Apr 2025 15:19:43 +0200 (CEST) Received: from pb-laptop.local (185.221.143.221.nat.pool.zt.hu [185.221.143.221]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4FC7711E5 for ; Tue, 1 Apr 2025 15:17:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1743513471; bh=mUACM1k8JoR3GDdhUrFhVxEaecE81fIzsc0GzYV/FuI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=kYrtYFQQxITKgZp2shEXMOEAxagT7gQYjTsMJZ2arBVPX2ZmEMYgsaHluLQCxd48C 6ADeAQms/WZe5pP/muukV30PI6oC1J8E5EUdE/ujzqN/LnJqyA2BXwqDMY74vQqaVj JAUt5aaCphBYPSpFuTrVXLoeyAUW/niKA30HP06w= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 2/4] libcamera: controls: Strings are arrays Date: Tue, 1 Apr 2025 15:19:37 +0200 Message-ID: <20250401131939.749583-3-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250401131939.749583-1-barnabas.pocze@ideasonboard.com> References: <20250401131939.749583-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" `ControlId::isArray()` and `ControlValue::isArray()` disagree in the case of strings. Fix it by setting the static size of a string to `libcamera::dynamic_extent` to denote a dynamically sized array-like value. One unfortunate side effect of this change is that if there were string controls (there are none at the moment), then `cam` would display them with an extra `Size: n` annotation. Bug: https://bugs.libcamera.org/show_bug.cgi?id=255 Signed-off-by: Barnabás Pőcze --- include/libcamera/controls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index c1919d864..d35347f4c 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -98,7 +98,7 @@ struct control_type { template<> struct control_type { static constexpr ControlType value = ControlTypeString; - static constexpr std::size_t size = 0; + static constexpr std::size_t size = libcamera::dynamic_extent; }; template<> From patchwork Tue Apr 1 13:19:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 23097 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C1D06C3285 for ; Tue, 1 Apr 2025 13:19:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 185E768990; Tue, 1 Apr 2025 15:19:49 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="JC3Y7/52"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BFC3068986 for ; Tue, 1 Apr 2025 15:19:43 +0200 (CEST) Received: from pb-laptop.local (185.221.143.221.nat.pool.zt.hu [185.221.143.221]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 92B7B741 for ; Tue, 1 Apr 2025 15:17:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1743513471; bh=EpkGhHNS5HImyJZXfISov2jRw9zVlkHDv1JtN4TxPNE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=JC3Y7/52MJp3RO/L8eO7i7YDTm2zQOcXROXiya2ZmemJfYLD7WNWnC2L1t7BEFgkI DvvRsD2p4gcpfpERwbbfM2ZezYMcEgrxJMMxQKa7sqvf0AKYWAXqjSac05wbbl7jkf LXNzw9Ca7kwZX7K9qtMrZKG0qeGrqiVdQ68W+bZ4= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 3/4] libcamera: controls: Arrays of arrays are not supported Date: Tue, 1 Apr 2025 15:19:38 +0200 Message-ID: <20250401131939.749583-4-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250401131939.749583-1-barnabas.pocze@ideasonboard.com> References: <20250401131939.749583-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Arrays of arrays, even arrays of strings, are not supported by the current `ControlValue` mechanism, so disable them to trigger comptime errors if attempts are made to use them. Signed-off-by: Barnabás Pőcze --- include/libcamera/controls.h | 2 +- src/apps/cam/capture_script.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index d35347f4c..85c724ec1 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -120,7 +120,7 @@ struct control_type { }; template -struct control_type> : public control_type> { +struct control_type, std::enable_if_t>::size == 0>> : public control_type> { static constexpr std::size_t size = N; }; diff --git a/src/apps/cam/capture_script.cpp b/src/apps/cam/capture_script.cpp index fc1dfa75f..f3262af98 100644 --- a/src/apps/cam/capture_script.cpp +++ b/src/apps/cam/capture_script.cpp @@ -600,10 +600,6 @@ ControlValue CaptureScript::parseArrayControl(const ControlId *id, value = Span(values.data(), values.size()); break; } - case ControlTypeString: { - value = Span(repr.data(), repr.size()); - break; - } default: std::cerr << "Unsupported control type" << std::endl; break; From patchwork Tue Apr 1 13:19:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 23098 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C91C8C3213 for ; Tue, 1 Apr 2025 13:19:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 08BB668993; Tue, 1 Apr 2025 15:19:50 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="wNTsAZWX"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0FF9A68987 for ; Tue, 1 Apr 2025 15:19:44 +0200 (CEST) Received: from pb-laptop.local (185.221.143.221.nat.pool.zt.hu [185.221.143.221]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D6EA78DB for ; Tue, 1 Apr 2025 15:17:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1743513472; bh=mwW6x9TBMmlyGxuMnq6tMVV/YoQQ+Jb8V2Sov7+p4Zc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=wNTsAZWXFzrdfxiJSQjnpN8OuE0+FMqWSzzN81TZacFDqyP0wHopuud6IQNqO83My Cwu1J+XCvn9YuBVRLa8XKFVfvu9JhKFUmkMbrAFMokcn22IMmPMOE3t53onRuHGa7E ZnNLYnHIIVYeNFaQXX/s4i9hlV0U2XzC2q7L9hXc= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 4/4] libcamera: controls: Simplify ControlValue::{ControlValue, get, set} Date: Tue, 1 Apr 2025 15:19:39 +0200 Message-ID: <20250401131939.749583-5-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250401131939.749583-1-barnabas.pocze@ideasonboard.com> References: <20250401131939.749583-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Whether or not the control has an array type can be determined from the static information in `detail::control_type`, so use that and `if constexpr` to deduplicate the constructor, get, and set functions. Signed-off-by: Barnabás Pőcze --- include/libcamera/controls.h | 75 ++++++++++-------------------------- 1 file changed, 20 insertions(+), 55 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 85c724ec1..22b5e3d96 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -136,28 +136,14 @@ public: ControlValue(); #ifndef __DOXYGEN__ - template::value && - details::control_type::value && - !std::is_same>::value, - std::nullptr_t> = nullptr> - ControlValue(const T &value) - : type_(ControlTypeNone), numElements_(0) - { - set(details::control_type>::value, false, - &value, 1, sizeof(T)); - } - - template::value || - std::is_same>::value, - std::nullptr_t> = nullptr> + template::value)>> #else template #endif ControlValue(const T &value) - : type_(ControlTypeNone), numElements_(0) + : type_(ControlTypeNone), isArray_(false), numElements_(0) { - set(details::control_type>::value, true, - value.data(), value.size(), sizeof(typename T::value_type)); + set(value); } ~ControlValue(); @@ -180,54 +166,33 @@ public: return !(*this == other); } -#ifndef __DOXYGEN__ - template::value && - !std::is_same>::value, - std::nullptr_t> = nullptr> - T get() const - { - assert(type_ == details::control_type>::value); - assert(!isArray_); - - return *reinterpret_cast(data().data()); - } - - template::value || - std::is_same>::value, - std::nullptr_t> = nullptr> -#else template -#endif T get() const { - assert(type_ == details::control_type>::value); - assert(isArray_); + using TypeInfo = details::control_type>; - using V = typename T::value_type; - const V *value = reinterpret_cast(data().data()); - return T{ value, numElements_ }; - } + assert(type_ == TypeInfo::value); + assert(isArray_ == (TypeInfo::size > 0)); -#ifndef __DOXYGEN__ - template::value && - !std::is_same>::value, - std::nullptr_t> = nullptr> - void set(const T &value) - { - set(details::control_type>::value, false, - reinterpret_cast(&value), 1, sizeof(T)); + if constexpr (TypeInfo::size > 0) + return T(reinterpret_cast(data().data()), numElements_); + else + return *reinterpret_cast(data().data()); } - template::value || - std::is_same>::value, - std::nullptr_t> = nullptr> -#else template -#endif void set(const T &value) { - set(details::control_type>::value, true, - value.data(), value.size(), sizeof(typename T::value_type)); + using TypeInfo = details::control_type>; + constexpr auto type = TypeInfo::value; + + if constexpr (TypeInfo::size > 0) { + static_assert(std::is_trivially_copyable_v); + set(type, true, value.data(), value.size(), sizeof(typename T::value_type)); + } else { + static_assert(std::is_trivially_copyable_v); + set(type, false, reinterpret_cast(&value), 1, sizeof(T)); + } } void reserve(ControlType type, bool isArray = false,