{"id":24529,"url":"https://patchwork.libcamera.org/api/1.1/patches/24529/?format=json","web_url":"https://patchwork.libcamera.org/patch/24529/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20250930122726.1837524-31-stefan.klug@ideasonboard.com>","date":"2025-09-30T12:26:51","name":"[v1,30/33] pipeline: rkisp1: Load dewarp parameters from tuning file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"bd39f1b92727a0af1221a153aa295cc59e5e6880","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24529/mbox/","series":[{"id":5468,"url":"https://patchwork.libcamera.org/api/1.1/series/5468/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5468","date":"2025-09-30T12:26:21","name":"Full dewarper support on imx8mp","version":1,"mbox":"https://patchwork.libcamera.org/series/5468/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24529/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24529/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 80F66C324C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 30 Sep 2025 13:36:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6EEDF6B5F0;\n\tTue, 30 Sep 2025 15:36:36 +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 E6EBF62C35\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Sep 2025 15:36:34 +0200 (CEST)","from ideasonboard.com (unknown [94.31.94.171])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id A3852226;\n\tTue, 30 Sep 2025 15:35:06 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ZE94ao2+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1759239306;\n\tbh=1dktPjzZRlSD7DZj7eky+F8Y3+QEKO3Os8t0DGfV+SQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ZE94ao2+8mkk8TgUqUaDBDO11rGZXcJ7TtR7VmiLl/q7HcRv8aAKcsXzxZ1V3/FUK\n\tPoLo4VMR1a3AQnSm4k33KmCI7VEQlZQRAJ5txOKoPU+GSS9BFc1tP4D3iPidfxlYsp\n\tlj3wKPMRfAL/Ry2naPX9pmQFG6KELvOICQqfS3Rk=","From":"Stefan Klug <stefan.klug@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug <stefan.klug@ideasonboard.com>","Subject":"[PATCH v1 30/33] pipeline: rkisp1: Load dewarp parameters from\n\ttuning file","Date":"Tue, 30 Sep 2025 14:26:51 +0200","Message-ID":"<20250930122726.1837524-31-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.48.1","In-Reply-To":"<20250930122726.1837524-1-stefan.klug@ideasonboard.com>","References":"<20250930122726.1837524-1-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Load the dewarp parameters from the tuning file.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 30 ++++++++++++++++++++++++\n 1 file changed, 30 insertions(+)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 07dd5dc8d99a..13d82c9957bc 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -125,6 +125,11 @@ public:\n \t */\n \tMediaPipeline pipe_;\n \n+\tstruct DewarpParms {\n+\t\tMatrix<double, 3, 3> cm;\n+\t\tstd::vector<double> coeffs;\n+\t};\n+\tstd::optional<DewarpParms> dewarpParams_;\n \tbool canUseDewarper_;\n \tbool usesDewarper_;\n \n@@ -462,6 +467,27 @@ int RkISP1CameraData::loadTuningFile(const std::string &path)\n \t\t\tconst auto &params = algo[\"Dewarp\"];\n \n \t\t\tcanUseDewarper_ = true;\n+\t\t\tMatrix<double, 3, 3> m;\n+\t\t\tDewarpParms dp;\n+\t\t\tif (params[\"cm\"]) {\n+\t\t\t\tconst auto &cm = params[\"cm\"].get<Matrix<double, 3, 3>>();\n+\t\t\t\tif (!cm) {\n+\t\t\t\t\tLOG(RkISP1, Error) << \"Dewarp parameters are missing 'cm' value\";\n+\t\t\t\t\treturn -EINVAL;\n+\t\t\t\t}\n+\t\t\t\tdp.cm = *cm;\n+\t\t\t}\n+\n+\t\t\tif (params[\"coefficients\"]) {\n+\t\t\t\tconst auto &coeffs = params[\"coefficients\"].getList<double>();\n+\t\t\t\tif (!coeffs) {\n+\t\t\t\t\tLOG(RkISP1, Error) << \"Dewarp parameters 'coefficients' value is not a list\";\n+\t\t\t\t\treturn -EINVAL;\n+\t\t\t\t}\n+\t\t\t\tdp.coeffs = *coeffs;\n+\t\t\t}\n+\n+\t\t\tdewarpParams_ = dp;\n \t\t}\n \t}\n \n@@ -1066,6 +1092,10 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \t\t\t\tauto &vertexMap = dewarper_->vertexMap(cfg.stream());\n \t\t\t\tvertexMap.setSensorCrop(sensorCrop);\n \t\t\t\tvertexMap.setTransform(config->combinedTransform());\n+\t\t\t\tif (data->dewarpParams_) {\n+\t\t\t\t\tvertexMap.setDewarpParams(data->dewarpParams_->cm,\n+\t\t\t\t\t\t\t\t  data->dewarpParams_->coeffs);\n+\t\t\t\t}\n \t\t\t\tdata->properties_.set(properties::ScalerCropMaximum, sensorCrop);\n \n \t\t\t\t/*\n","prefixes":["v1","30/33"]}