[libcamera-devel,v7,04/10] libcamera: camera_sensor: Default analogue crop rectangle
diff mbox series

Message ID 20210115170033.27124-5-jacopo@jmondi.org
State Accepted
Commit 8deb7e4331c3616e15c7f40625ac623e1ccd5551
Headers show
Series
  • libcamera: camera_sensor: Make validation more strict
Related show

Commit Message

Jacopo Mondi Jan. 15, 2021, 5 p.m. UTC 
As support for the V4L2_SEL_TGT_CROP selection target used to read the
sensor analogue crop rectangle is schedule to become mandatory but is
still optional, use the sensor's active area size as fallback value to
allow the creation of the CameraSensorInfo in the case the driver does
not support it.

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/libcamera/camera_sensor.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Patch
diff mbox series 

diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
index 0c9bd4f50cff..e8caa4467643 100644
--- a/src/libcamera/camera_sensor.cpp
+++ b/src/libcamera/camera_sensor.cpp
@@ -643,13 +643,16 @@  int CameraSensor::sensorInfo(CameraSensorInfo *info) const
 	 */
 	info->activeAreaSize = { activeArea_.width, activeArea_.height };
 
-	/* It's mandatory for the subdevice to report its crop rectangle. */
+	/*
+	 * \todo Support for retreiving the crop rectangle is scheduled to
+	 * become mandatory. For the time being use the default value if it has
+	 * been initialized at sensor driver validation time.
+	 */
 	int ret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP, &info->analogCrop);
 	if (ret) {
+		info->analogCrop = activeArea_;
 		LOG(CameraSensor, Error)
-			<< "Failed to construct camera sensor info: "
-			<< "the camera sensor does not report the crop rectangle";
-		return ret;
+			<< "The analogue crop rectangle has been defaulted to the active area size";
 	}
 
 	/*