From patchwork Wed Dec 4 10:21:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 22158 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 CAAEBBDB13 for ; Wed, 4 Dec 2024 10:21:26 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9BC9D660A1; Wed, 4 Dec 2024 11:21:25 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="rVgYg5Xl"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3370B618B5 for ; Wed, 4 Dec 2024 11:21:24 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:9f48:37c3:24be:426d]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1ED726D6; Wed, 4 Dec 2024 11:20:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1733307656; bh=r2ZQLN+0kp5wsFIW4fbcqKfZeJd0BPRGTOGnR5A/jT8=; h=From:To:Cc:Subject:Date:From; b=rVgYg5XlRmQYDor1aigiFhqkkAkUXJOoduMj0F9dkvJoWTSpw5uzRlxFyRHBd1k2r dgHopsEiVF07pwiOmYTtgEM01lmiPulAszGPZfsZwfmXF0R+kekI+B0rmgoMaMIGQA ZeoHj/5IEWZAVmvOas5tY9obDDXGo7M4mXa+Jh0E= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH] libipa: agc_mean_luminance: Rename yaml key from exposure-time to exposureTime Date: Wed, 4 Dec 2024 11:21:17 +0100 Message-ID: <20241204102119.335089-1-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 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" In d0478c41f432 ("libcamera: Rename "shutter speed" to "exposure time"") the tuning file entry "shutter" was renamed to "exposure-time". As the tuning files use camel cased key names, change "exposure-time" to "exposureTime" for consitency. It doesn't break our users setups as there are no tuning files using that entry in the wild (at least officially). Signed-off-by: Stefan Klug Reviewed-by: Daniel Scally Reviewed-by: Kieran Bingham --- src/ipa/libipa/agc_mean_luminance.cpp | 8 ++++---- utils/tuning/libtuning/modules/agc/rkisp1.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ipa/libipa/agc_mean_luminance.cpp b/src/ipa/libipa/agc_mean_luminance.cpp index cd17570861e9..02555a44d271 100644 --- a/src/ipa/libipa/agc_mean_luminance.cpp +++ b/src/ipa/libipa/agc_mean_luminance.cpp @@ -248,7 +248,7 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData) } std::vector exposureTimes = - modeValues["exposure-time"].getList().value_or(std::vector{}); + modeValues["exposureTime"].getList().value_or(std::vector{}); std::vector gains = modeValues["gain"].getList().value_or(std::vector{}); @@ -338,7 +338,7 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData) * For the AeExposureMode control the data should contain a dictionary called * AeExposureMode containing per-mode setting dictionaries with the key being a * value from \ref controls::AeExposureModeNameValueMap. Each mode dict should - * contain an array of exposure times with the key "exposure-time" and an array + * contain an array of exposure times with the key "exposureTime" and an array * of gain values with the key "gain", in this format: * * \code{.unparsed} @@ -346,10 +346,10 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData) * - Agc: * AeExposureMode: * ExposureNormal: - * exposure-time: [ 100, 10000, 30000, 60000, 120000 ] + * exposureTime: [ 100, 10000, 30000, 60000, 120000 ] * gain: [ 2.0, 4.0, 6.0, 8.0, 10.0 ] * ExposureShort: - * exposure-time: [ 100, 10000, 30000, 60000, 120000 ] + * exposureTime: [ 100, 10000, 30000, 60000, 120000 ] * gain: [ 2.0, 4.0, 6.0, 8.0, 10.0 ] * * \endcode diff --git a/utils/tuning/libtuning/modules/agc/rkisp1.py b/utils/tuning/libtuning/modules/agc/rkisp1.py index 1a4dbe7b416a..2dad3a09cecb 100644 --- a/utils/tuning/libtuning/modules/agc/rkisp1.py +++ b/utils/tuning/libtuning/modules/agc/rkisp1.py @@ -47,9 +47,9 @@ class AGCRkISP1(AGC): } def _generate_exposure_modes(self) -> dict: - normal = {'exposure-time': [100, 10000, 30000, 60000, 120000], + normal = {'exposureTime': [100, 10000, 30000, 60000, 120000], 'gain': [2.0, 4.0, 6.0, 6.0, 6.0]} - short = {'exposure-time': [100, 5000, 10000, 20000, 120000], + short = {'exposureTime': [100, 5000, 10000, 20000, 120000], 'gain': [2.0, 4.0, 6.0, 6.0, 6.0]} return {'ExposureNormal': normal, 'ExposureShort': short}