{"id":16984,"url":"https://patchwork.libcamera.org/api/patches/16984/?format=json","web_url":"https://patchwork.libcamera.org/patch/16984/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20220805135312.47497-10-jacopo@jmondi.org>","date":"2022-08-05T13:53:11","name":"[libcamera-devel,v2,09/10] ipa: libipa: algorithm: process(): Pass frame number","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c40fbeb53ccb8c893911f92eaefc1051369a2d12","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16984/mbox/","series":[{"id":3376,"url":"https://patchwork.libcamera.org/api/series/3376/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3376","date":"2022-08-05T13:53:02","name":"libcamera: Align IPU3 and RKISP1 interfaces","version":2,"mbox":"https://patchwork.libcamera.org/series/3376/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16984/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16984/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 E7B7FC3275\n\tfor ;\n\tFri, 5 Aug 2022 13:53:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A61F163346;\n\tFri, 5 Aug 2022 15:53:34 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5CC786333C\n\tfor ;\n\tFri, 5 Aug 2022 15:53:33 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 4F83A1C0006;\n\tFri, 5 Aug 2022 13:53:32 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659707614;\n\tbh=g6zj6HHH1Ze6XmtpSXHM2Prb1GNKXBjq07IXHcqcmms=;\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=pkDBZprtC1mTknuzPsbj2Ig55hWVgF63isqwY3BC8tqYOxEuI5Sz4MlfzUZi0V6z9\n\tFxYTJCQcV0PAeGmLGDHK5zIzajjYZpJpo6Cf5aw49iko60gei5/rqdHaUq2Fyfi4ZF\n\tOFHFQbqpvhOg6s/MalA7gfRSGBC+kjkf6h/peIfcZlIFJsJ9CCCSa2TRaF4N7xJaOF\n\t4/uh/BZw0TY4Cbpcfc79JrBDENy/2ivvNDiU9jHtf1OIgOyy8xqrcWgb2za3pSRgjA\n\tK/Q+TLhsmPvrh/8/4i9dt4Z9kJQ6E6WyETrAroDndcr445XN+vuS528b9qIvS4+GLv\n\txHE6OjZ605ZMQ==","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 5 Aug 2022 15:53:11 +0200","Message-Id":"<20220805135312.47497-10-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.37.1","In-Reply-To":"<20220805135312.47497-1-jacopo@jmondi.org>","References":"<20220805135312.47497-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 09/10] ipa: libipa: algorithm:\n\tprocess(): Pass frame number","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","From":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Kieran Bingham via libcamera-devel \n\nPass the frame number of the current frame being processed.\n\nSigned-off-by: Kieran Bingham \n\n - Use RKISP1FrameContext from the queue during IPARkISP1::processStatsBuffer\n\nSigned-off-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/ipa/ipu3/algorithms/af.cpp | 2 ++\n src/ipa/ipu3/algorithms/af.h | 4 +++-\n src/ipa/ipu3/algorithms/agc.cpp | 2 ++\n src/ipa/ipu3/algorithms/agc.h | 3 ++-\n src/ipa/ipu3/algorithms/awb.cpp | 1 +\n src/ipa/ipu3/algorithms/awb.h | 3 ++-\n src/ipa/ipu3/algorithms/tone_mapping.cpp | 2 ++\n src/ipa/ipu3/algorithms/tone_mapping.h | 3 ++-\n src/ipa/ipu3/ipu3.cpp | 2 +-\n src/ipa/libipa/algorithm.cpp | 1 +\n src/ipa/libipa/algorithm.h | 1 +\n src/ipa/rkisp1/algorithms/agc.cpp | 1 +\n src/ipa/rkisp1/algorithms/agc.h | 3 ++-\n src/ipa/rkisp1/algorithms/awb.cpp | 1 +\n src/ipa/rkisp1/algorithms/awb.h | 3 ++-\n src/ipa/rkisp1/rkisp1.cpp | 2 +-\n 16 files changed, 26 insertions(+), 8 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp\nindex 1faf92969ee5..29a9f520d93c 100644\n--- a/src/ipa/ipu3/algorithms/af.cpp\n+++ b/src/ipa/ipu3/algorithms/af.cpp\n@@ -409,6 +409,7 @@ bool Af::afIsOutOfFocus(IPAContext context)\n /**\n * \\brief Determine the max contrast image and lens position.\n * \\param[in] context The IPA context.\n+ * \\param[in] frame The frame context sequence number\n * \\param[in] frameContext The current frame context\n * \\param[in] stats The statistics buffer of IPU3.\n *\n@@ -424,6 +425,7 @@ bool Af::afIsOutOfFocus(IPAContext context)\n * [1] Hill Climbing Algorithm, https://en.wikipedia.org/wiki/Hill_climbing\n */\n void Af::process(IPAContext &context,\n+\t\t [[maybe_unused]] unsigned int frame,\n \t\t [[maybe_unused]] IPU3FrameContext &frameContext,\n \t\t const ipu3_uapi_stats_3a *stats)\n {\ndiff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h\nindex 4e2bbd08c3bf..977112506c98 100644\n--- a/src/ipa/ipu3/algorithms/af.h\n+++ b/src/ipa/ipu3/algorithms/af.h\n@@ -31,10 +31,12 @@ public:\n \t~Af() = default;\n \n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) 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+\tvoid process(IPAContext &context, unsigned int frame,\n+\t\t IPU3FrameContext &frameContext,\n \t\t const ipu3_uapi_stats_3a *stats) override;\n \n private:\ndiff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 92ea6249798d..00ef54d45574 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -317,6 +317,7 @@ double Agc::estimateLuminance(IPAActiveState &activeState,\n /**\n * \\brief Process IPU3 statistics, and run AGC operations\n * \\param[in] context The shared IPA context\n+ * \\param[in] frame The current frame sequence number\n * \\param[in] frameContext The current frame context\n * \\param[in] stats The IPU3 statistics and ISP results\n *\n@@ -324,6 +325,7 @@ double Agc::estimateLuminance(IPAActiveState &activeState,\n * new exposure and gain for the scene.\n */\n void Agc::process(IPAContext &context,\n+\t\t [[maybe_unused]] unsigned int frame,\n \t\t IPU3FrameContext &frameContext,\n \t\t const ipu3_uapi_stats_3a *stats)\n {\ndiff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h\nindex 96585f48933f..5bb9dc8f610e 100644\n--- a/src/ipa/ipu3/algorithms/agc.h\n+++ b/src/ipa/ipu3/algorithms/agc.h\n@@ -28,7 +28,8 @@ public:\n \t~Agc() = default;\n \n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n-\tvoid process(IPAContext &context, IPU3FrameContext &frameContext,\n+\tvoid process(IPAContext &context, unsigned int frame,\n+\t\t IPU3FrameContext &frameContext,\n \t\t const ipu3_uapi_stats_3a *stats) override;\n \n private:\ndiff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex b110ad404fd1..8943ead6fc4c 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -388,6 +388,7 @@ void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats)\n * \\copydoc libcamera::ipa::Algorithm::process\n */\n void Awb::process(IPAContext &context,\n+\t\t [[maybe_unused]] unsigned int frame,\n \t\t [[maybe_unused]] IPU3FrameContext &frameContext,\n \t\t const ipu3_uapi_stats_3a *stats)\n {\ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex 731e5bae17de..094b177672ca 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -43,7 +43,8 @@ public:\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+\tvoid process(IPAContext &context, unsigned int frame,\n+\t\t IPU3FrameContext &frameContext,\n \t\t const ipu3_uapi_stats_3a *stats) override;\n \n private:\ndiff --git a/src/ipa/ipu3/algorithms/tone_mapping.cpp b/src/ipa/ipu3/algorithms/tone_mapping.cpp\nindex 0951db43f53f..1acbea98a852 100644\n--- a/src/ipa/ipu3/algorithms/tone_mapping.cpp\n+++ b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n@@ -76,6 +76,7 @@ void ToneMapping::prepare([[maybe_unused]] IPAContext &context,\n /**\n * \\brief Calculate the tone mapping look up table\n * \\param context The shared IPA context\n+ * \\param frame The current frame sequence number\n * \\param frameContext The current frame context\n * \\param stats The IPU3 statistics and ISP results\n *\n@@ -83,6 +84,7 @@ void ToneMapping::prepare([[maybe_unused]] IPAContext &context,\n * our gamma setting.\n */\n void ToneMapping::process(IPAContext &context,\n+\t\t\t [[maybe_unused]] unsigned int frame,\n \t\t\t [[maybe_unused]] IPU3FrameContext &frameContext,\n \t\t\t [[maybe_unused]] const ipu3_uapi_stats_3a *stats)\n {\ndiff --git a/src/ipa/ipu3/algorithms/tone_mapping.h b/src/ipa/ipu3/algorithms/tone_mapping.h\nindex cfb3de01b7f3..a3ab285c927f 100644\n--- a/src/ipa/ipu3/algorithms/tone_mapping.h\n+++ b/src/ipa/ipu3/algorithms/tone_mapping.h\n@@ -21,7 +21,8 @@ public:\n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) 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+\tvoid process(IPAContext &context, unsigned int frame,\n+\t\t IPU3FrameContext &frameContext,\n \t\t const ipu3_uapi_stats_3a *stats) override;\n \n private:\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex ffb9ea8c5971..da4d416b6aef 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -584,7 +584,7 @@ void IPAIPU3::processStatsBuffer(const uint32_t frame,\n \tControlList ctrls(controls::controls);\n \n \tfor (auto const &algo : algorithms_)\n-\t\talgo->process(context_, frameContext, stats);\n+\t\talgo->process(context_, frame, frameContext, stats);\n \n \tsetControls(frame);\n \ndiff --git a/src/ipa/libipa/algorithm.cpp b/src/ipa/libipa/algorithm.cpp\nindex 0992e5de8dd5..30eab67f71fc 100644\n--- a/src/ipa/libipa/algorithm.cpp\n+++ b/src/ipa/libipa/algorithm.cpp\n@@ -103,6 +103,7 @@ namespace ipa {\n * \\fn Algorithm::process()\n * \\brief Process ISP statistics, and run algorithm operations\n * \\param[in] context The shared IPA context\n+ * \\param[in] frame The frame context sequence number\n * \\param[in] frameContext The current frame's context\n * \\param[in] stats The IPA statistics and ISP results\n *\ndiff --git a/src/ipa/libipa/algorithm.h b/src/ipa/libipa/algorithm.h\nindex 379207f1657e..c2d990707b25 100644\n--- a/src/ipa/libipa/algorithm.h\n+++ b/src/ipa/libipa/algorithm.h\n@@ -51,6 +51,7 @@ public:\n \t}\n \n \tvirtual void process([[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]] const typename Module::Stats *stats)\n \t{\ndiff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\nindex 2d436511caf7..60018db73260 100644\n--- a/src/ipa/rkisp1/algorithms/agc.cpp\n+++ b/src/ipa/rkisp1/algorithms/agc.cpp\n@@ -281,6 +281,7 @@ double Agc::measureBrightness(const rkisp1_cif_isp_hist_stat *hist) const\n * new exposure and gain for the scene.\n */\n void Agc::process(IPAContext &context,\n+\t\t [[maybe_unused]] unsigned int frame,\n \t\t [[maybe_unused]] RKISP1FrameContext &frameContext,\n \t\t const rkisp1_stat_buffer *stats)\n {\ndiff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\nindex 97ca0e31558c..473dbee53eaa 100644\n--- a/src/ipa/rkisp1/algorithms/agc.h\n+++ b/src/ipa/rkisp1/algorithms/agc.h\n@@ -29,7 +29,8 @@ public:\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+\tvoid process(IPAContext &context, unsigned int frame,\n+\t\t RKISP1FrameContext &frameContext,\n \t\t const rkisp1_stat_buffer *stats) override;\n \n private:\ndiff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\nindex 1af6d98c5252..b3ffa6cda4ea 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -123,6 +123,7 @@ void Awb::prepare(IPAContext &context,\n * \\copydoc libcamera::ipa::Algorithm::process\n */\n void Awb::process([[maybe_unused]] IPAContext &context,\n+\t\t [[maybe_unused]] unsigned int frame,\n \t\t [[maybe_unused]] RKISP1FrameContext &frameCtx,\n \t\t const rkisp1_stat_buffer *stats)\n {\ndiff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h\nindex 82d5ce1b1818..c2b18ea76406 100644\n--- a/src/ipa/rkisp1/algorithms/awb.h\n+++ b/src/ipa/rkisp1/algorithms/awb.h\n@@ -23,7 +23,8 @@ public:\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+\tvoid process(IPAContext &context, unsigned int frame,\n+\t\t RKISP1FrameContext &frameCtx,\n \t\t const rkisp1_stat_buffer *stats) override;\n \n private:\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex f3512647a833..9af8217c3b8a 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -335,7 +335,7 @@ void IPARkISP1::processStatsBuffer(const uint32_t frame, const uint32_t bufferId\n \tunsigned int aeState = 0;\n \n \tfor (auto const &algo : algorithms())\n-\t\talgo->process(context_, frameContext, stats);\n+\t\talgo->process(context_, frame, frameContext, stats);\n \n \tsetControls(frame);\n \n","prefixes":["libcamera-devel","v2","09/10"]}