@@ -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}
@@ -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:
@@ -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;
}
@@ -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.
*/
@@ -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 */
@@ -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)
@@ -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<>
@@ -310,7 +310,7 @@ template bool matrixInvert<double>(Span<const double> data, Span<double> dataOut
Span<unsigned int> 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.
*/
@@ -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;
}
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 <laurent.pinchart@ideasonboard.com> --- 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(-)