Patch Detail
Show a patch.
GET /api/patches/20474/?format=api
{ "id": 20474, "url": "https://patchwork.libcamera.org/api/patches/20474/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20474/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20240628104828.2928109-16-stefan.klug@ideasonboard.com>", "date": "2024-06-28T10:47:08", "name": "[v2,15/25] libtuning: modules: Add initial CCM module", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e643f3dd52bdb5321ba7193beffaf7d97cf379cd", "submitter": { "id": 184, "url": "https://patchwork.libcamera.org/api/people/184/?format=api", "name": "Stefan Klug", "email": "stefan.klug@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20474/mbox/", "series": [ { "id": 4430, "url": "https://patchwork.libcamera.org/api/series/4430/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4430", "date": "2024-06-28T10:46:53", "name": "Add ccm calibration to libtuning", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4430/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20474/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20474/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 6D799BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 28 Jun 2024 10:49:24 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 23CD8632EA;\n\tFri, 28 Jun 2024 12:49:24 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3592E62E24\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 28 Jun 2024 12:49:22 +0200 (CEST)", "from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:82ab:924:d918:cd24])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AF27DBEB;\n\tFri, 28 Jun 2024 12:48:57 +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=\"obM6lyKu\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719571737;\n\tbh=ZCXXM2WFFgExh6ZrVKf2L1V1isfFkeXt0Sy7sR3qiDc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=obM6lyKuTxydw3dowuLFtsQtxOvXoLDCOOqw5zZUfsuIwuaQWqVdyk5/YrzMHk9Ug\n\tNSPcZpAzxp3AYLmMIhhVDRVfGTVY4B2Dfy2upyZG+Ag2NgwMzxXAfZzWgG1d9/VloF\n\t1SuobSF4K8Ru+uZCeQ9zORHYPhCdKlMdXfKNXIKw=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Paul Elder <paul.elder@ideasonboard.com>,\n\tStefan Klug <stefan.klug@ideasonboard.com>", "Subject": "[PATCH v2 15/25] libtuning: modules: Add initial CCM module", "Date": "Fri, 28 Jun 2024 12:47:08 +0200", "Message-ID": "<20240628104828.2928109-16-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240628104828.2928109-1-stefan.klug@ideasonboard.com>", "References": "<20240628104828.2928109-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": "<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": "From: Paul Elder <paul.elder@ideasonboard.com>\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 <paul.elder@ideasonboard.com>\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n .../tuning/libtuning/modules/ccm/__init__.py | 6 +++\n utils/tuning/libtuning/modules/ccm/ccm.py | 44 +++++++++++++++++++\n utils/tuning/libtuning/modules/ccm/rkisp1.py | 34 ++++++++++++++\n utils/tuning/rkisp1.py | 4 +-\n 4 files changed, 87 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 <paul.elder@ideasonboard.com>\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..50d435ad84a3\n--- /dev/null\n+++ b/utils/tuning/libtuning/modules/ccm/ccm.py\n@@ -0,0 +1,44 @@\n+# SPDX-License-Identifier: GPL-2.0-or-later\n+#\n+# Copyright (C) 2024, Paul Elder <paul.elder@ideasonboard.com>\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+import time\n+\n+import numpy as np\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 alsc 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 1\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..a74d0d93c764\n--- /dev/null\n+++ b/utils/tuning/libtuning/modules/ccm/rkisp1.py\n@@ -0,0 +1,34 @@\n+# SPDX-License-Identifier: GPL-2.0-or-later\n+#\n+# Copyright (C) 2024, Paul Elder <paul.elder@ideasonboard.com>\n+# Copyright (C) 2024, Ideas on Board\n+#\n+# Ccm module for tuning rkisp1\n+\n+from .ccm import CCM\n+\n+import libtuning as lt\n+import libtuning.utils as utils\n+\n+from numbers import Number\n+import numpy as np\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 actually 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+ ctms = self.do_calibration(images)\n+ output['ccms'] = ctms\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": [ "v2", "15/25" ] }