{"id":18752,"url":"https://patchwork.libcamera.org/api/patches/18752/?format=json","web_url":"https://patchwork.libcamera.org/patch/18752/","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":"<20230620142904.72600-2-jacopo.mondi@ideasonboard.com>","date":"2023-06-20T14:29:01","name":"[libcamera-devel,RFC,1/4] libcamera: camera_sensor: Cache rotationTransform_","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"dbe8271f4ca0c28e3dacc8831c00a9f3ae1f378f","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/?format=json","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18752/mbox/","series":[{"id":3932,"url":"https://patchwork.libcamera.org/api/series/3932/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3932","date":"2023-06-20T14:29:00","name":"libcamera: Replace CameraConfiguration::transform","version":1,"mbox":"https://patchwork.libcamera.org/series/3932/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18752/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18752/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 741C2C3292\n\tfor ;\n\tTue, 20 Jun 2023 14:29:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3F9C3628C8;\n\tTue, 20 Jun 2023 16:29:20 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 52B5F617B2\n\tfor ;\n\tTue, 20 Jun 2023 16:29:18 +0200 (CEST)","from uno.lan (unknown [IPv6:2001:b07:5d2e:52c9:72c3:346:a663:c82d])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2DFCB10FE;\n\tTue, 20 Jun 2023 16:28:43 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1687271360;\n\tbh=isx0kpb7PaWO8SQy8nMzry65L0CBhbgORYCCL5eWRR4=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=sC0q5z5waHJlStRkMrzkLkopUzs1E0Reb2R9wXKwpkxztjhgfZ7iME4Ny7FTCmGX9\n\thRCxFmEYlAp8L7Hj9gA8ugzTCC79shdecDDF9G+bQY9eKMAa13/q4NvFVZWv2HfPlC\n\tqlexOWDbSO7GnUwUYria8H2p+YLxN7NEdT1Km3NsniZijZy0LBbsaEWPKPSMN8WN+e\n\txeeUAz35yjREGtZaOoc7OZXXBQlXJFqutkPR3UZUleS7KqtneMeFKw1K9Q8wQe7FKq\n\tMn1Wwy44Zi+kpLdCHaSzmjIdMz1OohXen6r+xSds1xajrgPIsgEVlbrbWcEOYiIQlD\n\tf0XoHKv/bW7Bw==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1687271323;\n\tbh=isx0kpb7PaWO8SQy8nMzry65L0CBhbgORYCCL5eWRR4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=SGDGEqhL0Y2+qW3Lc14yhenyFDVn1rTGJtd4udWsCpHl85a95rC+rBICN9l2FT3HE\n\tiWhXbnlr8d5thgJprZn99qm81Y1nqWd0XqL54U38cM9mMOwr0zV104tJx2STHnJ/aY\n\t+tOqzfJ9CqerDh8CQ49CvlpXoPhA8czGrIHf1ZU0="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"SGDGEqhL\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 20 Jun 2023 16:29:01 +0200","Message-Id":"<20230620142904.72600-2-jacopo.mondi@ideasonboard.com>","X-Mailer":"git-send-email 2.40.1","In-Reply-To":"<20230620142904.72600-1-jacopo.mondi@ideasonboard.com>","References":"<20230620142904.72600-1-jacopo.mondi@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC 1/4] libcamera: camera_sensor: Cache\n\trotationTransform_","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","From":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"Jacopo Mondi ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The rotationTransform_ depends on a V4L2 control whose value does not\nchange for the whole lifetime of the camera.\n\nInstead of re-calculating it everytime the camera is configured, cache\nit at properties initialization time.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/internal/camera_sensor.h | 1 +\n src/libcamera/camera_sensor.cpp | 54 +++++++++++++---------\n 2 files changed, 32 insertions(+), 23 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 02c77ab037da..02b4b4d25e6d 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -107,6 +107,7 @@ private:\n \tRectangle activeArea_;\n \tconst BayerFormat *bayerFormat_;\n \tbool supportFlips_;\n+\tTransform rotationTransform_;\n \n \tControlList properties_;\n \ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex f3a5aa37149f..a15a6c89c5c8 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -461,18 +461,36 @@ int CameraSensor::initProperties()\n \n \tconst auto &rotationControl = controls.find(V4L2_CID_CAMERA_SENSOR_ROTATION);\n \tif (rotationControl != controls.end()) {\n+\t\tpropertyValue = rotationControl->second.def().get();\n+\n \t\t/*\n-\t\t * validateTransform() compensates for the mounting rotation.\n-\t\t * However, as a camera sensor can only compensate rotations\n-\t\t * by applying H/VFlips, only rotation of 180 degrees are\n-\t\t * automatically compensated. The other valid rotations (Rot90\n-\t\t * and Rot270) require transposition, which the camera sensor\n-\t\t * cannot perform, so leave them untouched.\n+\t\t * Cache the Transform associated with the camera mounting\n+\t\t * rotation for later use in validateTransform().\n+\t\t */\n+\t\tbool success;\n+\t\trotationTransform_ = transformFromRotation(propertyValue, &success);\n+\t\tif (!success) {\n+\t\t\tLOG(CameraSensor, Warning)\n+\t\t\t\t<< \"Invalid rotation of \" << propertyValue\n+\t\t\t\t<< \" degrees - ignoring\";\n+\t\t\trotationTransform_ = Transform::Identity;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Adjust property::Rotation as validateTransform() compensates\n+\t\t * for the mounting rotation. However, as a camera sensor can\n+\t\t * only compensate rotations by applying H/VFlips, only rotation\n+\t\t * of 180 degrees are automatically compensated. The other valid\n+\t\t * rotations (Rot90 and Rot270) require transposition, which the\n+\t\t * camera sensor cannot perform, so leave them untouched.\n \t\t */\n-\t\tpropertyValue = rotationControl->second.def().get();\n \t\tif (propertyValue == 180 && supportFlips_)\n \t\t\tpropertyValue = 0;\n \t\tproperties_.set(properties::Rotation, propertyValue);\n+\t} else {\n+\t\tLOG(CameraSensor, Warning)\n+\t\t\t<< \"Rotation control not available, default to 0 degreees\";\n+\t\trotationTransform_ = Transform::Identity;\n \t}\n \n \tproperties_.set(properties::PixelArraySize, pixelArraySize_);\n@@ -1038,21 +1056,11 @@ void CameraSensor::updateControlInfo()\n */\n Transform CameraSensor::validateTransform(Transform *transform) const\n {\n-\t/* Adjust the requested transform to compensate the sensor mounting rotation. */\n-\tconst ControlInfoMap &controls = subdev_->controls();\n-\tint rotation = 0;\n-\n-\tconst auto &rotationControl = controls.find(V4L2_CID_CAMERA_SENSOR_ROTATION);\n-\tif (rotationControl != controls.end())\n-\t\trotation = rotationControl->second.def().get();\n-\n-\tbool success;\n-\tTransform rotationTransform = transformFromRotation(rotation, &success);\n-\tif (!success)\n-\t\tLOG(CameraSensor, Warning) << \"Invalid rotation of \" << rotation\n-\t\t\t\t\t << \" degrees - ignoring\";\n-\n-\tTransform combined = *transform * rotationTransform;\n+\t/*\n+\t * Combine the requested transform to compensate the sensor mounting\n+\t * rotation.\n+\t */\n+\tTransform combined = *transform * rotationTransform_;\n \n \t/*\n \t * We combine the platform and user transform, but must \"adjust away\"\n@@ -1083,7 +1091,7 @@ Transform CameraSensor::validateTransform(Transform *transform) const\n \t\t * rise to this is the inverse of the rotation. (Recall that\n \t\t * combined = transform * rotationTransform.)\n \t\t */\n-\t\t*transform = -rotationTransform;\n+\t\t*transform = -rotationTransform_;\n \t\tcombined = Transform::Identity;\n \t}\n \n","prefixes":["libcamera-devel","RFC","1/4"]}