[4/6] libcamera: Drop 'yaml' prefix from ValueNode variables
diff mbox series

Message ID 20260611011722.1767689-5-laurent.pinchart@ideasonboard.com
State New
Headers show
Series
  • libcamera: Drop legacy mentions of YAML
Related show

Commit Message

Laurent Pinchart June 11, 2026, 1:17 a.m. UTC 
Many ValueNode variables use a 'yaml' prefix in their name. This is a
leftover from when the ValueNode class was named YamlObject, and is now
confusing.

Remove the prefix by either simply dropping it, renaming the variable
when its name would clash, or removing temporary variables altogether.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/android/camera_hal_config.cpp          |  6 +--
 src/ipa/libipa/agc_mean_luminance.cpp      | 12 ++---
 src/ipa/libipa/awb.cpp                     |  6 +--
 src/ipa/mali-c55/algorithms/lsc.cpp        | 15 +++----
 src/ipa/rkisp1/algorithms/agc.cpp          |  4 +-
 src/ipa/rkisp1/algorithms/lsc.cpp          | 51 ++++++++++------------
 src/ipa/rpi/controller/rpi/agc_channel.cpp |  4 +-
 7 files changed, 46 insertions(+), 52 deletions(-)

Patch
diff mbox series 

diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
index 4a9c0577a0be..3631cb7ad9f2 100644
--- a/src/android/camera_hal_config.cpp
+++ b/src/android/camera_hal_config.cpp
@@ -76,12 +76,12 @@  int CameraHalConfig::Private::parseConfigFile(File &file,
 	if (!root->contains("cameras"))
 		return -EINVAL;
 
-	const ValueNode &yamlObjectCameras = (*root)["cameras"];
+	const ValueNode &camerasNode = (*root)["cameras"];
 
-	if (!yamlObjectCameras.isDictionary())
+	if (!camerasNode.isDictionary())
 		return -EINVAL;
 
-	for (const auto &[cameraId, configData] : yamlObjectCameras.asDict()) {
+	for (const auto &[cameraId, configData] : camerasNode.asDict()) {
 		if (parseCameraConfigData(cameraId, configData))
 			return -EINVAL;
 	}
diff --git a/src/ipa/libipa/agc_mean_luminance.cpp b/src/ipa/libipa/agc_mean_luminance.cpp
index c226dd23552c..2d3bc709f3c1 100644
--- a/src/ipa/libipa/agc_mean_luminance.cpp
+++ b/src/ipa/libipa/agc_mean_luminance.cpp
@@ -218,9 +218,9 @@  int AgcMeanLuminance::parseConstraintModes(const ValueNode &tuningData)
 {
 	std::vector<ControlValue> availableConstraintModes;
 
-	const ValueNode &yamlConstraintModes = tuningData[controls::AeConstraintMode.name()];
-	if (yamlConstraintModes.isDictionary()) {
-		for (const auto &[modeName, modeDict] : yamlConstraintModes.asDict()) {
+	const ValueNode &constraintModes = tuningData[controls::AeConstraintMode.name()];
+	if (constraintModes.isDictionary()) {
+		for (const auto &[modeName, modeDict] : constraintModes.asDict()) {
 			if (AeConstraintModeNameValueMap.find(modeName) ==
 			    AeConstraintModeNameValueMap.end()) {
 				LOG(AgcMeanLuminance, Warning)
@@ -273,9 +273,9 @@  int AgcMeanLuminance::parseExposureModes(const ValueNode &tuningData)
 {
 	std::vector<ControlValue> availableExposureModes;
 
-	const ValueNode &yamlExposureModes = tuningData[controls::AeExposureMode.name()];
-	if (yamlExposureModes.isDictionary()) {
-		for (const auto &[modeName, modeValues] : yamlExposureModes.asDict()) {
+	const ValueNode &exposureModes = tuningData[controls::AeExposureMode.name()];
+	if (exposureModes.isDictionary()) {
+		for (const auto &[modeName, modeValues] : exposureModes.asDict()) {
 			if (AeExposureModeNameValueMap.find(modeName) ==
 			    AeExposureModeNameValueMap.end()) {
 				LOG(AgcMeanLuminance, Warning)
diff --git a/src/ipa/libipa/awb.cpp b/src/ipa/libipa/awb.cpp
index af966f1e007c..29a78069c52c 100644
--- a/src/ipa/libipa/awb.cpp
+++ b/src/ipa/libipa/awb.cpp
@@ -167,14 +167,14 @@  int AwbAlgorithm::parseModeConfigs(const ValueNode &tuningData,
 {
 	std::vector<ControlValue> availableModes;
 
-	const ValueNode &yamlModes = tuningData[controls::AwbMode.name()];
-	if (!yamlModes.isDictionary()) {
+	const ValueNode &modes = tuningData[controls::AwbMode.name()];
+	if (!modes.isDictionary()) {
 		LOG(Awb, Error)
 			<< "AwbModes must be a dictionary.";
 		return -EINVAL;
 	}
 
-	for (const auto &[modeName, modeDict] : yamlModes.asDict()) {
+	for (const auto &[modeName, modeDict] : modes.asDict()) {
 		if (controls::AwbModeNameValueMap.find(modeName) ==
 		    controls::AwbModeNameValueMap.end()) {
 			LOG(Awb, Warning)
diff --git a/src/ipa/mali-c55/algorithms/lsc.cpp b/src/ipa/mali-c55/algorithms/lsc.cpp
index 36e50163aecc..097239dcef3e 100644
--- a/src/ipa/mali-c55/algorithms/lsc.cpp
+++ b/src/ipa/mali-c55/algorithms/lsc.cpp
@@ -26,16 +26,15 @@  int Lsc::init([[maybe_unused]] IPAContext &context, const ValueNode &tuningData)
 
 	meshScale_ = tuningData["meshScale"].get<uint32_t>(0);
 
-	const ValueNode &yamlSets = tuningData["sets"];
-	if (!yamlSets.isList()) {
+	const ValueNode &sets = tuningData["sets"];
+	if (!sets.isList()) {
 		LOG(MaliC55Lsc, Error) << "LSC tables missing or invalid";
 		return -EINVAL;
 	}
 
 	size_t tableSize = 0;
-	const auto &sets = yamlSets.asList();
-	for (const auto &yamlSet : sets) {
-		uint32_t ct = yamlSet["ct"].get<uint32_t>(0);
+	for (const auto &set : sets.asList()) {
+		uint32_t ct = set["ct"].get<uint32_t>(0);
 
 		if (!ct) {
 			LOG(MaliC55Lsc, Error) << "Invalid colour temperature";
@@ -50,11 +49,11 @@  int Lsc::init([[maybe_unused]] IPAContext &context, const ValueNode &tuningData)
 		}
 
 		std::vector<uint8_t> rTable =
-			yamlSet["r"].get<std::vector<uint8_t>>().value_or(utils::defopt);
+			set["r"].get<std::vector<uint8_t>>().value_or(utils::defopt);
 		std::vector<uint8_t> gTable =
-			yamlSet["g"].get<std::vector<uint8_t>>().value_or(utils::defopt);
+			set["g"].get<std::vector<uint8_t>>().value_or(utils::defopt);
 		std::vector<uint8_t> bTable =
-			yamlSet["b"].get<std::vector<uint8_t>>().value_or(utils::defopt);
+			set["b"].get<std::vector<uint8_t>>().value_or(utils::defopt);
 
 		/*
 		 * Some validation to do; only 16x16 and 32x32 tables of
diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp
index 9bb9d943163f..aace46a8d094 100644
--- a/src/ipa/rkisp1/algorithms/agc.cpp
+++ b/src/ipa/rkisp1/algorithms/agc.cpp
@@ -142,8 +142,8 @@  int Agc::init(IPAContext &context, const ValueNode &tuningData)
 	if (ret)
 		return ret;
 
-	const ValueNode &yamlMeteringModes = tuningData["AeMeteringMode"];
-	ret = parseMeteringModes(context, yamlMeteringModes);
+	const ValueNode &meteringModes = tuningData["AeMeteringMode"];
+	ret = parseMeteringModes(context, meteringModes);
 	if (ret)
 		return ret;
 
diff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp
index 25f7c512b35c..a7e3ef8b2eb9 100644
--- a/src/ipa/rkisp1/algorithms/lsc.cpp
+++ b/src/ipa/rkisp1/algorithms/lsc.cpp
@@ -184,20 +184,19 @@  public:
 	{
 	}
 
-	int parseLscData(const ValueNode &yamlSets,
+	int parseLscData(const ValueNode &sets,
 			 LensShadingCorrection::ShadingDescriptorMap &lscData);
 
 private:
 	Size sensorSize_;
 };
 
-int LscPolynomialLoader::parseLscData(const ValueNode &yamlSets,
+int LscPolynomialLoader::parseLscData(const ValueNode &sets,
 				      LensShadingCorrection::ShadingDescriptorMap &lscData)
 {
-	const auto &sets = yamlSets.asList();
-	for (const auto &yamlSet : sets) {
+	for (const auto &set : sets.asList()) {
 		std::optional<LscPolynomial> pr, pgr, pgb, pb;
-		uint32_t ct = yamlSet["ct"].get<uint32_t>(0);
+		uint32_t ct = set["ct"].get<uint32_t>(0);
 
 		if (lscData.count(ct)) {
 			LOG(RkISP1Lsc, Error)
@@ -206,10 +205,10 @@  int LscPolynomialLoader::parseLscData(const ValueNode &yamlSets,
 			return -EINVAL;
 		}
 
-		pr = yamlSet["r"].get<LscPolynomial>();
-		pgr = yamlSet["gr"].get<LscPolynomial>();
-		pgb = yamlSet["gb"].get<LscPolynomial>();
-		pb = yamlSet["b"].get<LscPolynomial>();
+		pr = set["r"].get<LscPolynomial>();
+		pgr = set["gr"].get<LscPolynomial>();
+		pgb = set["gb"].get<LscPolynomial>();
+		pb = set["b"].get<LscPolynomial>();
 
 		if (!(pr || pgr || pgb || pb)) {
 			LOG(RkISP1Lsc, Error)
@@ -261,7 +260,7 @@  private:
 class LscTableLoader
 {
 public:
-	int parseLscData(const ValueNode &yamlSets,
+	int parseLscData(const ValueNode &sets,
 			 LensShadingCorrection::ShadingDescriptorMap &lscData);
 
 private:
@@ -269,13 +268,11 @@  private:
 					 const char *prop);
 };
 
-int LscTableLoader::parseLscData(const ValueNode &yamlSets,
+int LscTableLoader::parseLscData(const ValueNode &sets,
 				 LensShadingCorrection::ShadingDescriptorMap &lscData)
 {
-	const auto &sets = yamlSets.asList();
-
-	for (const auto &yamlSet : sets) {
-		uint32_t ct = yamlSet["ct"].get<uint32_t>(0);
+	for (const auto &set : sets.asList()) {
+		uint32_t ct = set["ct"].get<uint32_t>(0);
 
 		if (lscData.count(ct)) {
 			LOG(RkISP1Lsc, Error)
@@ -284,14 +281,14 @@  int LscTableLoader::parseLscData(const ValueNode &yamlSets,
 			return -EINVAL;
 		}
 
-		LensShadingCorrection::Components set;
-		set.r = parseTable(yamlSet, "r");
-		set.gr = parseTable(yamlSet, "gr");
-		set.gb = parseTable(yamlSet, "gb");
-		set.b = parseTable(yamlSet, "b");
+		LensShadingCorrection::Components components;
+		components.r = parseTable(set, "r");
+		components.gr = parseTable(set, "gr");
+		components.gb = parseTable(set, "gb");
+		components.b = parseTable(set, "b");
 
-		if (set.r.empty() || set.gr.empty() ||
-		    set.gb.empty() || set.b.empty()) {
+		if (components.r.empty() || components.gr.empty() ||
+		    components.gb.empty() || components.b.empty()) {
 			LOG(RkISP1Lsc, Error)
 				<< "Set for color temperature " << ct
 				<< " is missing tables";
@@ -299,7 +296,7 @@  int LscTableLoader::parseLscData(const ValueNode &yamlSets,
 		}
 
 		lscData.emplace(
-			ct, std::make_unique<LscTableShadingDescriptor>(std::move(set)));
+			ct, std::make_unique<LscTableShadingDescriptor>(std::move(components)));
 	}
 
 	if (lscData.empty()) {
@@ -384,8 +381,8 @@  int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,
 		return -EINVAL;
 
 	/* Get all defined sets to apply. */
-	const ValueNode &yamlSets = tuningData["sets"];
-	if (!yamlSets.isList()) {
+	const ValueNode &sets = tuningData["sets"];
+	if (!sets.isList()) {
 		LOG(RkISP1Lsc, Error)
 			<< "'sets' parameter not found in tuning file";
 		return -EINVAL;
@@ -398,7 +395,7 @@  int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,
 	if (type == "table") {
 		LOG(RkISP1Lsc, Debug) << "Loading tabular LSC data.";
 		auto loader = LscTableLoader();
-		ret = loader.parseLscData(yamlSets, lscData);
+		ret = loader.parseLscData(sets, lscData);
 	} else if (type == "polynomial") {
 		LOG(RkISP1Lsc, Debug) << "Loading polynomial LSC data.";
 		/*
@@ -406,7 +403,7 @@  int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,
 		 * Let's wait how the internal discussions progress.
 		 */
 		auto loader = LscPolynomialLoader(context.sensorInfo.activeAreaSize);
-		ret = loader.parseLscData(yamlSets, lscData);
+		ret = loader.parseLscData(sets, lscData);
 	} else {
 		LOG(RkISP1Lsc, Error) << "Unsupported LSC data type '"
 				      << type << "'";
diff --git a/src/ipa/rpi/controller/rpi/agc_channel.cpp b/src/ipa/rpi/controller/rpi/agc_channel.cpp
index c9462eed850e..1f7cd0842321 100644
--- a/src/ipa/rpi/controller/rpi/agc_channel.cpp
+++ b/src/ipa/rpi/controller/rpi/agc_channel.cpp
@@ -31,9 +31,7 @@  LOG_DECLARE_CATEGORY(RPiAgc)
 
 int AgcMeteringMode::read(const libcamera::ValueNode &params)
 {
-	const ValueNode &yamlWeights = params["weights"];
-
-	for (const auto &p : yamlWeights.asList()) {
+	for (const auto &p : params["weights"].asList()) {
 		auto value = p.get<double>();
 		if (!value)
 			return -EINVAL;