From patchwork Wed Nov 18 16:08:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 29020 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 E7EFFC3355 for ; Wed, 18 Nov 2026 16:08:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9F09E6A902; Wed, 18 Nov 2026 17:08:45 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="GTdUztkD"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C8FEC6A8C7 for ; Wed, 18 Nov 2026 17:08:43 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:c717:cce:84f5:c6f0]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 68C331D18; Wed, 18 Nov 2026 17:06:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1795017975; bh=FA5WMozuPd+GYdMVW756ROoJTI/qkZic8ZPUXSdlyQE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GTdUztkDCJGjBNQuiXJv217RsYW90nymi0NaNCQrx3n6dDvfW+S6NWaH94z6fRrWI OF1LHFF0zWGEfhR1ttaFXVDyMxXgEuXJh1I9ngCdR/qqOPnWro59d4QdaNQbMjJP4j jzSyWq+WFEoXn237e+2aBOYD7f0d9eQVMa5TByMk= From: Stefan Klug Date: Wed, 18 Nov 2026 17:08:12 +0100 Subject: [PATCH RFC 3/3] libcamera: Implement CameraConfiguration::validatedSensorConfig() MIME-Version: 1.0 Message-Id: <20261118-sklug-binning-factors-v1-v1-3-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" To be able to draw the sensor crop selections it is necessary to query the binning factors of the active sensor configuration. Add a validatedSensorConfig() function to query the sensor configuration that would be applied to the sensor. The already existing sensorConfig member can not be used for this purpose as it would incorrectly fixate the sensor config after the first call to validate() even if the user specified a nullopt. Signed-off-by: Stefan Klug --- include/libcamera/camera.h | 2 ++ src/libcamera/camera.cpp | 10 ++++++++++ src/libcamera/pipeline/imx8-isi/imx8-isi.cpp | 7 +++++++ src/libcamera/pipeline/ipu3/cio2.cpp | 10 +++++++++- src/libcamera/pipeline/ipu3/cio2.h | 5 ++++- src/libcamera/pipeline/ipu3/ipu3.cpp | 4 +++- src/libcamera/pipeline/mali-c55/mali-c55.cpp | 9 ++++++++- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 ++++ src/libcamera/pipeline/rpi/common/pipeline_base.cpp | 5 +++++ src/libcamera/pipeline/rpi/common/pipeline_base.h | 3 +++ src/libcamera/pipeline/simple/simple.cpp | 10 ++++++++++ src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 2 ++ src/libcamera/pipeline/vimc/vimc.cpp | 2 ++ src/libcamera/pipeline/virtual/virtual.cpp | 2 ++ src/py/libcamera/py_main.cpp | 3 ++- test/stream/stream_colorspace.cpp | 8 ++++++++ 16 files changed, 81 insertions(+), 5 deletions(-) diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h index c767f0f76f45..1702d260cd62 100644 --- a/include/libcamera/camera.h +++ b/include/libcamera/camera.h @@ -93,6 +93,8 @@ public: bool empty() const; std::size_t size() const; + virtual const SensorConfiguration &validatedSensorConfig() const = 0; + std::optional sensorConfig; Orientation orientation; diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 9dadc91a381e..9d7dd976ff1d 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -550,6 +550,16 @@ CameraConfiguration::Status CameraConfiguration::validateColorSpaces(ColorSpaceF * from the same image source. */ +/** + * \fun CameraConfiguration::validatedSensorConfig + * \brief Get the validated sensor configuration + * + * Get the sensor configuration that will be applied to the sensor. This + * configuration is only valid after calling \a validate(). + * + * \return The sensor config that gets applied to the sensor + */ + /** * \var CameraConfiguration::orientation * \brief The desired orientation of the images produced by the camera diff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp index c907e4a60998..b6ac38694454 100644 --- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp +++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp @@ -85,10 +85,12 @@ public: } Status validate() override; + const SensorConfiguration &validatedSensorConfig() const override { return sensorConfig_; } static const std::map formatsMap_; V4L2SubdeviceFormat sensorFormat_; + SensorConfiguration sensorConfig_; private: CameraConfiguration::Status @@ -603,6 +605,11 @@ CameraConfiguration::Status ISICameraConfiguration::validate() LOG(ISI, Debug) << "Selected sensor format: " << sensorFormat_; + if (sensor->sensorConfiguration(std::nullopt, &sensorFormat_, &sensorConfig_)) { + LOG(ISI, Error) << "Failed to get sensor configuration"; + return Invalid; + } + return status; } diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp index 7481b2686df0..f492eb9767bc 100644 --- a/src/libcamera/pipeline/ipu3/cio2.cpp +++ b/src/libcamera/pipeline/ipu3/cio2.cpp @@ -218,7 +218,7 @@ int CIO2Device::configure(const Size &size, const Transform &transform, return 0; } -StreamConfiguration CIO2Device::generateConfiguration(Size size) const +StreamConfiguration CIO2Device::generateConfiguration(Size size, SensorConfiguration *config) const { StreamConfiguration cfg; @@ -234,6 +234,14 @@ StreamConfiguration CIO2Device::generateConfiguration(Size size) const return {}; } + if (config) { + int ret = sensor()->sensorConfiguration(std::nullopt, &sensorFormat, config); + if (ret) { + LOG(IPU3, Error) << "Failed to get sensor config."; + return {}; + } + } + cfg.size = sensorFormat.size; cfg.pixelFormat = mbusCodesToPixelFormat.at(sensorFormat.code); cfg.bufferCount = kBufferCount; diff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h index 91651a16404e..23830c7a0a69 100644 --- a/src/libcamera/pipeline/ipu3/cio2.h +++ b/src/libcamera/pipeline/ipu3/cio2.h @@ -13,6 +13,8 @@ #include +#include + #include "libcamera/internal/v4l2_subdevice.h" #include "libcamera/internal/v4l2_videodevice.h" @@ -41,7 +43,8 @@ public: int configure(const Size &size, const Transform &transform, V4L2DeviceFormat *outputFormat); - StreamConfiguration generateConfiguration(Size size) const; + StreamConfiguration generateConfiguration(Size size, + SensorConfiguration *config = nullptr) const; int exportBuffers(unsigned int count, std::vector> *buffers); diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 46af776ee9d2..6c7c4edfc461 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -105,6 +105,7 @@ public: const StreamConfiguration &cio2Format() const { return cio2Configuration_; } const ImgUDevice::PipeConfig &imguConfig() const { return pipeConfig_; } + const SensorConfiguration &validatedSensorConfig() const override { return sensorConfig_; }; /* Cache the combinedTransform_ that will be applied to the sensor */ Transform combinedTransform_; @@ -119,6 +120,7 @@ private: StreamConfiguration cio2Configuration_; ImgUDevice::PipeConfig pipeConfig_; + SensorConfiguration sensorConfig_; }; class PipelineHandlerIPU3 : public PipelineHandler @@ -264,7 +266,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate() ImgUDevice::kOutputMarginHeight }) .boundedTo(data_->cio2_.sensor()->resolution()); - cio2Configuration_ = data_->cio2_.generateConfiguration(rawSize); + cio2Configuration_ = data_->cio2_.generateConfiguration(rawSize, &sensorConfig_); if (!cio2Configuration_.pixelFormat.isValid()) return Invalid; diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp index 8225472ce8ea..1db77f2c04e7 100644 --- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp +++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp @@ -500,6 +500,7 @@ public: Status validate() override; const Transform &combinedTransform() { return combinedTransform_; } + const SensorConfiguration &validatedSensorConfig() const override { return sensorConfig_; } V4L2SubdeviceFormat sensorFormat_; @@ -508,6 +509,7 @@ private: const MaliC55CameraData *data_; Transform combinedTransform_; + SensorConfiguration sensorConfig_; }; CameraConfiguration::Status MaliC55CameraConfiguration::validate() @@ -668,7 +670,12 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate() } sensorFormat_.size = bestSize; - LOG(MaliC55, Debug) << "Computed sensor configuration " << sensorFormat_; + LOG(MaliC55, Debug) << "Computed sensor format " << sensorFormat_; + + if (const_cast(data_->sensor())->sensorConfiguration(sensorConfig, &sensorFormat_, &sensorConfig_)) { + LOG(MaliC55, Error) << "Failed to get sensor configuration."; + return Invalid; + } return status; } diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 39fe0f0964d7..7c7f5670d328 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -148,6 +148,7 @@ public: const V4L2SubdeviceFormat &sensorFormat() { return sensorFormat_; } const Transform &combinedTransform() { return combinedTransform_; } + const SensorConfiguration &validatedSensorConfig() const override { return sensorConfig_; } private: bool fitsAllPaths(const StreamConfiguration &cfg); @@ -162,6 +163,7 @@ private: V4L2SubdeviceFormat sensorFormat_; Transform combinedTransform_; + SensorConfiguration sensorConfig_; }; namespace { @@ -775,6 +777,8 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate() if (sensorFormat_.size.isNull()) sensorFormat_.size = sensor->resolution(); + const_cast(sensor)->sensorConfiguration(sensorConfig, &sensorFormat_, &sensorConfig_); + return status; } diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp index d6ce2dbf5cee..6221d02284ec 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp @@ -304,6 +304,11 @@ CameraConfiguration::Status RPiCameraConfiguration::validate() status = Adjusted; } + if (data_->sensor_->sensorConfiguration(sensorConfig, &sensorFormat_, &sensorConfig_)) { + LOG(RPI, Error) << "Failed to get sensor configuration."; + return Invalid; + } + return status; } diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h index 7b8725558612..0564f057f102 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.h +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h @@ -270,11 +270,14 @@ public: CameraConfiguration::Status validateColorSpaces(ColorSpaceFlags flags); Status validate() override; + const SensorConfiguration &validatedSensorConfig() const override { return sensorConfig_; } /* Cache the combinedTransform_ that will be applied to the sensor */ Transform combinedTransform_; /* The sensor format computed in validate() */ V4L2SubdeviceFormat sensorFormat_; + /* The sensor configuration computed in validate() */ + SensorConfiguration sensorConfig_; struct StreamParams { StreamParams() diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 2f7f4c893fb4..10d544688fce 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -383,6 +383,7 @@ public: SimpleCameraConfiguration(Camera *camera, SimpleCameraData *data); Status validate() override; + const SensorConfiguration &validatedSensorConfig() const override { return sensorConfig_; }; const SimpleCameraData::Configuration *pipeConfig() const { @@ -407,6 +408,7 @@ private: const SimpleCameraData::Configuration *pipeConfig_; bool needConversion_; Transform combinedTransform_; + SensorConfiguration sensorConfig_; }; class SimplePipelineHandler : public PipelineHandler @@ -1275,6 +1277,14 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate() if (!pipeConfig_) pipeConfig_ = maxPipeConfig; + V4L2SubdeviceFormat fmt; + fmt.code = pipeConfig_->code; + fmt.size = pipeConfig_->captureSize; + if (const_cast(sensor)->sensorConfiguration(sensorConfig, &fmt, &sensorConfig_)) { + LOG(SimplePipeline, Error) << "Failed to get sensor configuration."; + return Invalid; + } + LOG(SimplePipeline, Debug) << "Picked " << V4L2SubdeviceFormat{ pipeConfig_->code, pipeConfig_->sensorSize, {} } diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index 7c14e12d4ae6..bef1a3eb0028 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -73,9 +73,11 @@ public: UVCCameraConfiguration(UVCCameraData *data); Status validate() override; + const SensorConfiguration &validatedSensorConfig() const override { return sensorConfig_; } private: UVCCameraData *data_; + SensorConfiguration sensorConfig_ = {}; }; class PipelineHandlerUVC : public PipelineHandler diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 62bf1f03f8da..f6e698b1a5e4 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -76,9 +76,11 @@ public: VimcCameraConfiguration(VimcCameraData *data); Status validate() override; + const SensorConfiguration &validatedSensorConfig() const override { return sensorConfig_; } private: VimcCameraData *data_; + SensorConfiguration sensorConfig_ = {}; }; class PipelineHandlerVimc : public PipelineHandler diff --git a/src/libcamera/pipeline/virtual/virtual.cpp b/src/libcamera/pipeline/virtual/virtual.cpp index f50cb49c6d07..816537d82ecc 100644 --- a/src/libcamera/pipeline/virtual/virtual.cpp +++ b/src/libcamera/pipeline/virtual/virtual.cpp @@ -73,9 +73,11 @@ public: VirtualCameraConfiguration(VirtualCameraData *data); Status validate() override; + const SensorConfiguration &validatedSensorConfig() const override { return sensorConfig_; } private: const VirtualCameraData *data_; + SensorConfiguration sensorConfig_ = {}; }; class PipelineHandlerVirtual : public PipelineHandler diff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp index a2e34734f0dd..31894b867839 100644 --- a/src/py/libcamera/py_main.cpp +++ b/src/py/libcamera/py_main.cpp @@ -330,7 +330,8 @@ PYBIND11_MODULE(_libcamera, m) .def_property_readonly("size", &CameraConfiguration::size) .def_property_readonly("empty", &CameraConfiguration::empty) .def_readwrite("sensor_config", &CameraConfiguration::sensorConfig) - .def_readwrite("orientation", &CameraConfiguration::orientation); + .def_readwrite("orientation", &CameraConfiguration::orientation) + .def_property_readonly("validated_sensor_config", &CameraConfiguration::validatedSensorConfig); pyCameraConfigurationStatus .value("Valid", CameraConfiguration::Valid) diff --git a/test/stream/stream_colorspace.cpp b/test/stream/stream_colorspace.cpp index 4c904c4c5685..92c19ce6bb63 100644 --- a/test/stream/stream_colorspace.cpp +++ b/test/stream/stream_colorspace.cpp @@ -28,6 +28,14 @@ public: { return validateColorSpaces(); } + + const SensorConfiguration &validatedSensorConfig() const + { + return sensorConfig_; + } + +private: + SensorConfiguration sensorConfig_; }; class StreamColorSpaceTest : public Test