From patchwork Wed Mar 25 09:26:56 2026 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: 26328 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 76412BD87C for ; Wed, 25 Mar 2026 09:27:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 73848627D7; Wed, 25 Mar 2026 10:27:05 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="O7HWW0HX"; 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 0393F620FA for ; Wed, 25 Mar 2026 10:27:03 +0100 (CET) Received: from pb-laptop.local (185.221.143.129.nat.pool.zt.hu [185.221.143.129]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 395E973B for ; Wed, 25 Mar 2026 10:25:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1774430745; bh=ZSPrVpKXvBFDEDNq6fDg3VUw1BEtXcPeqxRW9q9uUa0=; h=From:To:Subject:Date:From; b=O7HWW0HXEzjsxqaprJlVHsm3+PPmXou32p1yeV+06bhXyx1egSaWDA6PX8kTZtoOC aLCnfzY8CQP60NhtaBCeZA/4wZ4eJlm6drPQMMY23VcD7UHFIHSHGh4+QBzgX+wGAb kdWksfmT6NQdVWaFzPRR6eZ6WLDtOApxehbwawEE= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 1/4] libcamera: v4l2_device: Ensure consistent control types Date: Wed, 25 Mar 2026 10:26:56 +0100 Message-ID: <20260325092659.79453-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.53.0 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" While `setControls()` uses the specific types, `updateControls()` converts everything to 32-bit integers (except 64-bit integers). This causes, for example, that a 16-bit unsigned integer is retrieved as `int32_t` even though there is a specific libcamera control type for it. What's even more surprising is that setting such a control requires a `ControlValue` with `uint16_t`, but when `setControls()` updates the list to contain the actually applied values, it will now have type `int32_t`. So make sure that `updateControls()` uses the appropriate type. Signed-off-by: Barnabás Pőcze Reviewed-by: Jacopo Mondi Reviewed-by: Jacopo Mondi --- src/libcamera/v4l2_device.cpp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 67bbaa037..e0099cb7a 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -823,19 +823,26 @@ void V4L2Device::updateControls(ControlList *ctrls, ASSERT(iter != controls_.end()); switch (iter->first->type()) { + case ControlTypeByte: + value.set(v4l2Ctrl.value); + break; + case ControlTypeUnsigned16: + value.set(v4l2Ctrl.value); + break; + case ControlTypeInteger32: + value.set(v4l2Ctrl.value); + break; + case ControlTypeUnsigned32: + value.set(v4l2Ctrl.value); + break; case ControlTypeInteger64: value.set(v4l2Ctrl.value64); break; - default: - /* - * Note: this catches the ControlTypeInteger32 case. - * - * \todo To be changed when support for string controls - * will be added. - */ - value.set(v4l2Ctrl.value); - break; + LOG(V4L2, Error) + << "Control " << utils::hex(id) + << " has unsupported type"; + continue; } ctrls->set(id, value); From patchwork Wed Mar 25 09:26:57 2026 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: 26329 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 73DBDC32DE for ; Wed, 25 Mar 2026 09:27:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AE77262791; Wed, 25 Mar 2026 10:27:06 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="uZ6pAgSu"; 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 4C1E362788 for ; Wed, 25 Mar 2026 10:27:03 +0100 (CET) Received: from pb-laptop.local (185.221.143.129.nat.pool.zt.hu [185.221.143.129]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 699CB10BE for ; Wed, 25 Mar 2026 10:25:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1774430745; bh=+v+puT3yK+q+iwpXjtvEIhVH03OfgrhUDcLY/pIOADE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=uZ6pAgSuzWoEMfOFPBzcGU6XsuUxVz8Y/FScR4/l+X3vn8J1n4e6QrD1OG7Wx55IZ B259NH0GXnL2O8hxrt4ud8nk2Va5Fp1U6+KfCci1c+OjSE+FU+qL8P9babfnxHokdN kC54WfYUXC/TIywt2ceTq3r6mzH6HDG1s2cRptLU= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 2/4] libcamera: v4l2_device: Map `BITMASK` type to `Unsigned32` Date: Wed, 25 Mar 2026 10:26:57 +0100 Message-ID: <20260325092659.79453-2-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325092659.79453-1-barnabas.pocze@ideasonboard.com> References: <20260325092659.79453-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" A bitmask is conceptually an unsigned integer, as implied by the documentation: The maximum value is interpreted as a __u32, allowing the use of bit 31 in the bitmask. so map it to a 32-bit unsigned integer. Adjust the rkisp1 pipeline handler accordingly. Signed-off-by: Barnabás Pőcze Reviewed-by: Jacopo Mondi --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 +--- src/libcamera/v4l2_device.cpp | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 320a4dc5a..c14b57322 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -1479,9 +1479,7 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor) if (controls.find(RKISP1_CID_SUPPORTED_PARAMS_BLOCKS) != controls.end()) { auto list = param_->getControls({ { RKISP1_CID_SUPPORTED_PARAMS_BLOCKS } }); if (!list.empty()) - supportedBlocks = static_cast( - list.get(RKISP1_CID_SUPPORTED_PARAMS_BLOCKS) - .get()); + supportedBlocks = list.get(RKISP1_CID_SUPPORTED_PARAMS_BLOCKS).get(); } else { LOG(RkISP1, Error) << "Failed to query supported params blocks. Falling back to defaults."; diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index e0099cb7a..db1eb70e4 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -572,6 +572,7 @@ ControlType V4L2Device::v4l2CtrlType(uint32_t ctrlType) return ControlTypeUnsigned16; case V4L2_CTRL_TYPE_U32: + case V4L2_CTRL_TYPE_BITMASK: return ControlTypeUnsigned32; case V4L2_CTRL_TYPE_INTEGER: @@ -582,7 +583,6 @@ ControlType V4L2Device::v4l2CtrlType(uint32_t ctrlType) case V4L2_CTRL_TYPE_MENU: case V4L2_CTRL_TYPE_BUTTON: - case V4L2_CTRL_TYPE_BITMASK: case V4L2_CTRL_TYPE_INTEGER_MENU: /* * More precise types may be needed, for now use a 32-bit @@ -636,6 +636,7 @@ std::optional V4L2Device::v4l2ControlInfo(const v4l2_query_ext_ctrl static_cast(ctrl.default_value)); case V4L2_CTRL_TYPE_U32: + case V4L2_CTRL_TYPE_BITMASK: return ControlInfo(static_cast(ctrl.minimum), static_cast(ctrl.maximum), static_cast(ctrl.default_value)); From patchwork Wed Mar 25 09:26:58 2026 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: 26330 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 CE7B1C32F5 for ; Wed, 25 Mar 2026 09:27:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3ED57627A1; Wed, 25 Mar 2026 10:27:07 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="SKsl5bTY"; 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 6340F62791 for ; Wed, 25 Mar 2026 10:27:03 +0100 (CET) Received: from pb-laptop.local (185.221.143.129.nat.pool.zt.hu [185.221.143.129]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 95E071123 for ; Wed, 25 Mar 2026 10:25:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1774430745; bh=sWM8NhFpHWnORQEBgBj+5vljpNdZafni8T1NPAT6aBU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=SKsl5bTYeoTjqmwYs/rCXlSpZ/Hu37B1/SuJDhD47ZYeJQo3Pp0KJ1klElpYXuADk adQBrb9DPkuKq1Ked//D8SuFbFDjNhpzIx6y2W8leIF1rvLku0iSkpKeM/1afJlIkQ jZfZfUE1XE2O8SU0mwPb7IM4KCxPT9cDPyHWyeOs= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 3/4] libcamera: v4l2_device: Use `bool` for boolean controls Date: Wed, 25 Mar 2026 10:26:58 +0100 Message-ID: <20260325092659.79453-3-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325092659.79453-1-barnabas.pocze@ideasonboard.com> References: <20260325092659.79453-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" The `ControlInfo` generated by `V4L2Device::v4l2ControlInfo()` already uses the `bool` type, and there is no reason to disallow setting proper "bool" values. So adjust `updateControls()` and `setControls()` accordingly, and also do the necessary adjustments wrt. `V4L2_CID_{V,H}FLIP`. Signed-off-by: Barnabás Pőcze Reviewed-by: Jacopo Mondi --- src/libcamera/sensor/camera_sensor_legacy.cpp | 10 ++++------ src/libcamera/sensor/camera_sensor_raw.cpp | 6 ++---- src/libcamera/v4l2_device.cpp | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/libcamera/sensor/camera_sensor_legacy.cpp b/src/libcamera/sensor/camera_sensor_legacy.cpp index 6a683821f..99ce7ffb0 100644 --- a/src/libcamera/sensor/camera_sensor_legacy.cpp +++ b/src/libcamera/sensor/camera_sensor_legacy.cpp @@ -212,9 +212,9 @@ int CameraSensorLegacy::init() */ ControlList ctrls(subdev_->controls()); if (subdev_->controls().find(V4L2_CID_HFLIP) != subdev_->controls().end()) - ctrls.set(V4L2_CID_HFLIP, 0); + ctrls.set(V4L2_CID_HFLIP, false); if (subdev_->controls().find(V4L2_CID_VFLIP) != subdev_->controls().end()) - ctrls.set(V4L2_CID_VFLIP, 0); + ctrls.set(V4L2_CID_VFLIP, false); subdev_->setControls(&ctrls); /* Enumerate, sort and cache media bus codes and sizes. */ @@ -762,10 +762,8 @@ int CameraSensorLegacy::setFormat(V4L2SubdeviceFormat *format, Transform transfo if (supportFlips_) { ControlList flipCtrls(subdev_->controls()); - flipCtrls.set(V4L2_CID_HFLIP, - static_cast(!!(transform & Transform::HFlip))); - flipCtrls.set(V4L2_CID_VFLIP, - static_cast(!!(transform & Transform::VFlip))); + flipCtrls.set(V4L2_CID_HFLIP, !!(transform & Transform::HFlip)); + flipCtrls.set(V4L2_CID_VFLIP, !!(transform & Transform::VFlip)); int ret = subdev_->setControls(&flipCtrls); if (ret) diff --git a/src/libcamera/sensor/camera_sensor_raw.cpp b/src/libcamera/sensor/camera_sensor_raw.cpp index 10eba0331..882c1cc1a 100644 --- a/src/libcamera/sensor/camera_sensor_raw.cpp +++ b/src/libcamera/sensor/camera_sensor_raw.cpp @@ -822,10 +822,8 @@ int CameraSensorRaw::setFormat(V4L2SubdeviceFormat *format, Transform transform) if (supportFlips_) { ControlList flipCtrls(subdev_->controls()); - flipCtrls.set(V4L2_CID_HFLIP, - static_cast(!!(transform & Transform::HFlip))); - flipCtrls.set(V4L2_CID_VFLIP, - static_cast(!!(transform & Transform::VFlip))); + flipCtrls.set(V4L2_CID_HFLIP, !!(transform & Transform::HFlip)); + flipCtrls.set(V4L2_CID_VFLIP, !!(transform & Transform::VFlip)); int ret = subdev_->setControls(&flipCtrls); if (ret) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index db1eb70e4..426664b83 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -327,6 +327,17 @@ int V4L2Device::setControls(ControlList *ctrls, const V4L2Request *request) /* Set the v4l2_ext_control value for the write operation. */ ControlValue &value = ctrl->second; switch (iter->first->type()) { + case ControlTypeBool: { + if (value.isArray()) { + LOG(V4L2, Error) + << "Array of bool not supported for control " << utils::hex(id); + return -ENOTSUP; + } + + v4l2Ctrl.value = value.get(); + break; + } + case ControlTypeUnsigned16: { if (value.isArray()) { Span data = value.data(); @@ -824,6 +835,9 @@ void V4L2Device::updateControls(ControlList *ctrls, ASSERT(iter != controls_.end()); switch (iter->first->type()) { + case ControlTypeBool: + value.set(v4l2Ctrl.value); + break; case ControlTypeByte: value.set(v4l2Ctrl.value); break;