@@ -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;
@@ -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 };
@@ -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;
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(-)