{"id":10807,"url":"https://patchwork.libcamera.org/api/patches/10807/?format=json","web_url":"https://patchwork.libcamera.org/patch/10807/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210105123128.617543-5-jacopo@jmondi.org>","date":"2021-01-05T12:31:22","name":"[libcamera-devel,v5,04/10] libcamera: camera_sensor: Default analogue crop rectangle","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6d42126bdc17e74e855ad7b9a76031ee647a1e12","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10807/mbox/","series":[{"id":1567,"url":"https://patchwork.libcamera.org/api/series/1567/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1567","date":"2021-01-05T12:31:18","name":"libcamera: camera_sensor: Make validation more strict","version":5,"mbox":"https://patchwork.libcamera.org/series/1567/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10807/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10807/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 72025C0F1C\n\tfor ;\n\tTue, 5 Jan 2021 12:31:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 429EC62D3E;\n\tTue, 5 Jan 2021 13:31:23 +0100 (CET)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4CE326010F\n\tfor ;\n\tTue, 5 Jan 2021 13:31:20 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 0AACBE000E\n\tfor ;\n\tTue, 5 Jan 2021 12:31:19 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 5 Jan 2021 13:31:22 +0100","Message-Id":"<20210105123128.617543-5-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.29.2","In-Reply-To":"<20210105123128.617543-1-jacopo@jmondi.org>","References":"<20210105123128.617543-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v5 04/10] libcamera: camera_sensor:\n\tDefault analogue crop rectangle","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"As support for the V4L2_SEL_TGT_CROP selection target, used to read the\nsensor analogue crop rectangle is schedule to become mandatory but is\nstill optional, cache a default value equal to the sensor's active area\nsize at sensor validation time to allow the creation of the\nCameraSensorInfo in the case the driver does not support it.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/internal/camera_sensor.h | 1 +\n src/libcamera/camera_sensor.cpp | 27 ++++++++++++++--------\n 2 files changed, 19 insertions(+), 9 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 86902b85ada8..de6a0202d19a 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -86,6 +86,7 @@ private:\n \n \tSize pixelArraySize_;\n \tRectangle activeArea_;\n+\tRectangle analogueCrop_;\n \n \tControlList properties_;\n };\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 92c90862215d..eda41980aa22 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -289,8 +289,10 @@ int CameraSensor::validateSensorDriver()\n \n \tret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP, &rect);\n \tif (ret) {\n+\t\tanalogueCrop_ = activeArea_;\n \t\tLOG(CameraSensor, Warning)\n-\t\t\t<< \"Failed to retrieve the sensor crop rectangle\";\n+\t\t\t<< \"The analogue crop rectangle has been defaulted to: \"\n+\t\t\t<< analogueCrop_.toString();\n \t\terr = -EINVAL;\n \t}\n \n@@ -643,13 +645,20 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n \t */\n \tinfo->activeAreaSize = { activeArea_.width, activeArea_.height };\n \n-\t/* It's mandatory for the subdevice to report its crop rectangle. */\n-\tint ret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP, &info->analogCrop);\n-\tif (ret) {\n-\t\tLOG(CameraSensor, Error)\n-\t\t\t<< \"Failed to construct camera sensor info: \"\n-\t\t\t<< \"the camera sensor does not report the crop rectangle\";\n-\t\treturn ret;\n+\t/*\n+\t * \\todo Support for retreiving the crop rectangle is scheduled to\n+\t * become mandatory. For the time being use the default value if it has\n+\t * been initialized at sensor driver validation time.\n+\t */\n+\tif (!analogueCrop_.isNull()) {\n+\t\tinfo->analogCrop = analogueCrop_;\n+\t} else {\n+\t\tint ret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP, &info->analogCrop);\n+\t\tif (ret) {\n+\t\t\tLOG(CameraSensor, Error)\n+\t\t\t\t<< \"Failed to retrieve the sensor crop rectangle.\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n \t}\n \n \t/*\n@@ -664,7 +673,7 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n \n \t/* The bit depth and image size depend on the currently applied format. */\n \tV4L2SubdeviceFormat format{};\n-\tret = subdev_->getFormat(pad_, &format);\n+\tint ret = subdev_->getFormat(pad_, &format);\n \tif (ret)\n \t\treturn ret;\n \tinfo->bitsPerPixel = format.bitsPerPixel();\n","prefixes":["libcamera-devel","v5","04/10"]}