Patch Detail
Show a patch.
GET /api/1.1/patches/17160/?format=api
{ "id": 17160, "url": "https://patchwork.libcamera.org/api/1.1/patches/17160/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17160/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20220818094410.1671-6-jacopo@jmondi.org>", "date": "2022-08-18T09:43:58", "name": "[libcamera-devel,v3,05/17] ipa: libipa: algorithm: prepare(): Pass frame and frame Context", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c3d42cceb02309de1c5cb7893ecd41483ca392f8", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17160/mbox/", "series": [ { "id": 3426, "url": "https://patchwork.libcamera.org/api/1.1/series/3426/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3426", "date": "2022-08-18T09:43:53", "name": "libcamera: Align IPU3 and RKISP1 interfaces", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3426/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17160/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17160/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 9AF00C3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 18 Aug 2022 09:44:30 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4D46E61FCE;\n\tThu, 18 Aug 2022 11:44:30 +0200 (CEST)", "from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ABBCF61FA5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 18 Aug 2022 11:44:26 +0200 (CEST)", "(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 5C7AFFF809;\n\tThu, 18 Aug 2022 09:44:25 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660815870;\n\tbh=JsfPz9aOh+yRTxOO96KMikmTpDOd5KjY5SUao46pwCw=;\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=4ThRGxhw+JMNXBR50GzWJtj68IGGvRTrhByZkkL/o5mA79MN21aYb//6JhSO49VjE\n\t1BJZJFQwJKMBwZzSSJsRYZnQCmO/Sy/Tnn2HK5JfNQVEZBoE3wj7fxd12fT8NyyKCw\n\tU9uozGRP1OLMVciRkDGysnCqa0wa0+DTSw03oTodsKmmvxkvryjwi9ZCy90aUSTtMi\n\tK+XGUIoTNesD943Lbz3/PRSxpKbgIQ+1H8lVAKFQViR8yv5suK0H7KX3F9DN+ru9Em\n\t1G3pBZBYEQkANgFUDcSRqwNRriDXjjRkIJePmAGm4fxj5GIPXNb7RV5RdfgKigbx14\n\tFe0UnQYtYPTQw==", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 18 Aug 2022 11:43:58 +0200", "Message-Id": "<20220818094410.1671-6-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.37.2", "In-Reply-To": "<20220818094410.1671-1-jacopo@jmondi.org>", "References": "<20220818094410.1671-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 05/17] 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": "Jacopo Mondi via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Jacopo Mondi <jacopo@jmondi.org>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Kieran Bingham via libcamera-devel <libcamera-devel@lists.libcamera.org>\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---\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 | 5 ++++-\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 | 2 ++\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/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 | 4 +++-\n 28 files changed, 85 insertions(+), 20 deletions(-)", "diff": "diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp\nindex e7ed37003217..a949f0015b7d 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]] unsigned int frame,\n+\t\t [[maybe_unused]] IPU3FrameContext &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 7a5aeb1b6bf4..4e2bbd08c3bf 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, unsigned int frame,\n+\t\t IPU3FrameContext &frameContext,\n+\t\t ipu3_uapi_params *params) override;\n \tvoid process(IPAContext &context, IPU3FrameContext &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 35eafd5ec50e..a87b81f6458f 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -430,7 +430,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]] unsigned int frame,\n+\t\t [[maybe_unused]] IPU3FrameContext &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 28e39620fd59..731e5bae17de 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -39,7 +39,10 @@ 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+\n+\tvoid prepare(IPAContext &context, unsigned int frame,\n+\t\t IPU3FrameContext &frameContext,\n+\t\t ipu3_uapi_params *params) override;\n \tvoid process(IPAContext &context, IPU3FrameContext &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 c561aa858b96..ff9ffacff13e 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 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 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]] unsigned int frame,\n+\t\t\t\t [[maybe_unused]] IPU3FrameContext &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..36388b267eea 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, unsigned int frame,\n+\t\t IPU3FrameContext &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 72627ea1e658..f5e6b1e35080 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 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 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]] unsigned int frame,\n+\t\t\t [[maybe_unused]] IPU3FrameContext &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 8cce38c742a6..cfb3de01b7f3 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, unsigned int frame,\n+\t\t IPU3FrameContext &frameContext, ipu3_uapi_params *params) override;\n \tvoid process(IPAContext &context, IPU3FrameContext &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 13d7c878a242..17dd13c04edf 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -574,8 +574,10 @@ void IPAIPU3::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n \t */\n \tparams->use = {};\n \n+\tIPU3FrameContext &frameContext = context_.frameContexts.get(frame);\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..379207f1657e 100644\n--- a/src/ipa/libipa/algorithm.h\n+++ b/src/ipa/libipa/algorithm.h\n@@ -38,6 +38,8 @@ public:\n \t}\n \n \tvirtual void prepare([[maybe_unused]] typename Module::Context &context,\n+\t\t\t [[maybe_unused]] unsigned int 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 40d27963ef68..2d436511caf7 100644\n--- a/src/ipa/rkisp1/algorithms/agc.cpp\n+++ b/src/ipa/rkisp1/algorithms/agc.cpp\n@@ -322,7 +322,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]] unsigned int frame,\n+\t\t [[maybe_unused]] RKISP1FrameContext &frameContext,\n+\t\t rkisp1_params_cfg *params)\n {\n \tif (context.activeState.frameCount > 0)\n \t\treturn;\ndiff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\nindex af7fe2740908..97ca0e31558c 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, unsigned int frame,\n+\t\t RKISP1FrameContext &frameContext,\n+\t\t rkisp1_params_cfg *params) override;\n \tvoid process(IPAContext &context, RKISP1FrameContext &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 3beafb73ca33..1af6d98c5252 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -70,7 +70,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]] unsigned int frame,\n+\t\t [[maybe_unused]] RKISP1FrameContext &frameContext,\n+\t\t rkisp1_params_cfg *params)\n {\n \tparams->others.awb_gain_config.gain_green_b = 256 * context.activeState.awb.gains.green;\n \tparams->others.awb_gain_config.gain_blue = 256 * context.activeState.awb.gains.blue;\ndiff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h\nindex 5954034b8142..82d5ce1b1818 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, unsigned int frame,\n+\t\t RKISP1FrameContext &frameContext,\n+\t\t rkisp1_params_cfg *params) override;\n \tvoid process(IPAContext &context, RKISP1FrameContext &frameCtx,\n \t\t const rkisp1_stat_buffer *stats) override;\n \ndiff --git a/src/ipa/rkisp1/algorithms/blc.cpp b/src/ipa/rkisp1/algorithms/blc.cpp\nindex 4d55a2d529cb..93c7e3145fa2 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]] unsigned int frame,\n+\t\t\t\t [[maybe_unused]] RKISP1FrameContext &frameContext,\n \t\t\t\t rkisp1_params_cfg *params)\n {\n \tif (context.activeState.frameCount > 0)\ndiff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h\nindex 5fc3a80fb638..1afa12f6b46e 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, unsigned int frame,\n+\t\t RKISP1FrameContext &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 a3b778d1c908..edaf2d10e850 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]] unsigned int frame,\n+\t\t\t [[maybe_unused]] RKISP1FrameContext &frameContext,\n \t\t\t rkisp1_params_cfg *params)\n {\n \tauto &cproc = context.activeState.cproc;\ndiff --git a/src/ipa/rkisp1/algorithms/cproc.h b/src/ipa/rkisp1/algorithms/cproc.h\nindex 4b7e4064d7e8..fde83f3c965c 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, unsigned int frame,\n+\t\t RKISP1FrameContext &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 93d37b1dae44..9ba03653afdc 100644\n--- a/src/ipa/rkisp1/algorithms/dpcc.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpcc.cpp\n@@ -232,6 +232,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]] unsigned int frame,\n+\t\t\t\t\t [[maybe_unused]] RKISP1FrameContext &frameContext,\n \t\t\t\t\t rkisp1_params_cfg *params)\n {\n \tif (context.activeState.frameCount > 0)\ndiff --git a/src/ipa/rkisp1/algorithms/dpcc.h b/src/ipa/rkisp1/algorithms/dpcc.h\nindex a363f7bee0a7..ca9df9fc38dc 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, unsigned int frame,\n+\t\t RKISP1FrameContext &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 bc7fc1f32f34..f6577046442a 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]] unsigned int frame,\n+\t\t [[maybe_unused]] RKISP1FrameContext &frameContext,\n+\t\t rkisp1_params_cfg *params)\n {\n \tauto &filter = context.activeState.filter;\n \ndiff --git a/src/ipa/rkisp1/algorithms/filter.h b/src/ipa/rkisp1/algorithms/filter.h\nindex 9eb170eb7da1..1fbe785a3cab 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, unsigned int frame,\n+\t\t RKISP1FrameContext &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 dd9974627cd2..77d841cfbf82 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]] unsigned int frame,\n+\t\t\t\t [[maybe_unused]] RKISP1FrameContext &frameContext,\n \t\t\t\t rkisp1_params_cfg *params)\n {\n \tif (context.activeState.frameCount > 0)\ndiff --git a/src/ipa/rkisp1/algorithms/gsl.h b/src/ipa/rkisp1/algorithms/gsl.h\nindex db287dc280dc..fe74ae10e099 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, unsigned int frame,\n+\t\t RKISP1FrameContext &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 4ed467086199..cd8fcbe66b9b 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.cpp\n+++ b/src/ipa/rkisp1/algorithms/lsc.cpp\n@@ -123,6 +123,8 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,\n * \\copydoc libcamera::ipa::Algorithm::prepare\n */\n void LensShadingCorrection::prepare(IPAContext &context,\n+\t\t\t\t [[maybe_unused]] unsigned int frame,\n+\t\t\t\t [[maybe_unused]] RKISP1FrameContext &frameContext,\n \t\t\t\t rkisp1_params_cfg *params)\n {\n \tif (context.activeState.frameCount > 0)\ndiff --git a/src/ipa/rkisp1/algorithms/lsc.h b/src/ipa/rkisp1/algorithms/lsc.h\nindex fdb2ec1dd27d..fafb80b329ee 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.h\n+++ b/src/ipa/rkisp1/algorithms/lsc.h\n@@ -20,7 +20,9 @@ public:\n \t~LensShadingCorrection() = 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, unsigned int frame,\n+\t\t RKISP1FrameContext &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 3d6a6b78bb8d..219c4a4e4b33 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -301,6 +301,8 @@ 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+\tRKISP1FrameContext &frameContext = context_.frameContexts.get(frame);\n+\n \trkisp1_params_cfg *params =\n \t\treinterpret_cast<rkisp1_params_cfg *>(\n \t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\n@@ -309,7 +311,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_.activeState.frameCount++;\n", "prefixes": [ "libcamera-devel", "v3", "05/17" ] }