{"id":22158,"url":"https://patchwork.libcamera.org/api/1.1/patches/22158/?format=json","web_url":"https://patchwork.libcamera.org/patch/22158/","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":"<20241204102119.335089-1-stefan.klug@ideasonboard.com>","date":"2024-12-04T10:21:17","name":"libipa: agc_mean_luminance: Rename yaml key from exposure-time to exposureTime","commit_ref":"9fc86dc02ac227a5af14e19f7f6253df377fd2e8","pull_url":null,"state":"accepted","archived":false,"hash":"cbf16931a080d41d70be9bf21b3438b6692aa498","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22158/mbox/","series":[{"id":4843,"url":"https://patchwork.libcamera.org/api/1.1/series/4843/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4843","date":"2024-12-04T10:21:17","name":"libipa: agc_mean_luminance: Rename yaml key from exposure-time to exposureTime","version":1,"mbox":"https://patchwork.libcamera.org/series/4843/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22158/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22158/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 CAAEBBDB13\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed,  4 Dec 2024 10:21:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9BC9D660A1;\n\tWed,  4 Dec 2024 11:21:25 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3370B618B5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed,  4 Dec 2024 11:21:24 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:9f48:37c3:24be:426d])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1ED726D6;\n\tWed,  4 Dec 2024 11:20:56 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"rVgYg5Xl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1733307656;\n\tbh=r2ZQLN+0kp5wsFIW4fbcqKfZeJd0BPRGTOGnR5A/jT8=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=rVgYg5XlRmQYDor1aigiFhqkkAkUXJOoduMj0F9dkvJoWTSpw5uzRlxFyRHBd1k2r\n\tdgHopsEiVF07pwiOmYTtgEM01lmiPulAszGPZfsZwfmXF0R+kekI+B0rmgoMaMIGQA\n\tZeoHj/5IEWZAVmvOas5tY9obDDXGo7M4mXa+Jh0E=","From":"Stefan Klug <stefan.klug@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug <stefan.klug@ideasonboard.com>","Subject":"[PATCH] libipa: agc_mean_luminance: Rename yaml key from\n\texposure-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","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"In d0478c41f432 (\"libcamera: Rename \"shutter speed\" to \"exposure time\"\")\nthe tuning file entry \"shutter\" was renamed to \"exposure-time\". As the\ntuning files use camel cased key names, change \"exposure-time\" to\n\"exposureTime\" for consitency. It doesn't break our users setups as\nthere are no tuning files using that entry in the wild (at least\nofficially).\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n src/ipa/libipa/agc_mean_luminance.cpp        | 8 ++++----\n utils/tuning/libtuning/modules/agc/rkisp1.py | 4 ++--\n 2 files changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/src/ipa/libipa/agc_mean_luminance.cpp b/src/ipa/libipa/agc_mean_luminance.cpp\nindex cd17570861e9..02555a44d271 100644\n--- a/src/ipa/libipa/agc_mean_luminance.cpp\n+++ b/src/ipa/libipa/agc_mean_luminance.cpp\n@@ -248,7 +248,7 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData)\n \t\t\t}\n \n \t\t\tstd::vector<uint32_t> exposureTimes =\n-\t\t\t\tmodeValues[\"exposure-time\"].getList<uint32_t>().value_or(std::vector<uint32_t>{});\n+\t\t\t\tmodeValues[\"exposureTime\"].getList<uint32_t>().value_or(std::vector<uint32_t>{});\n \t\t\tstd::vector<double> gains =\n \t\t\t\tmodeValues[\"gain\"].getList<double>().value_or(std::vector<double>{});\n \n@@ -338,7 +338,7 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData)\n  * For the AeExposureMode control the data should contain a dictionary called\n  * AeExposureMode containing per-mode setting dictionaries with the key being a\n  * value from \\ref controls::AeExposureModeNameValueMap. Each mode dict should\n- * contain an array of exposure times with the key \"exposure-time\" and an array\n+ * contain an array of exposure times with the key \"exposureTime\" and an array\n  * of gain values with the key \"gain\", in this format:\n  *\n  * \\code{.unparsed}\n@@ -346,10 +346,10 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData)\n  *   - Agc:\n  *       AeExposureMode:\n  *         ExposureNormal:\n- *           exposure-time: [ 100, 10000, 30000, 60000, 120000 ]\n+ *           exposureTime: [ 100, 10000, 30000, 60000, 120000 ]\n  *           gain: [ 2.0, 4.0, 6.0, 8.0, 10.0 ]\n  *         ExposureShort:\n- *           exposure-time: [ 100, 10000, 30000, 60000, 120000 ]\n+ *           exposureTime: [ 100, 10000, 30000, 60000, 120000 ]\n  *           gain: [ 2.0, 4.0, 6.0, 8.0, 10.0 ]\n  *\n  * \\endcode\ndiff --git a/utils/tuning/libtuning/modules/agc/rkisp1.py b/utils/tuning/libtuning/modules/agc/rkisp1.py\nindex 1a4dbe7b416a..2dad3a09cecb 100644\n--- a/utils/tuning/libtuning/modules/agc/rkisp1.py\n+++ b/utils/tuning/libtuning/modules/agc/rkisp1.py\n@@ -47,9 +47,9 @@ class AGCRkISP1(AGC):\n         }\n \n     def _generate_exposure_modes(self) -> dict:\n-        normal = {'exposure-time': [100, 10000, 30000, 60000, 120000],\n+        normal = {'exposureTime': [100, 10000, 30000, 60000, 120000],\n                   'gain': [2.0, 4.0, 6.0, 6.0, 6.0]}\n-        short = {'exposure-time': [100, 5000, 10000, 20000, 120000],\n+        short = {'exposureTime': [100, 5000, 10000, 20000, 120000],\n                  'gain': [2.0, 4.0, 6.0, 6.0, 6.0]}\n \n         return {'ExposureNormal': normal, 'ExposureShort': short}\n","prefixes":[]}