From patchwork Thu Jun 11 01:17:22 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 26871 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 C52A3C328C for ; Thu, 11 Jun 2026 01:17:35 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 72D8961F3D; Thu, 11 Jun 2026 03:17:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="e5vbDx8y"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D5EBF61F37 for ; Thu, 11 Jun 2026 03:17:31 +0200 (CEST) Received: from killaraus.ideasonboard.com (2001-14ba-70f3-e800--a06.rev.dnainternet.fi [IPv6:2001:14ba:70f3:e800::a06]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5918A673 for ; Thu, 11 Jun 2026 03:17:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781140622; bh=ybjxsF5CBDBnkpzyLuEHefbgksKGMwqTap4Norv5tyk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=e5vbDx8ypUvS4ozwCfyHaioO+VOKOqyJWkPJLTUvyRE/oajW4IXQCDAp5Dp0/4Qmn amCybnCdrJesGQRmE9VdOkZpWtwYx/MGOpDrzCdR2v78WYkueXwpSkcoxx+al7aQ/c G+Dr/jxLomkuRoPm92t1amefDvuSmZS4rE4GHBWE= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH 6/6] libcamera: Replace last mentions of YAML Date: Thu, 11 Jun 2026 04:17:22 +0300 Message-ID: <20260611011722.1767689-7-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260611011722.1767689-1-laurent.pinchart@ideasonboard.com> References: <20260611011722.1767689-1-laurent.pinchart@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" A few comments and log messages still mention YAML while they now relate to code operating on ValueNode. Replace them with value node or tuning data as appropriate for the context. Signed-off-by: Laurent Pinchart --- src/ipa/libipa/lux.cpp | 2 +- src/ipa/libipa/module.cpp | 10 +++++----- src/ipa/libipa/module.h | 2 +- src/ipa/libipa/pwl.cpp | 2 +- src/ipa/rkisp1/algorithms/dpcc.cpp | 2 +- src/ipa/rkisp1/algorithms/lsc.cpp | 6 +++--- src/libcamera/geometry.cpp | 2 +- src/libcamera/matrix.cpp | 2 +- src/libcamera/vector.cpp | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/ipa/libipa/lux.cpp b/src/ipa/libipa/lux.cpp index 46cc63a115b5..12ba073a1165 100644 --- a/src/ipa/libipa/lux.cpp +++ b/src/ipa/libipa/lux.cpp @@ -80,7 +80,7 @@ Lux::Lux() * \brief Parse tuning data * \param[in] tuningData The ValueNode representing the tuning data * - * This function parses yaml tuning data for the common Lux module. It requires + * This function parses tuning data for the common Lux module. It requires * reference exposure time, analogue gain, digital gain, and lux values. * * \code{.unparsed} diff --git a/src/ipa/libipa/module.cpp b/src/ipa/libipa/module.cpp index 76e10e250b73..bd415eef59e1 100644 --- a/src/ipa/libipa/module.cpp +++ b/src/ipa/libipa/module.cpp @@ -85,14 +85,14 @@ namespace ipa { /** * \fn Module::createAlgorithms() - * \brief Create algorithms from YAML configuration data + * \brief Create algorithms from tuning data * \param[in] context The IPA context * \param[in] algorithms Algorithms configuration data as a parsed ValueNode * - * This function iterates over the list of \a algorithms parsed from the YAML - * configuration file, and instantiates and initializes the corresponding - * algorithms. The configuration data is expected to be correct, any error - * causes the function to fail and return immediately. + * This function iterates over the list of \a algorithms parsed from the tuning + * data, and instantiates and initializes the corresponding algorithms. The + * configuration data is expected to be correct, any error causes the function + * to fail and return immediately. * * Algorithms can optionally be disabled via the tuning file of the camera * module as shown here, with AGC being used as an example: diff --git a/src/ipa/libipa/module.h b/src/ipa/libipa/module.h index 3e2408ca30b6..5644458bdf3d 100644 --- a/src/ipa/libipa/module.h +++ b/src/ipa/libipa/module.h @@ -50,7 +50,7 @@ public: for (const auto &[i, algo] : utils::enumerate(list)) { if (!algo.isDictionary()) { LOG(IPAModuleAlgo, Error) - << "Invalid YAML syntax for algorithm " << i; + << "Invalid tuning data syntax for algorithm " << i; algorithms_.clear(); return -EINVAL; } diff --git a/src/ipa/libipa/pwl.cpp b/src/ipa/libipa/pwl.cpp index 9fddd5bf70e2..652569d8577a 100644 --- a/src/ipa/libipa/pwl.cpp +++ b/src/ipa/libipa/pwl.cpp @@ -429,7 +429,7 @@ std::string Pwl::toString() const #ifndef __DOXYGEN__ /* - * The YAML data shall be a list of numerical values with an even number of + * The value node shall be a list of numerical values with an even number of * elements. They are parsed in pairs into x and y points in the piecewise * linear function, and added in order. x must be monotonically increasing. */ diff --git a/src/ipa/rkisp1/algorithms/dpcc.cpp b/src/ipa/rkisp1/algorithms/dpcc.cpp index eb8cbf2049c5..20b35d29cbcd 100644 --- a/src/ipa/rkisp1/algorithms/dpcc.cpp +++ b/src/ipa/rkisp1/algorithms/dpcc.cpp @@ -74,7 +74,7 @@ int DefectPixelClusterCorrection::init([[maybe_unused]] IPAContext &context, const ValueNode &set = setsObject[i]; uint16_t value; - /* Enable set if described in YAML tuning file. */ + /* Enable set if described in tuning data. */ config_.set_use |= 1 << i; /* PG Method */ diff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp index a7e3ef8b2eb9..faf88effde01 100644 --- a/src/ipa/rkisp1/algorithms/lsc.cpp +++ b/src/ipa/rkisp1/algorithms/lsc.cpp @@ -61,9 +61,9 @@ namespace ipa::rkisp1::algorithms { * Due to the optical characteristics of the lens, the light intensity received * by the sensor is not uniform. * - * The Lens Shading Correction algorithm applies multipliers to all pixels - * to compensate for the lens shading effect. The coefficients are - * specified in a downscaled table in the YAML tuning file. + * The Lens Shading Correction algorithm applies multipliers to all pixels to + * compensate for the lens shading effect. The coefficients are specified in a + * downscaled table in the tuning data. */ LOG_DEFINE_CATEGORY(RkISP1Lsc) diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp index 010c1d8c35d9..11e57a84d785 100644 --- a/src/libcamera/geometry.cpp +++ b/src/libcamera/geometry.cpp @@ -928,7 +928,7 @@ std::ostream &operator<<(std::ostream &out, const Rectangle &r) #ifndef __DOXYGEN__ /* - * The YAML data shall be a list of two numerical values containing the x and y + * The value node shall be a list of two numerical values containing the x and y * coordinates, in that order. */ template<> diff --git a/src/libcamera/matrix.cpp b/src/libcamera/matrix.cpp index e4fb8d35314d..0950408bb838 100644 --- a/src/libcamera/matrix.cpp +++ b/src/libcamera/matrix.cpp @@ -310,7 +310,7 @@ template bool matrixInvert(Span data, Span dataOut Span swapBuffer); /* - * The YAML data shall be a list of numerical values. Its size shall be equal + * The value node shall be a list of numerical values. Its size shall be equal * to the product of the number of rows and columns of the matrix (Rows x * Cols). The values shall be stored in row-major order. */ diff --git a/src/libcamera/vector.cpp b/src/libcamera/vector.cpp index d850a581e32b..47b3d1af36d9 100644 --- a/src/libcamera/vector.cpp +++ b/src/libcamera/vector.cpp @@ -358,7 +358,7 @@ bool vectorValidateValueNode(const ValueNode &obj, unsigned int size) if (obj.size() != size) { LOG(Vector, Error) - << "Wrong number of values in YAML vector: expected " + << "Wrong number of values in vector: expected " << size << ", got " << obj.size(); return false; }