[RFC,2/3] libcamera: camera_sensor: Add function to query the sensor configuration
diff mbox series

Message ID 20261118-sklug-binning-factors-v1-v1-2-5e552aefbb07@ideasonboard.com
State New
Headers show
Series
  • libcamera: Allow to query binning factors
Related show

Commit Message

Stefan Klug Nov. 18, 2026, 4:08 p.m. UTC
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 <stefan.klug@ideasonboard.com>
---
 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(-)

Comments

Barnabás Pőcze Nov. 18, 2026, 4:58 p.m. UTC | #1
Hi

2026. 11. 18. 17:08 keltezéssel, Stefan Klug írta:
> 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 <stefan.klug@ideasonboard.com>
> ---
>   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/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:
> [...]
> +int CameraSensorLegacy::sensorConfiguration(const std::optional<SensorConfiguration> &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,
> +	};

Maybe I'm missing something, but how can one know if the size reduction is due to
binning or skipping? It cannot be known just by knowing the crop rectangle and
output size, no? This change seems to assume that all the downscaling is due to
binning.

Is there maybe an assumption here that no sensor drivers use skipping? I believe
neither skipping nor binning can be configured explicitly with the current v4l2 api?
So maybe no drivers actually have "skipped" modes?


Regards,
Barnabás Pőcze


> +
> +	LOG(CameraSensor, Debug)
> +		<< "SensorConfig: Size: " << out->outputSize
> +		<< " binning: " << out->binning.binX
> +		<< ", " << out->binning.binX
> +		<< " bitDepth:" << out->bitDepth;
> +
> +	return 0;
> +}
> [...]

Patch
diff mbox series

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<SensorConfiguration> &config,
+					V4L2SubdeviceFormat *format,
+					SensorConfiguration *resultingConfig) const = 0;
+
 	virtual V4L2Subdevice::Stream imageStream() const = 0;
 	virtual std::optional<V4L2Subdevice::Stream> 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<SensorConfiguration> &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<CameraSensorLegacy *>(this);
+	return that->tryOrApplyConfiguration(config, transform, sensorFormat,
+					     V4L2Subdevice::Whence::TryFormat);
+}
+
+int CameraSensorLegacy::sensorConfiguration(const std::optional<SensorConfiguration> &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<SensorConfiguration> &config,
+				V4L2SubdeviceFormat *format,
+				SensorConfiguration *resultingConfig) const override;
+
 	V4L2Subdevice::Stream imageStream() const override;
 	std::optional<V4L2Subdevice::Stream> 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<SensorConfiguration> &config,
+					 [[maybe_unused]] V4L2SubdeviceFormat *format,
+					 [[maybe_unused]] SensorConfiguration *resultingConfig) const
+{
+	ASSERT(false);
+	return 0;
+}
+
 V4L2Subdevice::Stream CameraSensorRaw::imageStream() const
 {
 	return streams_.image.source;