[{"id":37063,"web_url":"https://patchwork.libcamera.org/comment/37063/","msgid":"<176409303995.567526.1467808512430790699@ping.linuxembedded.co.uk>","date":"2025-11-25T17:50:39","subject":"Re: [PATCH v3 25/29] pipeline: rkisp1: Load dewarp parameters from\n\ttuning file","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Stefan Klug (2025-11-25 16:28:37)\n> Load the dewarp parameters from the tuning file.\n> \n> Signed-off-by: Stefan Klug \n> \n\nReviewed-by: Kieran Bingham \n\n> ---\n> \n> Changes in v3:\n> - Moved code into converter module\n> - Added more documentation\n> \n> Changes in v2:\n> - Dropped unused variable\n> ---\n> .../internal/converter/converter_dw100.h | 8 +++\n> src/libcamera/converter/converter_dw100.cpp | 71 +++++++++++++++++++\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 16 +++--\n> 3 files changed, 91 insertions(+), 4 deletions(-)\n> \n> diff --git a/include/libcamera/internal/converter/converter_dw100.h b/include/libcamera/internal/converter/converter_dw100.h\n> index 8dd21a6228f1..f0c858689e27 100644\n> --- a/include/libcamera/internal/converter/converter_dw100.h\n> +++ b/include/libcamera/internal/converter/converter_dw100.h\n> @@ -31,6 +31,8 @@ public:\n> \n> static std::unique_ptr createModule(DeviceEnumerator *enumerator);\n> \n> + int init(const YamlObject ¶ms);\n> +\n> int configure(const StreamConfiguration &inputCfg,\n> const std::vector>\n> &outputCfg);\n> @@ -67,12 +69,18 @@ private:\n> int applyControls(const Stream *stream, const V4L2Request *request);\n> void reinitRequest(V4L2Request *request);\n> \n> + struct DewarpParms {\n> + Matrix cm;\n> + std::vector coeffs;\n> + };\n> +\n> struct VertexMapInfo {\n> Dw100VertexMap map;\n> bool update;\n> };\n> \n> std::map vertexMaps_;\n> + std::optional dewarpParams_;\n> unsigned int inputBufferCount_;\n> V4L2M2MConverter converter_;\n> Rectangle sensorCrop_;\n> diff --git a/src/libcamera/converter/converter_dw100.cpp b/src/libcamera/converter/converter_dw100.cpp\n> index cba7cc9f709b..03ffd939dc63 100644\n> --- a/src/libcamera/converter/converter_dw100.cpp\n> +++ b/src/libcamera/converter/converter_dw100.cpp\n> @@ -70,6 +70,74 @@ ConverterDW100Module::createModule(DeviceEnumerator *enumerator)\n> return {};\n> }\n> \n> +/**\n> + * \\brief Initialize the module with configuration data\n> + * \\param[in] params The config parameters\n> + *\n> + * This function shall be called from the pipeline handler to initialize the\n> + * module with the provided parameters.\n> + *\n> + * A typical tuning file entry for the dewarper looks like this:\n> + * \\code{.unparsed}\n> + * modules:\n> + * - Dewarp:\n> + * cm: [\n> + * 1.0, 0.0, 0.0,\n> + * 0.0, 1.0, 0.0,\n> + * 0.0, 0.0, 1.0,\n> + * ]\n> + * coefficients: [\n> + * 0,0,0,0,0,\n> + * ]\n> + * \\endcode\n> + *\n> + * The \\a cm and \\a coefficients parameters are documented in\n> + * Dw100VertexMap::setDewarpParams()\n> + *\n> + * \\sa Dw100VertexMap::setDewarpParams()\n> + * \\return 0 if successful, an error code otherwise\n> + */\n> +int ConverterDW100Module::init(const YamlObject ¶ms)\n> +{\n> + DewarpParms dp;\n> +\n> + auto &cm = params[\"cm\"];\n> + auto &coefficients = params[\"coefficients\"];\n> +\n> + /* If nothing is provided, the dewarper is still functional */\n> + if (!cm && !coefficients)\n> + return 0;\n> +\n> + if (!cm) {\n> + LOG(Converter, Error) << \"Dewarp parameters are missing 'cm' value\";\n> + return -EINVAL;\n> + }\n> +\n> + auto matrix = cm.get>();\n> + if (!matrix) {\n> + LOG(Converter, Error) << \"Failed to load 'cm' value\";\n> + return -EINVAL;\n> + }\n> +\n> + dp.cm = *matrix;\n> +\n> + if (!coefficients) {\n> + LOG(Converter, Error) << \"Dewarp parameters are missing 'coefficients' value\";\n> + return -EINVAL;\n> + }\n> +\n> + const auto coeffs = coefficients.getList();\n> + if (!coeffs) {\n> + LOG(Converter, Error) << \"Dewarp parameters 'coefficients' value is not a list\";\n> + return -EINVAL;\n> + }\n> + dp.coeffs = std::move(*coeffs);\n> +\n> + dewarpParams_ = dp;\n> +\n> + return 0;\n> +}\n> +\n> /**\n> * \\copydoc libcamera::V4L2M2MConverter::configure\n> */\n> @@ -93,6 +161,9 @@ int ConverterDW100Module::configure(const StreamConfiguration &inputCfg,\n> vertexMap.setInputSize(inputCfg.size);\n> vertexMap.setOutputSize(outputCfg.size);\n> vertexMap.setSensorCrop(sensorCrop_);\n> +\n> + if (dewarpParams_)\n> + vertexMap.setDewarpParams(dewarpParams_->cm, dewarpParams_->coeffs);\n> info.update = true;\n> }\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 746eeffab207..adce1de35263 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -453,10 +453,18 @@ int RkISP1CameraData::loadTuningFile(const std::string &path)\n> \n> const auto &modules = (*data)[\"modules\"].asList();\n> for (const auto &module : modules) {\n> - if (module.contains(\"Dewarp\")) {\n> - canUseDewarper_ = true;\n> - break;\n> - }\n> + const auto ¶ms = module[\"Dewarp\"];\n> + if (!params)\n> + continue;\n> +\n> + ret = pipe()->dewarper_->init(params);\n> + if (ret)\n> + return ret;\n> +\n> + LOG(RkISP1, Info) << \"Dw100 dewarper initialized\";\n> +\n> + canUseDewarper_ = true;\n> + return 0;\n> }\n> \n> return 0;\n> -- \n> 2.51.0\n>","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 80F6FC32F1\n\tfor ;\n\tTue, 25 Nov 2025 17:50:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B759760A85;\n\tTue, 25 Nov 2025 18:50:44 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 33805609D8\n\tfor ;\n\tTue, 25 Nov 2025 18:50:43 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D9762236;\n\tTue, 25 Nov 2025 18:48:33 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"GLN+zLQq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1764092913;\n\tbh=bq06ZtCztSuJvDL2XUJHXPztCPDxTylwP2od4JBsRHY=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=GLN+zLQqUScc+0mdE6g28UFDBdvn/kkRwdsylTCWYV5l9XG4s6ov5/OFgxAyGkM1d\n\tSID1OiPLlurjz3EQkkJ6oHDIcACFjCcxTrbiM4AW2AqGQl+0TLTpq0tdlwzp5lORoG\n\tPblJN6Zw0sg5h0s98eHqVMfUBXHW22rt3PujYk5g=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20251125162851.2301793-26-stefan.klug@ideasonboard.com>","References":"<20251125162851.2301793-1-stefan.klug@ideasonboard.com>\n\t<20251125162851.2301793-26-stefan.klug@ideasonboard.com>","Subject":"Re: [PATCH v3 25/29] pipeline: rkisp1: Load dewarp parameters from\n\ttuning file","From":"Kieran Bingham ","Cc":"Stefan Klug ","To":"Stefan Klug ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Tue, 25 Nov 2025 17:50:39 +0000","Message-ID":"<176409303995.567526.1467808512430790699@ping.linuxembedded.co.uk>","User-Agent":"alot/0.9.1","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]