{"id":21177,"url":"https://patchwork.libcamera.org/api/1.1/patches/21177/?format=json","web_url":"https://patchwork.libcamera.org/patch/21177/","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":"<20240906120927.4071508-4-mzamazal@redhat.com>","date":"2024-09-06T12:09:12","name":"[v6,03/18] libcamera: software_isp: Define skeletons for IPA refactoring","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4a00881c4c5860805a3c74d9dc57ffa7d58a83d4","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21177/mbox/","series":[{"id":4566,"url":"https://patchwork.libcamera.org/api/1.1/series/4566/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4566","date":"2024-09-06T12:09:09","name":"Software ISP refactoring","version":6,"mbox":"https://patchwork.libcamera.org/series/4566/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21177/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21177/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 4778EC324C\n\tfor ;\n\tFri, 6 Sep 2024 12:10:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 75EF0634F0;\n\tFri, 6 Sep 2024 14:10:11 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5AA7E634E5\n\tfor ;\n\tFri, 6 Sep 2024 14:10:00 +0200 (CEST)","from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-318-9rUPKU3iPziZkyuJGS2ilw-1;\n\tFri, 06 Sep 2024 08:09:55 -0400","from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.15])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id A4E6A1955D44; Fri, 6 Sep 2024 12:09:54 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.224.65])\n\tby mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 752D61956086; Fri, 6 Sep 2024 12:09:52 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"QrCgDx9I\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1725624599;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=lw9fjH10smSWz/R80egNMsgp85tvE4lK6vb+/TYL4TA=;\n\tb=QrCgDx9IrCQBAKKq0pcfy90/PiEsQSarEnFg/Y9ON0GejhD6wyqSgFgO0C7ZaVjWK6f68v\n\tJnQwTfPXAgpAzzbiJYFoU1Xt/JbQdG2iHKhLMhIrunYNSktK9mP+7vsHib8ssZBP8HGQya\n\tw6vYAeUbzEJLYwGUg7BDhHU+Xbdk73w=","X-MC-Unique":"9rUPKU3iPziZkyuJGS2ilw-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tUmang Jain ,\n\tLaurent Pinchart ,\n\tDaniel Scally ","Subject":"[PATCH v6 03/18] libcamera: software_isp: Define skeletons for IPA\n\trefactoring","Date":"Fri, 6 Sep 2024 14:09:12 +0200","Message-ID":"<20240906120927.4071508-4-mzamazal@redhat.com>","In-Reply-To":"<20240906120927.4071508-1-mzamazal@redhat.com>","References":"<20240906120927.4071508-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.15","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"; x-default=true","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":"Software ISP image processing algorithms are currently defined in a\nsimplified way, different from other libcamera pipelines. This is not\ngood for several reasons:\n\n- It makes the software ISP code harder to understand due to its\n different structuring.\n- Adding more algorithms may make the code harder to understand\n generally.\n- Mass libcamera code changes may not be easily applicable to software\n ISP.\n- Algorithm sharing with other pipelines is not easily possible.\n\nThis patch introduces basic software ISP IPA skeletons structured\nsimilarly to the other pipelines. The newly added files are currently\nnot used or compiled and the general skeleton structures don't contain\nanything particular. It is just a preparation step for a larger\nrefactoring and the code will be actually used and extended as needed in\nfollowup patches.\n\nSigned-off-by: Milan Zamazal \nReviewed-by: Umang Jain \nReviewed-by: Daniel Scally \nReviewed-by: Laurent Pinchart \n---\n include/libcamera/ipa/soft.mojom | 4 ++\n src/ipa/simple/algorithms/algorithm.h | 22 +++++++++++\n src/ipa/simple/ipa_context.cpp | 53 +++++++++++++++++++++++++++\n src/ipa/simple/ipa_context.h | 33 +++++++++++++++++\n src/ipa/simple/meson.build | 1 +\n src/ipa/simple/module.h | 30 +++++++++++++++\n 6 files changed, 143 insertions(+)\n create mode 100644 src/ipa/simple/algorithms/algorithm.h\n create mode 100644 src/ipa/simple/ipa_context.cpp\n create mode 100644 src/ipa/simple/ipa_context.h\n create mode 100644 src/ipa/simple/module.h","diff":"diff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom\nindex 3aa2066e..0fd47bb0 100644\n--- a/include/libcamera/ipa/soft.mojom\n+++ b/include/libcamera/ipa/soft.mojom\n@@ -8,6 +8,10 @@ module ipa.soft;\n \n import \"include/libcamera/ipa/core.mojom\";\n \n+struct IPAConfigInfo {\n+\tlibcamera.ControlInfoMap sensorControls;\n+};\n+\n interface IPASoftInterface {\n \tinit(libcamera.IPASettings settings,\n \t libcamera.SharedFD fdStats,\ndiff --git a/src/ipa/simple/algorithms/algorithm.h b/src/ipa/simple/algorithms/algorithm.h\nnew file mode 100644\nindex 00000000..41f63170\n--- /dev/null\n+++ b/src/ipa/simple/algorithms/algorithm.h\n@@ -0,0 +1,22 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024 Red Hat, Inc.\n+ *\n+ * Software ISP control algorithm interface\n+ */\n+\n+#pragma once\n+\n+#include \n+\n+#include \"module.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::soft {\n+\n+using Algorithm = libcamera::ipa::Algorithm;\n+\n+} /* namespace ipa::soft */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/simple/ipa_context.cpp b/src/ipa/simple/ipa_context.cpp\nnew file mode 100644\nindex 00000000..3c1c7262\n--- /dev/null\n+++ b/src/ipa/simple/ipa_context.cpp\n@@ -0,0 +1,53 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Google Inc.\n+ * Copyright (C) 2024 Red Hat Inc.\n+ *\n+ * Software ISP IPA Context\n+ */\n+\n+#include \"ipa_context.h\"\n+\n+/**\n+ * \\file ipa_context.h\n+ * \\brief Context and state information shared between the algorithms\n+ */\n+\n+namespace libcamera::ipa::soft {\n+\n+/**\n+ * \\struct IPASessionConfiguration\n+ * \\brief Session configuration for the IPA module\n+ *\n+ * The session configuration contains all IPA configuration parameters that\n+ * remain constant during the capture session, from IPA module start to stop.\n+ * It is typically set during the configure() operation of the IPA module, but\n+ * may also be updated in the start() operation.\n+ */\n+\n+/**\n+ * \\struct IPAActiveState\n+ * \\brief The active state of the IPA algorithms\n+ *\n+ * The IPA is fed with the statistics generated from the latest frame processed.\n+ * The statistics are then processed by the IPA algorithms to compute parameters\n+ * required for the next frame capture and processing. The current state of the\n+ * algorithms is reflected through the IPAActiveState to store the values most\n+ * recently computed by the IPA algorithms.\n+ */\n+\n+/**\n+ * \\struct IPAContext\n+ * \\brief Global IPA context data shared between all algorithms\n+ *\n+ * \\var IPAContext::configuration\n+ * \\brief The IPA session configuration, immutable during the session\n+ *\n+ * \\var IPAContext::frameContexts\n+ * \\brief Ring buffer of the IPAFrameContext(s)\n+ *\n+ * \\var IPAContext::activeState\n+ * \\brief The current state of IPA algorithms\n+ */\n+\n+} /* namespace libcamera::ipa::soft */\ndiff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h\nnew file mode 100644\nindex 00000000..e7d8b8df\n--- /dev/null\n+++ b/src/ipa/simple/ipa_context.h\n@@ -0,0 +1,33 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024 Red Hat, Inc.\n+ *\n+ * Simple pipeline IPA Context\n+ */\n+\n+#pragma once\n+\n+#include \n+\n+namespace libcamera {\n+\n+namespace ipa::soft {\n+\n+struct IPASessionConfiguration {\n+};\n+\n+struct IPAActiveState {\n+};\n+\n+struct IPAFrameContext : public FrameContext {\n+};\n+\n+struct IPAContext {\n+\tIPASessionConfiguration configuration;\n+\tIPAActiveState activeState;\n+\tFCQueue frameContexts;\n+};\n+\n+} /* namespace ipa::soft */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/simple/meson.build b/src/ipa/simple/meson.build\nindex b297e1d2..7757f99b 100644\n--- a/src/ipa/simple/meson.build\n+++ b/src/ipa/simple/meson.build\n@@ -3,6 +3,7 @@\n ipa_name = 'ipa_soft_simple'\n \n soft_simple_sources = files([\n+ 'ipa_context.cpp',\n 'soft_simple.cpp',\n 'black_level.cpp',\n ])\ndiff --git a/src/ipa/simple/module.h b/src/ipa/simple/module.h\nnew file mode 100644\nindex 00000000..8d4d53fb\n--- /dev/null\n+++ b/src/ipa/simple/module.h\n@@ -0,0 +1,30 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024 Red Hat, Inc.\n+ *\n+ * Software ISP IPA Module\n+ */\n+\n+#pragma once\n+\n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/software_isp/debayer_params.h\"\n+#include \"libcamera/internal/software_isp/swisp_stats.h\"\n+\n+#include \n+\n+#include \"ipa_context.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::soft {\n+\n+using Module = ipa::Module;\n+\n+} /* namespace ipa::soft */\n+\n+} /* namespace libcamera */\n","prefixes":["v6","03/18"]}