[{"id":24538,"web_url":"https://patchwork.libcamera.org/comment/24538/","msgid":"","date":"2022-08-11T07:08:24","subject":"Re: [libcamera-devel] [PATCH v2 09/10] ipa: libipa: algorithm:\n\tprocess(): Pass frame number","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn 8/5/22 19:23, Jacopo Mondi via libcamera-devel wrote:\n> From: Kieran Bingham via libcamera-devel \n>\n> Pass the frame number of the current frame being processed.\n>\n> Signed-off-by: Kieran Bingham \n>\n> - Use RKISP1FrameContext from the queue during IPARkISP1::processStatsBuffer\n>\n> Signed-off-by: Kieran Bingham \n> Signed-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(-)\n>\n> diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp\n> index 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> {\n> diff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h\n> index 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\n\nnot sure if \\newline is intentional addition here...\n\nReviewed-by: Umang Jain \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:\n> diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\n> index 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> {\n> diff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h\n> index 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:\n> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n> index 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> {\n> diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\n> index 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:\n> diff --git a/src/ipa/ipu3/algorithms/tone_mapping.cpp b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> index 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> {\n> diff --git a/src/ipa/ipu3/algorithms/tone_mapping.h b/src/ipa/ipu3/algorithms/tone_mapping.h\n> index 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:\n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index 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> \n> diff --git a/src/ipa/libipa/algorithm.cpp b/src/ipa/libipa/algorithm.cpp\n> index 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> *\n> diff --git a/src/ipa/libipa/algorithm.h b/src/ipa/libipa/algorithm.h\n> index 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{\n> diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\n> index 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> {\n> diff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\n> index 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:\n> diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\n> index 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> {\n> diff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h\n> index 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:\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 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>","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 176E2C3272\n\tfor ;\n\tThu, 11 Aug 2022 07:08:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 671AD6332B;\n\tThu, 11 Aug 2022 09:08:32 +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 F423263327\n\tfor ;\n\tThu, 11 Aug 2022 09:08:30 +0200 (CEST)","from [IPV6:2401:4900:1f3f:c7a1:27b3:9637:38a7:6084] (unknown\n\t[IPv6:2401:4900:1f3f:c7a1:27b3:9637:38a7:6084])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0E05C3F1;\n\tThu, 11 Aug 2022 09:08:29 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660201712;\n\tbh=pAjJN0K8UJiDWVs02euFXmUcQhi5JEeICRNSExxoFcc=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=lBUFvT9mXZfCbjitUcH2JA6Uvl+XTUp8KZnEKIo7rySG0rWnmPmkmvsLWfaOthhBf\n\tzGOjwxiR/9Mgsm0cbev551NMzhU/Pn04xuWnNCqex4cdgjgSLNxWdSn8Plmc6FECT6\n\tbOm1I5UBWgUvudrbcYKJ9FUUSRhHTtOWd5TyvfE7RPC7MzRc6DuZhrmACQ3OvDXRqJ\n\tStUmFfQe6LAX7Q3SA9zS+TEEygIt/WAK3Fo8UTttC1IachPjly2G4Zc0I2+gku7nAC\n\tcs2cwzHrTADkjau02nxJKG/i7ltZm5jTZhlze+qTgsL05EPvZINbddVqw6t/K1brF0\n\tFm5f8fHifhQcw==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1660201710;\n\tbh=pAjJN0K8UJiDWVs02euFXmUcQhi5JEeICRNSExxoFcc=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=CSRG0SMxXTonj+IkG2lOikykcx3Dgc9Rp+rGVUYigT4FlITpEVlTwzvYYgF8aUlvD\n\t8XIvyk8X7KxdMVO9faH3+BndLhnfUIyhJxzVm6pr0M8EthIh9A5Je7ilhVPb9VGDMh\n\t+Hl1000URr+fO4yuvI0l7mJjuAlI8D1NR4lAQcTU="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"CSRG0SMx\"; dkim-atps=neutral","Message-ID":"","Date":"Thu, 11 Aug 2022 12:38:24 +0530","MIME-Version":"1.0","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101\n\tThunderbird/91.4.1","Content-Language":"en-US","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20220805135312.47497-1-jacopo@jmondi.org>\n\t<20220805135312.47497-10-jacopo@jmondi.org>","In-Reply-To":"<20220805135312.47497-10-jacopo@jmondi.org>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","Subject":"Re: [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":"Umang Jain via libcamera-devel ","Reply-To":"Umang Jain ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]