@@ -93,6 +93,8 @@ public:
bool empty() const;
std::size_t size() const;
+ virtual const SensorConfiguration &validatedSensorConfig() const = 0;
+
std::optional<SensorConfiguration> sensorConfig;
Orientation orientation;
@@ -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
@@ -85,10 +85,12 @@ public:
}
Status validate() override;
+ const SensorConfiguration &validatedSensorConfig() const override { return sensorConfig_; }
static const std::map<PixelFormat, unsigned int> 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;
}
@@ -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;
@@ -13,6 +13,8 @@
#include <libcamera/base/signal.h>
+#include <libcamera/camera.h>
+
#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<std::unique_ptr<FrameBuffer>> *buffers);
@@ -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;
@@ -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<CameraSensor *>(data_->sensor())->sensorConfiguration(sensorConfig, &sensorFormat_, &sensorConfig_)) {
+ LOG(MaliC55, Error) << "Failed to get sensor configuration.";
+ return Invalid;
+ }
return status;
}
@@ -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<CameraSensor *>(sensor)->sensorConfiguration(sensorConfig, &sensorFormat_, &sensorConfig_);
+
return status;
}
@@ -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;
}
@@ -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()
@@ -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<CameraSensor *>(sensor)->sensorConfiguration(sensorConfig, &fmt, &sensorConfig_)) {
+ LOG(SimplePipeline, Error) << "Failed to get sensor configuration.";
+ return Invalid;
+ }
+
LOG(SimplePipeline, Debug)
<< "Picked "
<< V4L2SubdeviceFormat{ pipeConfig_->code, pipeConfig_->sensorSize, {} }
@@ -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
@@ -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
@@ -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
@@ -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)
@@ -28,6 +28,14 @@ public:
{
return validateColorSpaces();
}
+
+ const SensorConfiguration &validatedSensorConfig() const
+ {
+ return sensorConfig_;
+ }
+
+private:
+ SensorConfiguration sensorConfig_;
};
class StreamColorSpaceTest : public Test
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 <stefan.klug@ideasonboard.com> --- 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(-)