From patchwork Tue Sep 30 12:26:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 24529 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 80F66C324C for ; Tue, 30 Sep 2025 13:36:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6EEDF6B5F0; Tue, 30 Sep 2025 15:36:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ZE94ao2+"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E6EBF62C35 for ; Tue, 30 Sep 2025 15:36:34 +0200 (CEST) Received: from ideasonboard.com (unknown [94.31.94.171]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id A3852226; Tue, 30 Sep 2025 15:35:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1759239306; bh=1dktPjzZRlSD7DZj7eky+F8Y3+QEKO3Os8t0DGfV+SQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZE94ao2+8mkk8TgUqUaDBDO11rGZXcJ7TtR7VmiLl/q7HcRv8aAKcsXzxZ1V3/FUK PoLo4VMR1a3AQnSm4k33KmCI7VEQlZQRAJ5txOKoPU+GSS9BFc1tP4D3iPidfxlYsp lj3wKPMRfAL/Ry2naPX9pmQFG6KELvOICQqfS3Rk= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH v1 30/33] pipeline: rkisp1: Load dewarp parameters from tuning 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 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Load the dewarp parameters from the tuning file. Signed-off-by: Stefan Klug --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 30 ++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 07dd5dc8d99a..13d82c9957bc 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -125,6 +125,11 @@ public: */ MediaPipeline pipe_; + struct DewarpParms { + Matrix cm; + std::vector coeffs; + }; + std::optional dewarpParams_; bool canUseDewarper_; bool usesDewarper_; @@ -462,6 +467,27 @@ int RkISP1CameraData::loadTuningFile(const std::string &path) const auto ¶ms = algo["Dewarp"]; canUseDewarper_ = true; + Matrix m; + DewarpParms dp; + if (params["cm"]) { + const auto &cm = params["cm"].get>(); + if (!cm) { + LOG(RkISP1, Error) << "Dewarp parameters are missing 'cm' value"; + return -EINVAL; + } + dp.cm = *cm; + } + + if (params["coefficients"]) { + const auto &coeffs = params["coefficients"].getList(); + if (!coeffs) { + LOG(RkISP1, Error) << "Dewarp parameters 'coefficients' value is not a list"; + return -EINVAL; + } + dp.coeffs = *coeffs; + } + + dewarpParams_ = dp; } } @@ -1066,6 +1092,10 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c) auto &vertexMap = dewarper_->vertexMap(cfg.stream()); vertexMap.setSensorCrop(sensorCrop); vertexMap.setTransform(config->combinedTransform()); + if (data->dewarpParams_) { + vertexMap.setDewarpParams(data->dewarpParams_->cm, + data->dewarpParams_->coeffs); + } data->properties_.set(properties::ScalerCropMaximum, sensorCrop); /*