Patch Detail
Show a patch.
GET /api/patches/13252/?format=api
{ "id": 13252, "url": "https://patchwork.libcamera.org/api/patches/13252/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13252/", "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": "<20210809092007.79067-2-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-08-09T09:20:03", "name": "[libcamera-devel,RFC,1/5] ipa: ipu3: Introduce a Context structure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "05f5b4d8e5aee95774b4a1d052e3d060c0a72f91", "submitter": { "id": 75, "url": "https://patchwork.libcamera.org/api/people/75/?format=api", "name": "Jean-Michel Hautbois", "email": "jeanmichel.hautbois@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13252/mbox/", "series": [ { "id": 2320, "url": "https://patchwork.libcamera.org/api/series/2320/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2320", "date": "2021-08-09T09:20:02", "name": "IPU3: Introduce modularity for algorithms", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2320/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13252/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13252/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 8A0A8C3241\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 9 Aug 2021 09:20:19 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 36DF9687EB;\n\tMon, 9 Aug 2021 11:20:19 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1706968823\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 9 Aug 2021 11:20:16 +0200 (CEST)", "from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:14c5:c0eb:b1fb:db22])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A670049A;\n\tMon, 9 Aug 2021 11:20:15 +0200 (CEST)" ], "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=\"J9FGTk16\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628500815;\n\tbh=hOGLI3q4SOSC3OcV2W2qxHLsax8Do1MNf+KmmiGjdMU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=J9FGTk169QW78xNWaj7lHnDctkjIYaTPhg55vo9iUI+X8cAtglVFPeA85khvcz199\n\tHV0+TsuQDA1DkssmbA+DSFsYD2RQ2JXTBeUWbz77CZWEUD9cw+CkVOSXYCnozw4zhW\n\t4FvTpkHXBw4JATP3yUNAHhanhxWQjSHtXSw+6fuY=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 9 Aug 2021 11:20:03 +0200", "Message-Id": "<20210809092007.79067-2-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210809092007.79067-1-jeanmichel.hautbois@ideasonboard.com>", "References": "<20210809092007.79067-1-jeanmichel.hautbois@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC PATCH 1/5] ipa: ipu3: Introduce a Context\n\tstructure", "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": "Passing parameters, statistics and all specific data each algorithm shares.\nAs the ipu3_uapi_params are part of the IPA context referenced by the\nalgorithms, move the structure into the IPAContext directly and adapt existing\nalgorithm implementations.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n---\n src/ipa/ipu3/ipa_context.h | 30 ++++++++++++++++++++++++++++++\n src/ipa/ipu3/ipu3.cpp | 16 +++++++++-------\n 2 files changed, 39 insertions(+), 7 deletions(-)\n create mode 100644 src/ipa/ipu3/ipa_context.h", "diff": "diff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h\nnew file mode 100644\nindex 00000000..5d717be5\n--- /dev/null\n+++ b/src/ipa/ipu3/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+ * ipu3_ipa_context.h - IPU3 IPA Context\n+ *\n+ * Context information shared between the algorithms\n+ */\n+#ifndef __LIBCAMERA_IPU3_IPA_CONTEXT_H__\n+#define __LIBCAMERA_IPU3_IPA_CONTEXT_H__\n+\n+#include <linux/intel-ipu3.h>\n+\n+namespace libcamera {\n+\n+namespace ipa::ipu3 {\n+\n+struct IPAContext {\n+\t/* Input statistics from the previous frame */\n+\tconst ipu3_uapi_stats_3a *stats;\n+\n+\t/* Output Parameters which will be written to the hardware */\n+\tipu3_uapi_params params;\n+};\n+\n+} /* namespace ipa::ipu3 */\n+\n+} /* namespace libcamera*/\n+\n+#endif /* __LIBCAMERA_IPU3_IPA_CONTEXT_H__ */\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 71698d36..a714af85 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -22,6 +22,8 @@\n \n #include \"libcamera/internal/framebuffer.h\"\n \n+#include \"ipa_context.h\"\n+\n #include \"ipu3_agc.h\"\n #include \"ipu3_awb.h\"\n #include \"libipa/camera_sensor_helper.h\"\n@@ -81,9 +83,8 @@ private:\n \tstd::unique_ptr<CameraSensorHelper> camHelper_;\n \n \t/* Local parameter storage */\n-\tstruct ipu3_uapi_params params_;\n-\n \tstruct ipu3_uapi_grid_config bdsGrid_;\n+\tstruct IPAContext context_;\n };\n \n int IPAIPU3::init(const IPASettings &settings)\n@@ -94,6 +95,9 @@ int IPAIPU3::init(const IPASettings &settings)\n \t\treturn -ENODEV;\n \t}\n \n+\t/* Reset all the hardware settings */\n+\tcontext_.params = {};\n+\n \treturn 0;\n }\n \n@@ -193,12 +197,10 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo)\n \n \tdefVBlank_ = itVBlank->second.def().get<int32_t>();\n \n-\tparams_ = {};\n-\n \tcalculateBdsGrid(configInfo.bdsOutputSize);\n \n \tawbAlgo_ = std::make_unique<IPU3Awb>();\n-\tawbAlgo_->initialise(params_, configInfo.bdsOutputSize, bdsGrid_);\n+\tawbAlgo_->initialise(context_.params, configInfo.bdsOutputSize, bdsGrid_);\n \n \tagcAlgo_ = std::make_unique<IPU3Agc>();\n \tagcAlgo_->initialise(bdsGrid_, sensorInfo_);\n@@ -276,9 +278,9 @@ void IPAIPU3::processControls([[maybe_unused]] unsigned int frame,\n void IPAIPU3::fillParams(unsigned int frame, ipu3_uapi_params *params)\n {\n \tif (agcAlgo_->updateControls())\n-\t\tawbAlgo_->updateWbParameters(params_, agcAlgo_->gamma());\n+\t\tawbAlgo_->updateWbParameters(context_.params, agcAlgo_->gamma());\n \n-\t*params = params_;\n+\t*params = context_.params;\n \n \tIPU3Action op;\n \top.op = ActionParamFilled;\n", "prefixes": [ "libcamera-devel", "RFC", "1/5" ] }