{"id":14718,"url":"https://patchwork.libcamera.org/api/1.1/patches/14718/?format=json","web_url":"https://patchwork.libcamera.org/patch/14718/","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":"<20211123150423.125524-6-jeanmichel.hautbois@ideasonboard.com>","date":"2021-11-23T15:04:17","name":"[libcamera-devel,v3,05/11] ipa: rkisp1: Introduce IPAContext","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c9fc9c881d4211d28a3f61d28b1b403ba043ec06","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/1.1/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14718/mbox/","series":[{"id":2746,"url":"https://patchwork.libcamera.org/api/1.1/series/2746/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2746","date":"2021-11-23T15:04:12","name":"Introduce AGC for RkISP1","version":3,"mbox":"https://patchwork.libcamera.org/series/2746/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14718/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14718/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 1B2F3BF415\n\tfor ;\n\tTue, 23 Nov 2021 15:04:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CF58D60442;\n\tTue, 23 Nov 2021 16:04:39 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ABF126036F\n\tfor ;\n\tTue, 23 Nov 2021 16:04:28 +0100 (CET)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:3c3b:9149:b:8aa9])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5DAC7993;\n\tTue, 23 Nov 2021 16:04:28 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"t8xCL0eg\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637679868;\n\tbh=5Nsxxw4E2N506pwBm9ygWYo5ljyITRor5SiSazR4TfQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=t8xCL0egxh+gfDfGqbm3qHO5SCMBqXMJ5zqMWwiZqoLEqc1ybmR3KAw+0Wc7qPQXP\n\tP7Zc55c5iumHESprDiimx/QLM+SvDp2Val0ZZaazP81nlsy1q0F2xiBresxEe1oc1R\n\t/vReW/HVKNZxkVgna4U/FGOD/tkEQWfbPdwCSz7o=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 23 Nov 2021 16:04:17 +0100","Message-Id":"<20211123150423.125524-6-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20211123150423.125524-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20211123150423.125524-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 05/11] ipa: rkisp1: Introduce IPAContext","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":"Before using any algorithm, we want the IPAContext to be ready for\nthose. Introduce the IPAContext following the existing design from\nIPA::IPU3. Each algorithm will then introduce the needed fields.\n\nSigned-off-by: Jean-Michel Hautbois \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n src/ipa/rkisp1/ipa_context.cpp | 58 ++++++++++++++++++++++++++++++++++\n src/ipa/rkisp1/ipa_context.h | 30 ++++++++++++++++++\n src/ipa/rkisp1/meson.build | 7 +++-\n src/ipa/rkisp1/rkisp1.cpp | 7 ++++\n 4 files changed, 101 insertions(+), 1 deletion(-)\n create mode 100644 src/ipa/rkisp1/ipa_context.cpp\n create mode 100644 src/ipa/rkisp1/ipa_context.h","diff":"diff --git a/src/ipa/rkisp1/ipa_context.cpp b/src/ipa/rkisp1/ipa_context.cpp\nnew file mode 100644\nindex 00000000..819b2c73\n--- /dev/null\n+++ b/src/ipa/rkisp1/ipa_context.cpp\n@@ -0,0 +1,58 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Ideas On Board\n+ *\n+ * ipa_context.cpp - RkISP1 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::rkisp1 {\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 IPAFrameContext\n+ * \\brief Per-frame context for algorithms\n+ *\n+ * The frame context stores data specific to a single frame processed by the\n+ * IPA. Each frame processed by the IPA has a context associated with it,\n+ * accessible through the IPAContext structure.\n+ *\n+ * \\todo Detail how to access contexts for a particular frame\n+ *\n+ * Each of the fields in the frame context belongs to either a specific\n+ * algorithm, or to the top-level IPA module. A field may be read by any\n+ * algorithm, but should only be written by its owner.\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::frameContext\n+ * \\brief The frame context for the frame being processed\n+ *\n+ * \\todo While the frame context is supposed to be per-frame, this\n+ * single frame context stores data related to both the current frame\n+ * and the previous frames, with fields being updated as the algorithms\n+ * are run. This needs to be turned into real per-frame data storage.\n+ */\n+\n+} /* namespace libcamera::ipa::rkisp1 */\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nnew file mode 100644\nindex 00000000..ff40efe3\n--- /dev/null\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -0,0 +1,30 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Ideas On Board\n+ *\n+ * ipa_context.h - RkISP1 IPA Context\n+ *\n+ */\n+#ifndef __LIBCAMERA_RKISP1_IPA_CONTEXT_H__\n+#define __LIBCAMERA_RKISP1_IPA_CONTEXT_H__\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp1 {\n+\n+struct IPASessionConfiguration {\n+};\n+\n+struct IPAFrameContext {\n+};\n+\n+struct IPAContext {\n+\tIPASessionConfiguration configuration;\n+\tIPAFrameContext frameContext;\n+};\n+\n+} /* namespace ipa::rkisp1 */\n+\n+} /* namespace libcamera*/\n+\n+#endif /* __LIBCAMERA_RKISP1_IPA_CONTEXT_H__ */\ndiff --git a/src/ipa/rkisp1/meson.build b/src/ipa/rkisp1/meson.build\nindex f76b37f5..3683c922 100644\n--- a/src/ipa/rkisp1/meson.build\n+++ b/src/ipa/rkisp1/meson.build\n@@ -2,8 +2,13 @@\n \n ipa_name = 'ipa_rkisp1'\n \n+rkisp1_ipa_sources = files([\n+ 'ipa_context.cpp',\n+ 'rkisp1.cpp',\n+])\n+\n mod = shared_module(ipa_name,\n- ['rkisp1.cpp', libcamera_generated_ipa_headers],\n+ [rkisp1_ipa_sources, libcamera_generated_ipa_headers],\n name_prefix : '',\n include_directories : [ipa_includes, libipa_includes],\n dependencies : libcamera_private,\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 73a7f582..34c3f9a2 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -25,6 +25,7 @@\n \n #include \n \n+#include \"ipa_context.h\"\n #include \"libipa/camera_sensor_helper.h\"\n \n namespace libcamera {\n@@ -78,6 +79,9 @@ private:\n \n \t/* Interface to the Camera Helper */\n \tstd::unique_ptr camHelper_;\n+\n+\t/* Local parameter storage */\n+\tstruct IPAContext context_;\n };\n \n int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision)\n@@ -164,6 +168,9 @@ int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,\n \t\t<< \"Exposure: \" << minExposure_ << \"-\" << maxExposure_\n \t\t<< \" Gain: \" << minGain_ << \"-\" << maxGain_;\n \n+\t/* Clean context at configuration */\n+\tcontext_ = {};\n+\n \treturn 0;\n }\n \n","prefixes":["libcamera-devel","v3","05/11"]}