{"id":23429,"url":"https://patchwork.libcamera.org/api/1.1/patches/23429/?format=json","web_url":"https://patchwork.libcamera.org/patch/23429/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250522142921.1378425-1-barnabas.pocze@ideasonboard.com>","date":"2025-05-22T14:29:21","name":"[v1] treewide: Do not use `*NameValueMap` for known values","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"f68f1136a6f15c23088be48b4b410769aa956bce","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/1.1/people/216/?format=json","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23429/mbox/","series":[{"id":5192,"url":"https://patchwork.libcamera.org/api/1.1/series/5192/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5192","date":"2025-05-22T14:29:21","name":"[v1] treewide: Do not use `*NameValueMap` for known values","version":1,"mbox":"https://patchwork.libcamera.org/series/5192/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23429/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23429/checks/","tags":{},"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 10BF2C31E9\n\tfor ;\n\tThu, 22 May 2025 14:29:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6A0B768D96;\n\tThu, 22 May 2025 16:29:27 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A47D668D8B\n\tfor ;\n\tThu, 22 May 2025 16:29:25 +0200 (CEST)","from pb-laptop.local (185.221.141.78.nat.pool.zt.hu\n\t[185.221.141.78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 487909E5\n\tfor ;\n\tThu, 22 May 2025 16:29:03 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"PPttrOPx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1747924143;\n\tbh=6E8HDznP4qRKQxUubZqKv3+y8WQn9ICAsXBW+xDx9ro=;\n\th=From:To:Subject:Date:From;\n\tb=PPttrOPxLHgbD6AUU3jo94awyEDkh2I2pHfrPnlcpKpfx4txPPLSU2tW6EdFhpzr6\n\t9tLOzHxaE1BsGInbazyoXY3MBdCYzlhlkGB6hB0mvoDAfLtXh3u1B0kLwuvuL+JMWp\n\thpPgKyKFdVBS94lXMfm+6WyaFbfCXhUKbQSIZLnM=","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v1] treewide: Do not use `*NameValueMap` for known values","Date":"Thu, 22 May 2025 16:29:21 +0200","Message-ID":"<20250522142921.1378425-1-barnabas.pocze@ideasonboard.com>","X-Mailer":"git-send-email 2.49.0","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","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\" "},"content":"When the value is known, do not look it up via the control's `NameValueMap`,\ninstead, just refer to the value directly.\n\nSigned-off-by: Barnabás Pőcze \n---\n src/ipa/libipa/agc_mean_luminance.cpp | 5 ++---\n src/ipa/rkisp1/algorithms/agc.cpp | 3 +--\n .../pipeline/virtual/config_parser.cpp | 20 +++++++++++--------\n 3 files changed, 15 insertions(+), 13 deletions(-)","diff":"diff --git a/src/ipa/libipa/agc_mean_luminance.cpp b/src/ipa/libipa/agc_mean_luminance.cpp\nindex f617fde81..d37a9b661 100644\n--- a/src/ipa/libipa/agc_mean_luminance.cpp\n+++ b/src/ipa/libipa/agc_mean_luminance.cpp\n@@ -218,8 +218,7 @@ int AgcMeanLuminance::parseConstraintModes(const YamlObject &tuningData)\n \t\tconstraintModes_[controls::ConstraintNormal].insert(\n \t\t\tconstraintModes_[controls::ConstraintNormal].begin(),\n \t\t\tconstraint);\n-\t\tavailableConstraintModes.push_back(\n-\t\t\tAeConstraintModeNameValueMap.at(\"ConstraintNormal\"));\n+\t\tavailableConstraintModes.push_back(controls::ConstraintNormal);\n \t}\n \n \tcontrols_[&controls::AeConstraintMode] = ControlInfo(availableConstraintModes);\n@@ -287,7 +286,7 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData)\n \t * possible before touching gain.\n \t */\n \tif (availableExposureModes.empty()) {\n-\t\tint32_t exposureModeId = AeExposureModeNameValueMap.at(\"ExposureNormal\");\n+\t\tint32_t exposureModeId = controls::ExposureNormal;\n \t\tstd::vector> stages = { };\n \n \t\tstd::shared_ptr helper =\ndiff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\nindex b3ac9400b..137a07500 100644\n--- a/src/ipa/rkisp1/algorithms/agc.cpp\n+++ b/src/ipa/rkisp1/algorithms/agc.cpp\n@@ -68,10 +68,9 @@ int Agc::parseMeteringModes(IPAContext &context, const YamlObject &tuningData)\n \tif (meteringModes_.empty()) {\n \t\tLOG(RkISP1Agc, Warning)\n \t\t\t<< \"No metering modes read from tuning file; defaulting to matrix\";\n-\t\tint32_t meteringModeId = controls::AeMeteringModeNameValueMap.at(\"MeteringMatrix\");\n \t\tstd::vector weights(context.hw->numHistogramWeights, 1);\n \n-\t\tmeteringModes_[meteringModeId] = weights;\n+\t\tmeteringModes_[controls::MeteringMatrix] = weights;\n \t}\n \n \tstd::vector meteringModes;\ndiff --git a/src/libcamera/pipeline/virtual/config_parser.cpp b/src/libcamera/pipeline/virtual/config_parser.cpp\nindex d9900add6..1d3d9ba87 100644\n--- a/src/libcamera/pipeline/virtual/config_parser.cpp\n+++ b/src/libcamera/pipeline/virtual/config_parser.cpp\n@@ -233,17 +233,21 @@ int ConfigParser::parseFrameGenerator(const YamlObject &cameraConfigData, Virtua\n \n int ConfigParser::parseLocation(const YamlObject &cameraConfigData, VirtualCameraData *data)\n {\n-\tstd::string location = cameraConfigData[\"location\"].get(\"CameraLocationFront\");\n-\n \t/* Default value is properties::CameraLocationFront */\n-\tauto it = properties::LocationNameValueMap.find(location);\n-\tif (it == properties::LocationNameValueMap.end()) {\n-\t\tLOG(Virtual, Error)\n-\t\t\t<< \"location: \" << location << \" is not supported\";\n-\t\treturn -EINVAL;\n+\tint32_t location = properties::CameraLocationFront;\n+\n+\tif (auto l = cameraConfigData[\"location\"].get()) {\n+\t\tauto it = properties::LocationNameValueMap.find(*l);\n+\t\tif (it == properties::LocationNameValueMap.end()) {\n+\t\t\tLOG(Virtual, Error)\n+\t\t\t\t<< \"location: \" << *l << \" is not supported\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tlocation = it->second;\n \t}\n \n-\tdata->properties_.set(properties::Location, it->second);\n+\tdata->properties_.set(properties::Location, location);\n \n \treturn 0;\n }\n","prefixes":["v1"]}