From patchwork Wed Nov 18 16:08:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 29019 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 029F5C3355 for ; Wed, 18 Nov 2026 16:08:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id ABBE26A8F0; Wed, 18 Nov 2026 17:08:41 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Pzf/+ehC"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 11F7D6A8C7 for ; Wed, 18 Nov 2026 17:08:41 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:c717:cce:84f5:c6f0]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A42041F37; Wed, 18 Nov 2026 17:06:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1795017972; bh=1LDpkEnAgtAv7qL1LjO75ocv768DUNCeY0HjiGYhptE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Pzf/+ehCnyB3mNixE01o+SSMcaZ9TNR0ZKLlq0RCAVPQruVR7xSvCdxiryP8lRW1w tnyhlbVnAMX4WlpugLXCqUtj5OyCGKl9Up8T7nZ80lK+KU8jXw8icbwh3DRT/1WHTJ cQwA+el4drsJcN2uodizdy0Ga//OD+i3pzNYAjjc= From: Stefan Klug Date: Wed, 18 Nov 2026 17:08:11 +0100 Subject: [PATCH RFC 2/3] libcamera: camera_sensor: Add function to query the sensor configuration MIME-Version: 1.0 Message-Id: <20261118-sklug-binning-factors-v1-v1-2-5e552aefbb07@ideasonboard.com> References: <20261118-sklug-binning-factors-v1-v1-0-5e552aefbb07@ideasonboard.com> In-Reply-To: <20261118-sklug-binning-factors-v1-v1-0-5e552aefbb07@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug X-Mailer: b4 0.14.3 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" Add a function to query the sensor configuration that would be applied in a call to applyConfiguration() (if a sensor config is provided) or setFormat() if no sensor config is provided. This can be used during CameraConfiguration::validate() to calculate the sensor configuration. Signed-off-by: Stefan Klug --- include/libcamera/internal/camera_sensor.h | 4 ++ src/libcamera/sensor/camera_sensor_legacy.cpp | 83 +++++++++++++++++++++++++-- src/libcamera/sensor/camera_sensor_raw.cpp | 12 ++++ 3 files changed, 95 insertions(+), 4 deletions(-) diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index 2a2f1f2c936d..77712d6650ae 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -64,6 +64,10 @@ public: Transform transform = Transform::Identity, V4L2SubdeviceFormat *sensorFormat = nullptr) = 0; + virtual int sensorConfiguration(const std::optional &config, + V4L2SubdeviceFormat *format, + SensorConfiguration *resultingConfig) const = 0; + virtual V4L2Subdevice::Stream imageStream() const = 0; virtual std::optional embeddedDataStream() const; virtual V4L2SubdeviceFormat embeddedDataFormat() const; diff --git a/src/libcamera/sensor/camera_sensor_legacy.cpp b/src/libcamera/sensor/camera_sensor_legacy.cpp index 792e4b09d4fa..cc00521ae6bf 100644 --- a/src/libcamera/sensor/camera_sensor_legacy.cpp +++ b/src/libcamera/sensor/camera_sensor_legacy.cpp @@ -84,6 +84,10 @@ public: Transform transform = Transform::Identity, V4L2SubdeviceFormat *sensorFormat = nullptr) override; + int sensorConfiguration(const std::optional &requestedConfig, + V4L2SubdeviceFormat *format, + SensorConfiguration *resultingConfig) const override; + V4L2Subdevice::Stream imageStream() const override; const ControlList &properties() const override { return properties_; } int sensorInfo(IPACameraSensorInfo *info) const override; @@ -106,6 +110,15 @@ protected: private: LIBCAMERA_DISABLE_COPY(CameraSensorLegacy) + int tryConfiguration(const SensorConfiguration &config, + Transform transform = Transform::Identity, + V4L2SubdeviceFormat *sensorFormat = nullptr) const; + + int tryOrApplyConfiguration(const SensorConfiguration &config, + Transform transform, + V4L2SubdeviceFormat *sensorFormat, + V4L2Subdevice::Whence whence); + int init(); int generateId(); int validateSensorDriver(); @@ -805,9 +818,10 @@ int CameraSensorLegacy::tryFormat(V4L2SubdeviceFormat *format) const V4L2Subdevice::Whence::TryFormat); } -int CameraSensorLegacy::applyConfiguration(const SensorConfiguration &config, - Transform transform, - V4L2SubdeviceFormat *sensorFormat) +int CameraSensorLegacy::tryOrApplyConfiguration(const SensorConfiguration &config, + Transform transform, + V4L2SubdeviceFormat *sensorFormat, + V4L2Subdevice::Whence whence) { if (!config.isValid()) { LOG(CameraSensor, Error) << "Invalid sensor configuration"; @@ -857,7 +871,12 @@ int CameraSensorLegacy::applyConfiguration(const SensorConfiguration &config, return -EINVAL; } - int ret = setFormat(&subdevFormat, transform); + int ret; + if (whence == V4L2Subdevice::Whence::ActiveFormat) + ret = setFormat(&subdevFormat, transform); + else + ret = tryFormat(&subdevFormat); + if (ret) return ret; @@ -874,6 +893,62 @@ int CameraSensorLegacy::applyConfiguration(const SensorConfiguration &config, return 0; } +int CameraSensorLegacy::applyConfiguration(const SensorConfiguration &config, + Transform transform, + V4L2SubdeviceFormat *sensorFormat) +{ + return tryOrApplyConfiguration(config, transform, sensorFormat, + V4L2Subdevice::Whence::ActiveFormat); +} + +int CameraSensorLegacy::tryConfiguration(const SensorConfiguration &config, + Transform transform, + V4L2SubdeviceFormat *sensorFormat) const +{ + CameraSensorLegacy *that = const_cast(this); + return that->tryOrApplyConfiguration(config, transform, sensorFormat, + V4L2Subdevice::Whence::TryFormat); +} + +int CameraSensorLegacy::sensorConfiguration(const std::optional &config, + V4L2SubdeviceFormat *format, + SensorConfiguration *out) const +{ + int ret; + if (config) + ret = tryConfiguration(*config, Transform::Identity, format); + else + ret = tryFormat(format); + + ret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP, &out->analogCrop, + V4L2Subdevice::Whence::TryFormat); + if (ret) { + out->analogCrop = activeArea_; + LOG(CameraSensor, Warning) + << "The analogue crop rectangle has been defaulted to the active area size"; + } + + out->outputSize = format->size; + out->binning.binX = out->analogCrop.width / format->size.width; + out->binning.binY = out->analogCrop.height / format->size.height; + out->bitDepth = MediaBusFormatInfo::info(format->code).bitsPerPixel; + + out->skipping = { + .xOddInc = 1, + .xEvenInc = 1, + .yOddInc = 1, + .yEvenInc = 1, + }; + + LOG(CameraSensor, Debug) + << "SensorConfig: Size: " << out->outputSize + << " binning: " << out->binning.binX + << ", " << out->binning.binX + << " bitDepth:" << out->bitDepth; + + return 0; +} + V4L2Subdevice::Stream CameraSensorLegacy::imageStream() const { return { pad_, 0 }; diff --git a/src/libcamera/sensor/camera_sensor_raw.cpp b/src/libcamera/sensor/camera_sensor_raw.cpp index 55b386cef3f3..7bf5b0a3aa38 100644 --- a/src/libcamera/sensor/camera_sensor_raw.cpp +++ b/src/libcamera/sensor/camera_sensor_raw.cpp @@ -85,6 +85,10 @@ public: Transform transform = Transform::Identity, V4L2SubdeviceFormat *sensorFormat = nullptr) override; + int sensorConfiguration(const std::optional &config, + V4L2SubdeviceFormat *format, + SensorConfiguration *resultingConfig) const override; + V4L2Subdevice::Stream imageStream() const override; std::optional embeddedDataStream() const override; V4L2SubdeviceFormat embeddedDataFormat() const override; @@ -936,6 +940,14 @@ int CameraSensorRaw::applyConfiguration(const SensorConfiguration &config, return 0; } +int CameraSensorRaw::sensorConfiguration([[maybe_unused]] const std::optional &config, + [[maybe_unused]] V4L2SubdeviceFormat *format, + [[maybe_unused]] SensorConfiguration *resultingConfig) const +{ + ASSERT(false); + return 0; +} + V4L2Subdevice::Stream CameraSensorRaw::imageStream() const { return streams_.image.source;