{"id":17315,"url":"https://patchwork.libcamera.org/api/1.1/patches/17315/?format=json","web_url":"https://patchwork.libcamera.org/patch/17315/","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":"<20220908014200.28728-7-laurent.pinchart@ideasonboard.com>","date":"2022-09-08T01:41:34","name":"[libcamera-devel,v4,06/32] ipa: libipa: algorithm: prepare(): Pass frame and frame Context","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6708a04dd0a5fce5feacd387a84e8c78aa0d7e34","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17315/mbox/","series":[{"id":3476,"url":"https://patchwork.libcamera.org/api/1.1/series/3476/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3476","date":"2022-09-08T01:41:28","name":"ipa: Frame context queue, IPU3 & RkISP consolidation, and RkISP1 improvements","version":4,"mbox":"https://patchwork.libcamera.org/series/3476/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17315/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17315/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 54270C3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu,  8 Sep 2022 01:42:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0AA7D620AE;\n\tThu,  8 Sep 2022 03:42:29 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5E23862095\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu,  8 Sep 2022 03:42:26 +0200 (CEST)","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 C69E9888;\n\tThu,  8 Sep 2022 03:42:25 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1662601349;\n\tbh=PjM5F25fh2xkqfLem6G67AjIXpfzMI0rq80UtYxMTAY=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=oKVa0vEY7MKbARtHBoL5hwZQrCnxTLLiI+ueVIHXxlE8C4s3JqcXtkm4/ACU+EO9t\n\tEWMHBv9zZ6W6T4fnij3vS6lSDlzRoqxjVs98WO0HFkpnxVZHxb5CdGz/rlXA2XIsp5\n\tmMoXqT17v0PH2HV8BWvN8GOqvdq/NvfbSOqX0m2YDGjyogIMUzGlgjgaAEf4scju1h\n\tt1vQzC+KZWg5wwzznx+74QLR96ZFKDTmfGCum7B0VtvZoNyYpyragja6F9QARtyxN+\n\t2/3hiVHtqwy1XC4Be8TNR++sxWbOOmIne4Q39zX8POByOWbvSglarWxtWTOxma9miz\n\t3RT1SCUZAls/Q==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1662601346;\n\tbh=PjM5F25fh2xkqfLem6G67AjIXpfzMI0rq80UtYxMTAY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=mTUnJHDqRRvkQm7qXiLoBSlq08mSx4kdNyyYbOtIko3LwrsnHkJGT9bKZuHDQBPl8\n\txtjg04gYVSFRi2P4Rrsg6Aac270+5/Rcf6gA/NAJ4cG0HXNTzX1Ru9z/92N7UOMP3S\n\tXVgiV73M9lxO9W1Mjjnh39K9AY/GGSAqpDi80szw="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"mTUnJHDq\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Thu,  8 Sep 2022 04:41:34 +0300","Message-Id":"<20220908014200.28728-7-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220908014200.28728-1-laurent.pinchart@ideasonboard.com>","References":"<20220908014200.28728-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 06/32] ipa: libipa: algorithm:\n\tprepare(): Pass frame and frame Context","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>","From":"Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>","Reply-To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"From: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\nPass the current frame number, and the current FrameContext for calls to\nprepare.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n---\nChanges since v3:\n\n- Use a const uint32_t instead of an unsigned int for the frame number\n---\n src/ipa/ipu3/algorithms/af.cpp           | 5 ++++-\n src/ipa/ipu3/algorithms/af.h             | 4 +++-\n src/ipa/ipu3/algorithms/awb.cpp          | 5 ++++-\n src/ipa/ipu3/algorithms/awb.h            | 4 +++-\n src/ipa/ipu3/algorithms/blc.cpp          | 6 +++++-\n src/ipa/ipu3/algorithms/blc.h            | 4 +++-\n src/ipa/ipu3/algorithms/tone_mapping.cpp | 4 ++++\n src/ipa/ipu3/algorithms/tone_mapping.h   | 3 ++-\n src/ipa/ipu3/ipu3.cpp                    | 4 +++-\n src/ipa/libipa/algorithm.cpp             | 2 ++\n src/ipa/libipa/algorithm.h               | 3 +++\n src/ipa/rkisp1/algorithms/agc.cpp        | 5 ++++-\n src/ipa/rkisp1/algorithms/agc.h          | 4 +++-\n src/ipa/rkisp1/algorithms/awb.cpp        | 5 ++++-\n src/ipa/rkisp1/algorithms/awb.h          | 4 +++-\n src/ipa/rkisp1/algorithms/blc.cpp        | 2 ++\n src/ipa/rkisp1/algorithms/blc.h          | 4 +++-\n src/ipa/rkisp1/algorithms/cproc.cpp      | 2 ++\n src/ipa/rkisp1/algorithms/cproc.h        | 4 +++-\n src/ipa/rkisp1/algorithms/dpcc.cpp       | 2 ++\n src/ipa/rkisp1/algorithms/dpcc.h         | 4 +++-\n src/ipa/rkisp1/algorithms/dpf.cpp        | 4 +++-\n src/ipa/rkisp1/algorithms/dpf.h          | 4 +++-\n src/ipa/rkisp1/algorithms/filter.cpp     | 5 ++++-\n src/ipa/rkisp1/algorithms/filter.h       | 4 +++-\n src/ipa/rkisp1/algorithms/gsl.cpp        | 2 ++\n src/ipa/rkisp1/algorithms/gsl.h          | 4 +++-\n src/ipa/rkisp1/algorithms/lsc.cpp        | 2 ++\n src/ipa/rkisp1/algorithms/lsc.h          | 4 +++-\n src/ipa/rkisp1/rkisp1.cpp                | 5 ++++-\n 30 files changed, 92 insertions(+), 22 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp\nindex 5ab64bf88313..bc01b232ec59 100644\n--- a/src/ipa/ipu3/algorithms/af.cpp\n+++ b/src/ipa/ipu3/algorithms/af.cpp\n@@ -116,7 +116,10 @@ Af::Af()\n /**\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n-void Af::prepare(IPAContext &context, ipu3_uapi_params *params)\n+void Af::prepare(IPAContext &context,\n+\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t ipu3_uapi_params *params)\n {\n \tconst struct ipu3_uapi_grid_config &grid = context.configuration.af.afGrid;\n \tparams->acc_param.af.grid_cfg = grid;\ndiff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h\nindex 29117e8bdd0d..fbfd171b6465 100644\n--- a/src/ipa/ipu3/algorithms/af.h\n+++ b/src/ipa/ipu3/algorithms/af.h\n@@ -30,8 +30,10 @@ public:\n \tAf();\n \t~Af() = default;\n \n-\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     ipu3_uapi_params *params) override;\n \tvoid process(IPAContext &context, IPAFrameContext &frameContext,\n \t\t     const ipu3_uapi_stats_3a *stats) override;\n \ndiff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex 128f5d9d5351..e6e2951b8abb 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -429,7 +429,10 @@ constexpr uint16_t Awb::gainValue(double gain)\n /**\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n-void Awb::prepare(IPAContext &context, ipu3_uapi_params *params)\n+void Awb::prepare(IPAContext &context,\n+\t\t  [[maybe_unused]] const uint32_t frame,\n+\t\t  [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t  ipu3_uapi_params *params)\n {\n \t/*\n \t * Green saturation thresholds are reduced because we are using the\ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex ebbb2d58be7e..e9e816928fb4 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -39,7 +39,9 @@ public:\n \t~Awb();\n \n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n-\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     ipu3_uapi_params *params) override;\n \tvoid process(IPAContext &context, IPAFrameContext &frameContext,\n \t\t     const ipu3_uapi_stats_3a *stats) override;\n \ndiff --git a/src/ipa/ipu3/algorithms/blc.cpp b/src/ipa/ipu3/algorithms/blc.cpp\nindex c32427c99549..e838072a344c 100644\n--- a/src/ipa/ipu3/algorithms/blc.cpp\n+++ b/src/ipa/ipu3/algorithms/blc.cpp\n@@ -39,13 +39,17 @@ BlackLevelCorrection::BlackLevelCorrection()\n /**\n  * \\brief Fill in the parameter structure, and enable black level correction\n  * \\param[in] context The shared IPA context\n+ * \\param[in] frame The frame context sequence number\n+ * \\param[in] frameContext The FrameContext for this frame\n  * \\param[out] params The IPU3 parameters\n  *\n  * Populate the IPU3 parameter structure with the correction values for each\n  * channel and enable the corresponding ImgU block processing.\n  */\n void BlackLevelCorrection::prepare([[maybe_unused]] IPAContext &context,\n-\t\t\t      ipu3_uapi_params *params)\n+\t\t\t\t   [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t   [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t\t\t   ipu3_uapi_params *params)\n {\n \t/*\n \t * The Optical Black Level correction values\ndiff --git a/src/ipa/ipu3/algorithms/blc.h b/src/ipa/ipu3/algorithms/blc.h\nindex d8da1748baba..292bf67b02ff 100644\n--- a/src/ipa/ipu3/algorithms/blc.h\n+++ b/src/ipa/ipu3/algorithms/blc.h\n@@ -18,7 +18,9 @@ class BlackLevelCorrection : public Algorithm\n public:\n \tBlackLevelCorrection();\n \n-\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     ipu3_uapi_params *params) override;\n };\n \n } /* namespace ipa::ipu3::algorithms */\ndiff --git a/src/ipa/ipu3/algorithms/tone_mapping.cpp b/src/ipa/ipu3/algorithms/tone_mapping.cpp\nindex 24faba9be2b2..10a2fb1935dc 100644\n--- a/src/ipa/ipu3/algorithms/tone_mapping.cpp\n+++ b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n@@ -50,12 +50,16 @@ int ToneMapping::configure(IPAContext &context,\n /**\n  * \\brief Fill in the parameter structure, and enable gamma control\n  * \\param[in] context The shared IPA context\n+ * \\param[in] frame The frame context sequence number\n+ * \\param[in] frameContext The FrameContext for this frame\n  * \\param[out] params The IPU3 parameters\n  *\n  * Populate the IPU3 parameter structure with our tone mapping look up table and\n  * enable the gamma control module in the processing blocks.\n  */\n void ToneMapping::prepare([[maybe_unused]] IPAContext &context,\n+\t\t\t  [[maybe_unused]] const uint32_t frame,\n+\t\t\t  [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t\t  ipu3_uapi_params *params)\n {\n \t/* Copy the calculated LUT into the parameters buffer. */\ndiff --git a/src/ipa/ipu3/algorithms/tone_mapping.h b/src/ipa/ipu3/algorithms/tone_mapping.h\nindex 5be62f6ee9bd..c24a7e485aaf 100644\n--- a/src/ipa/ipu3/algorithms/tone_mapping.h\n+++ b/src/ipa/ipu3/algorithms/tone_mapping.h\n@@ -19,7 +19,8 @@ public:\n \tToneMapping();\n \n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n-\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext, ipu3_uapi_params *params) override;\n \tvoid process(IPAContext &context, IPAFrameContext &frameContext,\n \t\t     const ipu3_uapi_stats_3a *stats) override;\n \ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex f0c92507533c..ac6f66afecb5 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -572,8 +572,10 @@ void IPAIPU3::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n \t */\n \tparams->use = {};\n \n+\tIPAFrameContext &frameContext = context_.frameContexts[frame % kMaxFrameContexts];\n+\n \tfor (auto const &algo : algorithms())\n-\t\talgo->prepare(context_, params);\n+\t\talgo->prepare(context_, frame, frameContext, params);\n \n \tparamsBufferReady.emit(frame);\n }\ndiff --git a/src/ipa/libipa/algorithm.cpp b/src/ipa/libipa/algorithm.cpp\nindex 38200e57b780..0992e5de8dd5 100644\n--- a/src/ipa/libipa/algorithm.cpp\n+++ b/src/ipa/libipa/algorithm.cpp\n@@ -70,6 +70,8 @@ namespace ipa {\n  * \\fn Algorithm::prepare()\n  * \\brief Fill the \\a params buffer with ISP processing parameters for a frame\n  * \\param[in] context The shared IPA context\n+ * \\param[in] frame The frame context sequence number\n+ * \\param[in] frameContext The FrameContext for this frame\n  * \\param[out] params The ISP specific parameters.\n  *\n  * This function is called for every frame when the camera is running before it\ndiff --git a/src/ipa/libipa/algorithm.h b/src/ipa/libipa/algorithm.h\nindex 0fe3d772963a..cde2e6399e8e 100644\n--- a/src/ipa/libipa/algorithm.h\n+++ b/src/ipa/libipa/algorithm.h\n@@ -7,6 +7,7 @@\n #pragma once\n \n #include <memory>\n+#include <stdint.h>\n #include <string>\n \n #include <libcamera/controls.h>\n@@ -38,6 +39,8 @@ public:\n \t}\n \n \tvirtual void prepare([[maybe_unused]] typename Module::Context &context,\n+\t\t\t     [[maybe_unused]] const uint32_t frame,\n+\t\t\t     [[maybe_unused]] typename Module::FrameContext &frameContext,\n \t\t\t     [[maybe_unused]] typename Module::Params *params)\n \t{\n \t}\ndiff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\nindex 7642796d69a3..0d22d9dc98fb 100644\n--- a/src/ipa/rkisp1/algorithms/agc.cpp\n+++ b/src/ipa/rkisp1/algorithms/agc.cpp\n@@ -323,7 +323,10 @@ void Agc::process(IPAContext &context,\n /**\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n-void Agc::prepare(IPAContext &context, rkisp1_params_cfg *params)\n+void Agc::prepare(IPAContext &context,\n+\t\t  [[maybe_unused]] const uint32_t frame,\n+\t\t  [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t  rkisp1_params_cfg *params)\n {\n \tif (context.frameContext.frameCount > 0)\n \t\treturn;\ndiff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\nindex 6a5723ecbcf8..8724cb602158 100644\n--- a/src/ipa/rkisp1/algorithms/agc.h\n+++ b/src/ipa/rkisp1/algorithms/agc.h\n@@ -26,7 +26,9 @@ public:\n \t~Agc() = default;\n \n \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n-\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     rkisp1_params_cfg *params) override;\n \tvoid process(IPAContext &context, IPAFrameContext &frameContext,\n \t\t     const rkisp1_stat_buffer *stats) override;\n \ndiff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\nindex 2bc5d3aa16ab..da22a0970a4f 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -74,7 +74,10 @@ uint32_t Awb::estimateCCT(double red, double green, double blue)\n /**\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n-void Awb::prepare(IPAContext &context, rkisp1_params_cfg *params)\n+void Awb::prepare(IPAContext &context,\n+\t\t  [[maybe_unused]] const uint32_t frame,\n+\t\t  [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t  rkisp1_params_cfg *params)\n {\n \tparams->others.awb_gain_config.gain_green_b = 256 * context.frameContext.awb.gains.green;\n \tparams->others.awb_gain_config.gain_blue = 256 * context.frameContext.awb.gains.blue;\ndiff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h\nindex fc221acea617..7ae6c7a9bb10 100644\n--- a/src/ipa/rkisp1/algorithms/awb.h\n+++ b/src/ipa/rkisp1/algorithms/awb.h\n@@ -20,7 +20,9 @@ public:\n \t~Awb() = default;\n \n \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n-\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     rkisp1_params_cfg *params) override;\n \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n \t\t\t  const ControlList &controls) override;\n \tvoid process(IPAContext &context, IPAFrameContext &frameCtx,\ndiff --git a/src/ipa/rkisp1/algorithms/blc.cpp b/src/ipa/rkisp1/algorithms/blc.cpp\nindex a58569fa2dc2..c45a317ada08 100644\n--- a/src/ipa/rkisp1/algorithms/blc.cpp\n+++ b/src/ipa/rkisp1/algorithms/blc.cpp\n@@ -66,6 +66,8 @@ int BlackLevelCorrection::init([[maybe_unused]] IPAContext &context,\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n void BlackLevelCorrection::prepare(IPAContext &context,\n+\t\t\t\t   [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t   [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t\t\t   rkisp1_params_cfg *params)\n {\n \tif (context.frameContext.frameCount > 0)\ndiff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h\nindex 5fc3a80fb638..0b1a2d436869 100644\n--- a/src/ipa/rkisp1/algorithms/blc.h\n+++ b/src/ipa/rkisp1/algorithms/blc.h\n@@ -20,7 +20,9 @@ public:\n \t~BlackLevelCorrection() = default;\n \n \tint init(IPAContext &context, const YamlObject &tuningData) override;\n-\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     rkisp1_params_cfg *params) override;\n \n private:\n \tbool tuningParameters_;\ndiff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\nindex bca5ab6907d6..c0505c68765b 100644\n--- a/src/ipa/rkisp1/algorithms/cproc.cpp\n+++ b/src/ipa/rkisp1/algorithms/cproc.cpp\n@@ -71,6 +71,8 @@ void ColorProcessing::queueRequest(IPAContext &context,\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n void ColorProcessing::prepare(IPAContext &context,\n+\t\t\t      [[maybe_unused]] const uint32_t frame,\n+\t\t\t      [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t\t      rkisp1_params_cfg *params)\n {\n \tauto &cproc = context.frameContext.cproc;\ndiff --git a/src/ipa/rkisp1/algorithms/cproc.h b/src/ipa/rkisp1/algorithms/cproc.h\nindex 4b7e4064d7e8..02c3d9c95488 100644\n--- a/src/ipa/rkisp1/algorithms/cproc.h\n+++ b/src/ipa/rkisp1/algorithms/cproc.h\n@@ -23,7 +23,9 @@ public:\n \n \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n \t\t\t  const ControlList &controls) override;\n-\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     rkisp1_params_cfg *params) override;\n };\n \n } /* namespace ipa::rkisp1::algorithms */\ndiff --git a/src/ipa/rkisp1/algorithms/dpcc.cpp b/src/ipa/rkisp1/algorithms/dpcc.cpp\nindex fb2f01cdaa3c..5030526769c7 100644\n--- a/src/ipa/rkisp1/algorithms/dpcc.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpcc.cpp\n@@ -259,6 +259,8 @@ int DefectPixelClusterCorrection::init([[maybe_unused]] IPAContext &context,\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n void DefectPixelClusterCorrection::prepare(IPAContext &context,\n+\t\t\t\t\t   [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t\t   [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t\t\t\t   rkisp1_params_cfg *params)\n {\n \tif (context.frameContext.frameCount > 0)\ndiff --git a/src/ipa/rkisp1/algorithms/dpcc.h b/src/ipa/rkisp1/algorithms/dpcc.h\nindex a363f7bee0a7..894c0249f35d 100644\n--- a/src/ipa/rkisp1/algorithms/dpcc.h\n+++ b/src/ipa/rkisp1/algorithms/dpcc.h\n@@ -20,7 +20,9 @@ public:\n \t~DefectPixelClusterCorrection() = default;\n \n \tint init(IPAContext &context, const YamlObject &tuningData) override;\n-\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     rkisp1_params_cfg *params) override;\n \n private:\n \tbool initialized_;\ndiff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\nindex c93c8361b5da..8286f83facc1 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n@@ -206,7 +206,9 @@ void Dpf::queueRequest(IPAContext &context,\n /**\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n-void Dpf::prepare(IPAContext &context, rkisp1_params_cfg *params)\n+void Dpf::prepare(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n+\t\t  [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t  rkisp1_params_cfg *params)\n {\n \tif (!initialized_)\n \t\treturn;\ndiff --git a/src/ipa/rkisp1/algorithms/dpf.h b/src/ipa/rkisp1/algorithms/dpf.h\nindex 128ebd5e02e3..656d78dee67c 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.h\n+++ b/src/ipa/rkisp1/algorithms/dpf.h\n@@ -24,7 +24,9 @@ public:\n \tint init(IPAContext &context, const YamlObject &tuningData) override;\n \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n \t\t\t  const ControlList &controls) override;\n-\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     rkisp1_params_cfg *params) override;\n \n private:\n \tbool initialized_;\ndiff --git a/src/ipa/rkisp1/algorithms/filter.cpp b/src/ipa/rkisp1/algorithms/filter.cpp\nindex 8ca10fd1ee9d..02562339d008 100644\n--- a/src/ipa/rkisp1/algorithms/filter.cpp\n+++ b/src/ipa/rkisp1/algorithms/filter.cpp\n@@ -85,7 +85,10 @@ void Filter::queueRequest(IPAContext &context,\n /**\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n-void Filter::prepare(IPAContext &context, rkisp1_params_cfg *params)\n+void Filter::prepare(IPAContext &context,\n+\t\t     [[maybe_unused]] const uint32_t frame,\n+\t\t     [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t     rkisp1_params_cfg *params)\n {\n \tauto &filter = context.frameContext.filter;\n \ndiff --git a/src/ipa/rkisp1/algorithms/filter.h b/src/ipa/rkisp1/algorithms/filter.h\nindex 9eb170eb7da1..ac69657e2f0f 100644\n--- a/src/ipa/rkisp1/algorithms/filter.h\n+++ b/src/ipa/rkisp1/algorithms/filter.h\n@@ -23,7 +23,9 @@ public:\n \n \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n \t\t\t  const ControlList &controls) override;\n-\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     rkisp1_params_cfg *params) override;\n };\n \n } /* namespace ipa::rkisp1::algorithms */\ndiff --git a/src/ipa/rkisp1/algorithms/gsl.cpp b/src/ipa/rkisp1/algorithms/gsl.cpp\nindex 2fd1a23d3a9b..dfc76b3d8ffd 100644\n--- a/src/ipa/rkisp1/algorithms/gsl.cpp\n+++ b/src/ipa/rkisp1/algorithms/gsl.cpp\n@@ -119,6 +119,8 @@ int GammaSensorLinearization::init([[maybe_unused]] IPAContext &context,\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n void GammaSensorLinearization::prepare(IPAContext &context,\n+\t\t\t\t       [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t       [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t\t\t       rkisp1_params_cfg *params)\n {\n \tif (context.frameContext.frameCount > 0)\ndiff --git a/src/ipa/rkisp1/algorithms/gsl.h b/src/ipa/rkisp1/algorithms/gsl.h\nindex db287dc280dc..5024b6835949 100644\n--- a/src/ipa/rkisp1/algorithms/gsl.h\n+++ b/src/ipa/rkisp1/algorithms/gsl.h\n@@ -20,7 +20,9 @@ public:\n \t~GammaSensorLinearization() = default;\n \n \tint init(IPAContext &context, const YamlObject &tuningData) override;\n-\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     rkisp1_params_cfg *params) override;\n \n private:\n \tbool initialized_;\ndiff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp\nindex b9efc063ab2e..e4b04136dbaf 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.cpp\n+++ b/src/ipa/rkisp1/algorithms/lsc.cpp\n@@ -133,6 +133,8 @@ int LensShadingCorrection::configure(IPAContext &context,\n  * \\copydoc libcamera::ipa::Algorithm::prepare\n  */\n void LensShadingCorrection::prepare(IPAContext &context,\n+\t\t\t\t    [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t    [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t\t\t    rkisp1_params_cfg *params)\n {\n \tif (context.frameContext.frameCount > 0)\ndiff --git a/src/ipa/rkisp1/algorithms/lsc.h b/src/ipa/rkisp1/algorithms/lsc.h\nindex f68602c005c4..da957d3e3103 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.h\n+++ b/src/ipa/rkisp1/algorithms/lsc.h\n@@ -21,7 +21,9 @@ public:\n \n \tint init(IPAContext &context, const YamlObject &tuningData) override;\n \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n-\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t     IPAFrameContext &frameContext,\n+\t\t     rkisp1_params_cfg *params) override;\n \n private:\n \tbool initialized_;\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 3bc6d4dd2784..0932c73b14e4 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -298,6 +298,9 @@ void IPARkISP1::queueRequest(const uint32_t frame, const ControlList &controls)\n \n void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n {\n+\t/* \\todo Obtain the frame context to pass to process from the FCQueue */\n+\tIPAFrameContext frameContext;\n+\n \trkisp1_params_cfg *params =\n \t\treinterpret_cast<rkisp1_params_cfg *>(\n \t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\n@@ -306,7 +309,7 @@ void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n \tmemset(params, 0, sizeof(*params));\n \n \tfor (auto const &algo : algorithms())\n-\t\talgo->prepare(context_, params);\n+\t\talgo->prepare(context_, frame, frameContext, params);\n \n \tparamsBufferReady.emit(frame);\n \tcontext_.frameContext.frameCount++;\n","prefixes":["libcamera-devel","v4","06/32"]}