From patchwork Thu Oct 23 14:48:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 24758 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 AD7F2C3345 for ; Thu, 23 Oct 2025 14:50:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3C26F60854; Thu, 23 Oct 2025 16:50:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="rjZt7oqs"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EB1D0607ED for ; Thu, 23 Oct 2025 16:50:19 +0200 (CEST) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:7328:357b:4ce1:72b6]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id E9D741D2B; Thu, 23 Oct 2025 16:48:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1761230915; bh=X/atkDhziiN20cDoi0BOYNgnetYnqG9uNQt3YQGpzB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rjZt7oqssZ0l9tqK/gPPgeEO1gmvYLMUdlYePc4UzShTFsj7OiNNXLu11Fv7l9MDI GBBnzKvWPSq5V73ucLFUO69wQkKFpVm0W6zqt9ximW5W3YI2xqYR6lcn1IEFkOpQ39 HOpjGytt79UQz1zbJXlsH1nxaFzQiwikZpqnxgUQ= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH v2 31/35] pipeline: rkisp1: Load dewarp parameters from tuning file Date: Thu, 23 Oct 2025 16:48:32 +0200 Message-ID: <20251023144841.403689-32-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251023144841.403689-1-stefan.klug@ideasonboard.com> References: <20251023144841.403689-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 --- Changes in v2: - Dropped unused variable --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 33 +++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index eaf82d0f1097..2280a5554f5a 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_; @@ -458,8 +463,30 @@ int RkISP1CameraData::loadTuningFile(const std::string &path) const auto &algos = (*data)["algorithms"].asList(); for (const auto &algo : algos) { - if (algo.contains("Dewarp")) + const auto ¶ms = algo["Dewarp"]; + if (params) { canUseDewarper_ = true; + 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; + } } return 0; @@ -1050,6 +1077,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); /*