{"id":20605,"url":"https://patchwork.libcamera.org/api/patches/20605/?format=json","web_url":"https://patchwork.libcamera.org/patch/20605/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20240705144209.418906-17-stefan.klug@ideasonboard.com>","date":"2024-07-05T14:41:52","name":"[v4,16/23] libtuning: modules: Add initial CCM module","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"76d31b4c01f54d6cae0cc5932912bd37d9899f4a","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20605/mbox/","series":[{"id":4446,"url":"https://patchwork.libcamera.org/api/series/4446/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4446","date":"2024-07-05T14:41:36","name":"Add ccm calibration to libtuning","version":4,"mbox":"https://patchwork.libcamera.org/series/4446/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20605/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20605/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 E2878BEFBE\n\tfor ;\n\tFri, 5 Jul 2024 14:42:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 45DE963370;\n\tFri, 5 Jul 2024 16:42:56 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 85CBD6336B\n\tfor ;\n\tFri, 5 Jul 2024 16:42:54 +0200 (CEST)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:60b6:33a3:3a20:6030])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F3B644CC;\n\tFri, 5 Jul 2024 16:42:24 +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=\"nIq8B9QU\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1720190545;\n\tbh=GBZkLqhbZW/iyGhPYbDSNGTRx1tvnXKuoymrc6jp+mE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=nIq8B9QUcHFosr73azOtE/0iIFk/67tuNYOUiSlNLRLEpA9JsJoRviy7Bx3nqGwd2\n\tgRrPJls6L4R7q40smmakRF96V5MoOKzXIISuJYEuvY0IRABKXbb+Gq+G5mWhAld8zf\n\t1PWCOCqDn7SY5kR7j9/oLXRqVzb8cG+9HdsaRVds=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder ,\n\tStefan Klug ,\n\tLaurent Pinchart ","Subject":"[PATCH v4 16/23] libtuning: modules: Add initial CCM module","Date":"Fri, 5 Jul 2024 16:41:52 +0200","Message-ID":"<20240705144209.418906-17-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20240705144209.418906-1-stefan.klug@ideasonboard.com>","References":"<20240705144209.418906-1-stefan.klug@ideasonboard.com>","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":"","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":"From: Paul Elder \n\nImplement a minimal ccm calibration module. For now it doesn't take the\nresults from lsc into account and supports rkisp1 only.\n\nSigned-off-by: Paul Elder \nSigned-off-by: Stefan Klug \nReviewed-by: Laurent Pinchart \n---\n .../tuning/libtuning/modules/ccm/__init__.py | 6 +++\n utils/tuning/libtuning/modules/ccm/ccm.py | 41 +++++++++++++++++++\n utils/tuning/libtuning/modules/ccm/rkisp1.py | 28 +++++++++++++\n utils/tuning/rkisp1.py | 4 +-\n 4 files changed, 78 insertions(+), 1 deletion(-)\n create mode 100644 utils/tuning/libtuning/modules/ccm/__init__.py\n create mode 100644 utils/tuning/libtuning/modules/ccm/ccm.py\n create mode 100644 utils/tuning/libtuning/modules/ccm/rkisp1.py","diff":"diff --git a/utils/tuning/libtuning/modules/ccm/__init__.py b/utils/tuning/libtuning/modules/ccm/__init__.py\nnew file mode 100644\nindex 000000000000..322602afe63b\n--- /dev/null\n+++ b/utils/tuning/libtuning/modules/ccm/__init__.py\n@@ -0,0 +1,6 @@\n+# SPDX-License-Identifier: GPL-2.0-or-later\n+#\n+# Copyright (C) 2024, Paul Elder \n+\n+from libtuning.modules.ccm.ccm import CCM\n+from libtuning.modules.ccm.rkisp1 import CCMRkISP1\ndiff --git a/utils/tuning/libtuning/modules/ccm/ccm.py b/utils/tuning/libtuning/modules/ccm/ccm.py\nnew file mode 100644\nindex 000000000000..18702f8db887\n--- /dev/null\n+++ b/utils/tuning/libtuning/modules/ccm/ccm.py\n@@ -0,0 +1,41 @@\n+# SPDX-License-Identifier: GPL-2.0-or-later\n+#\n+# Copyright (C) 2024, Paul Elder \n+# Copyright (C) 2024, Ideas on Board\n+#\n+# Base Ccm tuning module\n+\n+from ..module import Module\n+\n+from libtuning.ctt_ccm import ccm\n+import logging\n+\n+logger = logging.getLogger(__name__)\n+\n+\n+class CCM(Module):\n+ type = 'ccm'\n+ hr_name = 'CCM (Base)'\n+ out_name = 'GenericCCM'\n+\n+ def __init__(self, debug: list):\n+ super().__init__()\n+\n+ self.debug = debug\n+\n+ def do_calibration(self, images):\n+ logger.info('Starting CCM calibration')\n+\n+ imgs = [img for img in images if img.macbeth is not None]\n+\n+ # todo: Take LSC calibration results into account.\n+ cal_cr_list = None\n+ cal_cb_list = None\n+\n+ try:\n+ ccms = ccm(imgs, cal_cr_list, cal_cb_list)\n+ except ArithmeticError:\n+ logger.error('CCM calibration failed')\n+ return None\n+\n+ return ccms\ndiff --git a/utils/tuning/libtuning/modules/ccm/rkisp1.py b/utils/tuning/libtuning/modules/ccm/rkisp1.py\nnew file mode 100644\nindex 000000000000..be0252d9c1c4\n--- /dev/null\n+++ b/utils/tuning/libtuning/modules/ccm/rkisp1.py\n@@ -0,0 +1,28 @@\n+# SPDX-License-Identifier: GPL-2.0-or-later\n+#\n+# Copyright (C) 2024, Paul Elder \n+# Copyright (C) 2024, Ideas on Board\n+#\n+# Ccm module for tuning rkisp1\n+\n+from .ccm import CCM\n+\n+\n+class CCMRkISP1(CCM):\n+ hr_name = 'Crosstalk Correction (RkISP1)'\n+ out_name = 'Ccm'\n+\n+ def __init__(self, **kwargs):\n+ super().__init__(**kwargs)\n+\n+ # We don't need anything from the config file.\n+ def validate_config(self, config: dict) -> bool:\n+ return True\n+\n+ def process(self, config: dict, images: list, outputs: dict) -> dict:\n+ output = {}\n+\n+ ccms = self.do_calibration(images)\n+ output['ccms'] = ccms\n+\n+ return output\ndiff --git a/utils/tuning/rkisp1.py b/utils/tuning/rkisp1.py\nindex 2606e07a93f7..fae35783c656 100755\n--- a/utils/tuning/rkisp1.py\n+++ b/utils/tuning/rkisp1.py\n@@ -14,6 +14,7 @@ from libtuning.parsers import YamlParser\n from libtuning.generators import YamlOutput\n from libtuning.modules.lsc import LSCRkISP1\n from libtuning.modules.agc import AGCRkISP1\n+from libtuning.modules.ccm import CCMRkISP1\n \n \n coloredlogs.install(level=logging.INFO, fmt='%(name)s %(levelname)s %(message)s')\n@@ -39,9 +40,10 @@ tuner.add(LSCRkISP1(\n smoothing_function=lt.smoothing.MedianBlur(3),\n ))\n tuner.add(AGCRkISP1(debug=[lt.Debug.Plot]))\n+tuner.add(CCMRkISP1(debug=[lt.Debug.Plot]))\n tuner.set_input_parser(YamlParser())\n tuner.set_output_formatter(YamlOutput())\n-tuner.set_output_order([AGCRkISP1, LSCRkISP1])\n+tuner.set_output_order([AGCRkISP1, CCMRkISP1, LSCRkISP1])\n \n if __name__ == '__main__':\n sys.exit(tuner.run(sys.argv))\n","prefixes":["v4","16/23"]}