[{"id":21118,"web_url":"https://patchwork.libcamera.org/comment/21118/","msgid":"","date":"2021-11-23T10:57:24","subject":"Re: [libcamera-devel] [PATCH v2 05/11] ipa: rkisp1: Introduce\n\tIPAContext","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jean-Michel,\n\nThank you for the patch.\n\nOn Tue, Nov 23, 2021 at 10:14:45AM +0100, Jean-Michel Hautbois wrote:\n> Before using any algorithm, we want the IPAContext to be ready for\n> those. Introduce the IPAContext following the existing design from\n> IPA::IPU3. Each algorithm will then introduce the needed fields.\n> \n> Signed-off-by: Jean-Michel Hautbois \n> Reviewed-by: Kieran Bingham \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\n> \n> diff --git a/src/ipa/rkisp1/ipa_context.cpp b/src/ipa/rkisp1/ipa_context.cpp\n> new file mode 100644\n> index 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\nIt would be nice to avoid duplicating documentation, but we can start\nwith this.\n\nReviewed-by: Laurent Pinchart \n\n> +\n> +} /* namespace libcamera::ipa::rkisp1 */\n> diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\n> new file mode 100644\n> index 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__ */\n> diff --git a/src/ipa/rkisp1/meson.build b/src/ipa/rkisp1/meson.build\n> index 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,\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 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>","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 EF323BDB13\n\tfor ;\n\tTue, 23 Nov 2021 10:57:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 42988603F9;\n\tTue, 23 Nov 2021 11:57:48 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CC92560376\n\tfor ;\n\tTue, 23 Nov 2021 11:57:46 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 46B66A1B;\n\tTue, 23 Nov 2021 11:57:46 +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=\"RHMWsomR\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637665066;\n\tbh=/1lv9rhIgWL8ik5pv6VxcxW+w+epN+zNBXb18+DK9aM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=RHMWsomRKNOJE5TvppdZNc+jsz68K24hJfGmrYVOQ7y6Gx0fNMYlIgC9bRzPrkH+Y\n\t62Bs7F+Pbr6FkuOx/Vw31dOtKhcELbVHOls8CkeYrpm0dsQBY/7GhtgP/LZS+eqsR0\n\tT+xyLntFNv61Qi7aWGYim2mXUV0C/pfbE7Q+nqaM=","Date":"Tue, 23 Nov 2021 12:57:24 +0200","From":"Laurent Pinchart ","To":"Jean-Michel Hautbois ","Message-ID":"","References":"<20211123091451.67404-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20211123091451.67404-6-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211123091451.67404-6-jeanmichel.hautbois@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 05/11] ipa: rkisp1: Introduce\n\tIPAContext","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]