From eecb270085e6a96ba0c7786410877c732d3381e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Wed, 21 May 2025 12:25:32 +0200 Subject: [PATCH] treewide: Do not use `*NameValueMap` for known values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the value is known, do not look it up via the control's `NameValueMap`, instead, just refer to the value directly. Signed-off-by: Barnabás Pőcze Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart --- src/ipa/libipa/agc_mean_luminance.cpp | 5 ++--- src/ipa/rkisp1/algorithms/agc.cpp | 3 +-- .../pipeline/virtual/config_parser.cpp | 20 +++++++++++-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/ipa/libipa/agc_mean_luminance.cpp b/src/ipa/libipa/agc_mean_luminance.cpp index f617fde8..d37a9b66 100644 --- a/src/ipa/libipa/agc_mean_luminance.cpp +++ b/src/ipa/libipa/agc_mean_luminance.cpp @@ -218,8 +218,7 @@ int AgcMeanLuminance::parseConstraintModes(const YamlObject &tuningData) constraintModes_[controls::ConstraintNormal].insert( constraintModes_[controls::ConstraintNormal].begin(), constraint); - availableConstraintModes.push_back( - AeConstraintModeNameValueMap.at("ConstraintNormal")); + availableConstraintModes.push_back(controls::ConstraintNormal); } controls_[&controls::AeConstraintMode] = ControlInfo(availableConstraintModes); @@ -287,7 +286,7 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData) * possible before touching gain. */ if (availableExposureModes.empty()) { - int32_t exposureModeId = AeExposureModeNameValueMap.at("ExposureNormal"); + int32_t exposureModeId = controls::ExposureNormal; std::vector> stages = { }; std::shared_ptr helper = diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp index b3ac9400..137a0750 100644 --- a/src/ipa/rkisp1/algorithms/agc.cpp +++ b/src/ipa/rkisp1/algorithms/agc.cpp @@ -68,10 +68,9 @@ int Agc::parseMeteringModes(IPAContext &context, const YamlObject &tuningData) if (meteringModes_.empty()) { LOG(RkISP1Agc, Warning) << "No metering modes read from tuning file; defaulting to matrix"; - int32_t meteringModeId = controls::AeMeteringModeNameValueMap.at("MeteringMatrix"); std::vector weights(context.hw->numHistogramWeights, 1); - meteringModes_[meteringModeId] = weights; + meteringModes_[controls::MeteringMatrix] = weights; } std::vector meteringModes; diff --git a/src/libcamera/pipeline/virtual/config_parser.cpp b/src/libcamera/pipeline/virtual/config_parser.cpp index d9900add..1d3d9ba8 100644 --- a/src/libcamera/pipeline/virtual/config_parser.cpp +++ b/src/libcamera/pipeline/virtual/config_parser.cpp @@ -233,17 +233,21 @@ int ConfigParser::parseFrameGenerator(const YamlObject &cameraConfigData, Virtua int ConfigParser::parseLocation(const YamlObject &cameraConfigData, VirtualCameraData *data) { - std::string location = cameraConfigData["location"].get("CameraLocationFront"); - /* Default value is properties::CameraLocationFront */ - auto it = properties::LocationNameValueMap.find(location); - if (it == properties::LocationNameValueMap.end()) { - LOG(Virtual, Error) - << "location: " << location << " is not supported"; - return -EINVAL; + int32_t location = properties::CameraLocationFront; + + if (auto l = cameraConfigData["location"].get()) { + auto it = properties::LocationNameValueMap.find(*l); + if (it == properties::LocationNameValueMap.end()) { + LOG(Virtual, Error) + << "location: " << *l << " is not supported"; + return -EINVAL; + } + + location = it->second; } - data->properties_.set(properties::Location, it->second); + data->properties_.set(properties::Location, location); return 0; }