{"id":16105,"url":"https://patchwork.libcamera.org/api/1.1/patches/16105/?format=json","web_url":"https://patchwork.libcamera.org/patch/16105/","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":"<20220527191740.242300-4-umang.jain@ideasonboard.com>","date":"2022-05-27T19:17:40","name":"[libcamera-devel,RFC,v2,3/3] ipa: algorithm: process() should take in frame number instead of context","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4d010645836e7ac9528b6d4c09244886fcdc06e9","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/1.1/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/1.1/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/16105/mbox/","series":[{"id":3147,"url":"https://patchwork.libcamera.org/api/1.1/series/3147/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3147","date":"2022-05-27T19:17:37","name":"Move frame contexts queue to a separate","version":2,"mbox":"https://patchwork.libcamera.org/series/3147/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16105/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16105/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 787B4C326D\n\tfor ;\n\tFri, 27 May 2022 19:17:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B4C5B6563A;\n\tFri, 27 May 2022 21:17:51 +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 609EE633A3\n\tfor ;\n\tFri, 27 May 2022 21:17:48 +0200 (CEST)","from perceval.ideasonboard.com (unknown [90.164.63.43])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C5B6F32A;\n\tFri, 27 May 2022 21:17:47 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1653679071;\n\tbh=x4t25g4YYcC0+UqEd27p/Zay/WDQ3WTa/68IHZ/ZuVM=;\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=NCCmcc4eqLJqWAugUySIsdUCLMQJ3GH1SSh3wwGhPwmujfVI65IwyUwvuuM7ASr4b\n\tAkZFgrjJ+vpm0dtbtCBU3+YFTZEjbRtk52My1icGPKHbjsa3sp+nDCxoNhbd9o5pK4\n\tpzWRFrTwZ1ymlENodosO8ktFzFyRghp9iDB59fi3xubtbrHYh7SKW0JreHD7VZkVvK\n\tWacAYqSG5vxWRWF2wU+iqfpY9yYPRojQf3tW8VS6EF08yvIzo33+2YCpY/VFmQG+cE\n\t8kaxxPsaTsHbPY4wJDEv4YG6nVaRXofqiWZbvzf9xUfUYPWe8Ag2KNQZPYAfOlrB+n\n\tNoZYbD28ZJpGA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1653679068;\n\tbh=x4t25g4YYcC0+UqEd27p/Zay/WDQ3WTa/68IHZ/ZuVM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=dFHmvOBQ2o/6OZhFTkPp7wljoe9moKrJIHHAV791kK8+VHROIaVXZ9OhC7a+GuXdQ\n\tYz2dbCJz75BjuzMY12c+8ntvV2Dnl+KmJOJn4KnD5DaXUjgWfwtt8Z4tXrtLyx3I9v\n\tfkhSoHno0L0Nvr1tvnXeg+4aLOZfqND08iQzi1m8="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"dFHmvOBQ\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 27 May 2022 21:17:40 +0200","Message-Id":"<20220527191740.242300-4-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20220527191740.242300-1-umang.jain@ideasonboard.com>","References":"<20220527191740.242300-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC PATCH v2 3/3] ipa: algorithm: process()\n\tshould take in frame number instead of context","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\" "},"content":"This will enable algorithms to extract a frame context from the FCQueue\nusing the frame number. This is required because algorithms can operate\non different frames at different points in time (according to frame latency\nthey need to respect).\n\nSigned-off-by: Umang Jain \nReviewed-by: Paul Elder \n---\n src/ipa/ipu3/algorithms/af.cpp | 2 +-\n src/ipa/ipu3/algorithms/af.h | 2 +-\n src/ipa/ipu3/algorithms/agc.cpp | 13 +++++++------\n src/ipa/ipu3/algorithms/agc.h | 4 ++--\n src/ipa/ipu3/algorithms/algorithm.h | 4 ++--\n src/ipa/ipu3/algorithms/awb.cpp | 2 +-\n src/ipa/ipu3/algorithms/awb.h | 2 +-\n src/ipa/ipu3/algorithms/tone_mapping.cpp | 2 +-\n src/ipa/ipu3/algorithms/tone_mapping.h | 2 +-\n src/ipa/ipu3/ipu3.cpp | 2 +-\n src/ipa/libipa/algorithm.cpp | 2 +-\n src/ipa/libipa/algorithm.h | 6 +++---\n src/ipa/rkisp1/algorithms/agc.cpp | 3 +--\n src/ipa/rkisp1/algorithms/agc.h | 2 +-\n src/ipa/rkisp1/algorithms/algorithm.h | 5 ++---\n src/ipa/rkisp1/algorithms/awb.cpp | 2 +-\n src/ipa/rkisp1/algorithms/awb.h | 2 +-\n src/ipa/rkisp1/rkisp1.cpp | 2 +-\n 18 files changed, 29 insertions(+), 30 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp\nindex d07521a0..24462c6b 100644\n--- a/src/ipa/ipu3/algorithms/af.cpp\n+++ b/src/ipa/ipu3/algorithms/af.cpp\n@@ -420,7 +420,7 @@ bool Af::afIsOutOfFocus(IPAContext context)\n *\n * [1] Hill Climbing Algorithm, https://en.wikipedia.org/wiki/Hill_climbing\n */\n-void Af::process(IPAContext &context, [[maybe_unused]] IPAFrameContext *frameContext,\n+void Af::process(IPAContext &context, [[maybe_unused]] uint32_t frame,\n \t\t const ipu3_uapi_stats_3a *stats)\n {\n \t/* Evaluate the AF buffer length */\ndiff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h\nindex ccf015f3..69aeb3e2 100644\n--- a/src/ipa/ipu3/algorithms/af.h\n+++ b/src/ipa/ipu3/algorithms/af.h\n@@ -32,7 +32,7 @@ public:\n \n \tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n-\tvoid process(IPAContext &context, IPAFrameContext *frameContext,\n+\tvoid process(IPAContext &context, uint32_t frame,\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 f16be534..41766007 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -183,13 +183,14 @@ utils::Duration Agc::filterExposure(utils::Duration exposureValue)\n * \\param[in] yGain The gain calculated based on the relative luminance target\n * \\param[in] iqMeanGain The gain calculated based on the relative luminance target\n */\n-void Agc::computeExposure(IPAContext &context, IPAFrameContext *frameContext,\n-\t\t\t double yGain, double iqMeanGain)\n+void Agc::computeExposure(IPAContext &context, uint32_t frame, double yGain,\n+\t\t\t double iqMeanGain)\n {\n \tconst IPASessionConfiguration &configuration = context.configuration;\n \t/* Get the effective exposure and gain applied on the sensor. */\n-\tuint32_t exposure = frameContext->sensor.exposure;\n-\tdouble analogueGain = frameContext->sensor.gain;\n+\tIPAFrameContext &frameContext = context.frameContexts.get(frame);\n+\tuint32_t exposure = frameContext.sensor.exposure;\n+\tdouble analogueGain = frameContext.sensor.gain;\n \n \t/* Use the highest of the two gain estimates. */\n \tdouble evGain = std::max(yGain, iqMeanGain);\n@@ -323,7 +324,7 @@ double Agc::estimateLuminance(IPAActiveState &activeState,\n * Identify the current image brightness, and use that to estimate the optimal\n * new exposure and gain for the scene.\n */\n-void Agc::process(IPAContext &context, [[maybe_unused]] IPAFrameContext *frameContext,\n+void Agc::process(IPAContext &context, [[maybe_unused]] uint32_t frame,\n \t\t const ipu3_uapi_stats_3a *stats)\n {\n \t/*\n@@ -359,7 +360,7 @@ void Agc::process(IPAContext &context, [[maybe_unused]] IPAFrameContext *frameCo\n \t\t\tbreak;\n \t}\n \n-\tcomputeExposure(context, frameContext, yGain, iqMeanGain);\n+\tcomputeExposure(context, frame, yGain, iqMeanGain);\n \tframeCount_++;\n }\n \ndiff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h\nindex 105ae0f2..8ef2a2d8 100644\n--- a/src/ipa/ipu3/algorithms/agc.h\n+++ b/src/ipa/ipu3/algorithms/agc.h\n@@ -28,14 +28,14 @@ public:\n \t~Agc() = default;\n \n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n-\tvoid process(IPAContext &context, IPAFrameContext *frameContext,\n+\tvoid process(IPAContext &context, uint32_t frame,\n \t\t const ipu3_uapi_stats_3a *stats) override;\n \n private:\n \tdouble measureBrightness(const ipu3_uapi_stats_3a *stats,\n \t\t\t\t const ipu3_uapi_grid_config &grid) const;\n \tutils::Duration filterExposure(utils::Duration currentExposure);\n-\tvoid computeExposure(IPAContext &context, IPAFrameContext *frameContext,\n+\tvoid computeExposure(IPAContext &context, uint32_t frame,\n \t\t\t double yGain, double iqMeanGain);\n \tdouble estimateLuminance(IPAActiveState &activeState,\n \t\t\t\t const ipu3_uapi_grid_config &grid,\ndiff --git a/src/ipa/ipu3/algorithms/algorithm.h b/src/ipa/ipu3/algorithms/algorithm.h\nindex 234b2bd7..3e0c60d3 100644\n--- a/src/ipa/ipu3/algorithms/algorithm.h\n+++ b/src/ipa/ipu3/algorithms/algorithm.h\n@@ -17,8 +17,8 @@ namespace libcamera {\n \n namespace ipa::ipu3 {\n \n-using Algorithm = libcamera::ipa::Algorithm;\n \n } /* namespace ipa::ipu3 */\ndiff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex 5c232d92..35f35ebe 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -387,7 +387,7 @@ void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats)\n /**\n * \\copydoc libcamera::ipa::Algorithm::process\n */\n-void Awb::process(IPAContext &context, [[maybe_unused]] IPAFrameContext *frameContext,\n+void Awb::process(IPAContext &context, [[maybe_unused]] uint32_t frame,\n \t\t const ipu3_uapi_stats_3a *stats)\n {\n \tcalculateWBGains(stats);\ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex 9a50a985..f263540c 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -40,7 +40,7 @@ public:\n \n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n \tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n-\tvoid process(IPAContext &context, IPAFrameContext *frameContext,\n+\tvoid process(IPAContext &context, uint32_t frame,\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 f86e79b2..0f70b8aa 100644\n--- a/src/ipa/ipu3/algorithms/tone_mapping.cpp\n+++ b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n@@ -78,7 +78,7 @@ void ToneMapping::prepare([[maybe_unused]] IPAContext &context,\n * The tone mapping look up table is generated as an inverse power curve from\n * our gamma setting.\n */\n-void ToneMapping::process(IPAContext &context, [[maybe_unused]] IPAFrameContext *frameContext,\n+void ToneMapping::process(IPAContext &context, [[maybe_unused]] uint32_t frame,\n \t\t\t [[maybe_unused]] const ipu3_uapi_stats_3a *stats)\n {\n \t/*\ndiff --git a/src/ipa/ipu3/algorithms/tone_mapping.h b/src/ipa/ipu3/algorithms/tone_mapping.h\nindex d7d48006..61474085 100644\n--- a/src/ipa/ipu3/algorithms/tone_mapping.h\n+++ b/src/ipa/ipu3/algorithms/tone_mapping.h\n@@ -20,7 +20,7 @@ public:\n \n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n \tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n-\tvoid process(IPAContext &context, IPAFrameContext *frameContext,\n+\tvoid process(IPAContext &context, uint32_t frame,\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 e09c5d05..4f33b1a6 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -582,7 +582,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, stats);\n \n \tsetControls(frame);\n \ndiff --git a/src/ipa/libipa/algorithm.cpp b/src/ipa/libipa/algorithm.cpp\nindex cce2ed62..c0a9bbeb 100644\n--- a/src/ipa/libipa/algorithm.cpp\n+++ b/src/ipa/libipa/algorithm.cpp\n@@ -64,7 +64,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] frameContext The current frame's context\n+ * \\param[in] frame The current frame id\n * \\param[in] stats The IPA statistics and ISP results\n *\n * This function is called while camera is running for every frame processed by\ndiff --git a/src/ipa/libipa/algorithm.h b/src/ipa/libipa/algorithm.h\nindex 032a05b5..d1ca0883 100644\n--- a/src/ipa/libipa/algorithm.h\n+++ b/src/ipa/libipa/algorithm.h\n@@ -10,8 +10,8 @@ namespace libcamera {\n \n namespace ipa {\n \n-template\n+template\n+\n class Algorithm\n {\n public:\n@@ -29,7 +29,7 @@ public:\n \t}\n \n \tvirtual void process([[maybe_unused]] Context &context,\n-\t\t\t [[maybe_unused]] FrameContext *frameContext,\n+\t\t\t [[maybe_unused]] uint32_t frame,\n \t\t\t [[maybe_unused]] const Stats *stats)\n \t{\n \t}\ndiff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\nindex b5a184d9..9418b533 100644\n--- a/src/ipa/rkisp1/algorithms/agc.cpp\n+++ b/src/ipa/rkisp1/algorithms/agc.cpp\n@@ -280,8 +280,7 @@ double Agc::measureBrightness(const rkisp1_cif_isp_hist_stat *hist) const\n * Identify the current image brightness, and use that to estimate the optimal\n * new exposure and gain for the scene.\n */\n-void Agc::process(IPAContext &context,\n-\t\t [[maybe_unused]] IPAFrameContext *frameContext,\n+void Agc::process(IPAContext &context, [[maybe_unused]] uint32_t frame,\n \t\t const rkisp1_stat_buffer *stats)\n {\n \tconst rkisp1_cif_isp_stat *params = &stats->params;\ndiff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\nindex 22c02779..a749f1c3 100644\n--- a/src/ipa/rkisp1/algorithms/agc.h\n+++ b/src/ipa/rkisp1/algorithms/agc.h\n@@ -29,7 +29,7 @@ public:\n \n \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n \tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n-\tvoid process(IPAContext &context, IPAFrameContext *frameContext,\n+\tvoid process(IPAContext &context, uint32_t frame,\n \t\t const rkisp1_stat_buffer *stats) override;\n \n private:\ndiff --git a/src/ipa/rkisp1/algorithms/algorithm.h b/src/ipa/rkisp1/algorithms/algorithm.h\nindex 68e3a44e..069c744c 100644\n--- a/src/ipa/rkisp1/algorithms/algorithm.h\n+++ b/src/ipa/rkisp1/algorithms/algorithm.h\n@@ -19,9 +19,8 @@ namespace libcamera {\n \n namespace ipa::rkisp1 {\n \n-using Algorithm = libcamera::ipa::Algorithm;\n+using Algorithm = libcamera::ipa::Algorithm;\n \n } /* namespace ipa::rkisp1 */\n \ndiff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\nindex 88441382..1e7fd11a 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -120,7 +120,7 @@ void Awb::prepare(IPAContext &context, rkisp1_params_cfg *params)\n * \\copydoc libcamera::ipa::Algorithm::process\n */\n void Awb::process([[maybe_unused]] IPAContext &context,\n-\t\t [[maybe_unused]] IPAFrameContext *frameCtx,\n+\t\t [[maybe_unused]] uint32_t frame,\n \t\t const rkisp1_stat_buffer *stats)\n {\n \tconst rkisp1_cif_isp_stat *params = &stats->params;\ndiff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h\nindex 7647842f..82921f34 100644\n--- a/src/ipa/rkisp1/algorithms/awb.h\n+++ b/src/ipa/rkisp1/algorithms/awb.h\n@@ -23,7 +23,7 @@ public:\n \n \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n \tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n-\tvoid process(IPAContext &context, IPAFrameContext *frameCtx,\n+\tvoid process(IPAContext &context, uint32_t frame,\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 c818a6d7..ad33d817 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -272,7 +272,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_, nullptr, stats);\n+\t\talgo->process(context_, frame, stats);\n \n \tsetControls(frame);\n \n","prefixes":["libcamera-devel","RFC","v2","3/3"]}