Patch Detail
Show a patch.
GET /api/1.1/patches/17316/?format=api
{ "id": 17316, "url": "https://patchwork.libcamera.org/api/1.1/patches/17316/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17316/", "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": "<20220908014200.28728-8-laurent.pinchart@ideasonboard.com>", "date": "2022-09-08T01:41:35", "name": "[libcamera-devel,v4,07/32] ipa: libipa: algorithm: process(): Pass frame number", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "43a6841d4c3fb5dc13103415fffefce8612fcd7d", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17316/mbox/", "series": [ { "id": 3476, "url": "https://patchwork.libcamera.org/api/1.1/series/3476/?format=api", "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/17316/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17316/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 DD7A9C327D\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 8F664620A6;\n\tThu, 8 Sep 2022 03:42:29 +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 BAB8762095\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 8 Sep 2022 03:42:27 +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 42377888;\n\tThu, 8 Sep 2022 03:42:27 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1662601349;\n\tbh=RgQ0EimBXyyZ7oUBujLkXwHHuR6LacOnWdWazuG00yM=;\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=mUMmxVT0C9hNuGE+g9O+O+QdGKMXaycpZd0qlag9rx4TibPAaBz6KlnTbRORSVmcx\n\tAHLiYpaokW3z1lvFPksLDJJq6gQEMIp62eXNJL0sIk24tEBZ4gRnGqGxdjCKLG2gbJ\n\tZ4UBszU+dkFbuOjXaWa7H4Uzuaj1oiU0wb65nvkKh7U++4e4atI8NF5NxFmmKQ1Jjr\n\tERiX9L5VlrKcCY665CDYVhu8XgtsFA0T0nYk4KaSgoqegXjQrgfxWsMcyk882FcCs/\n\tbbqSH3GZcK2mQmlvVV9HeRi6YjRK85HyHHZWh8eYn5bJAzFRoXkOMCaMFa9EhJ2wVB\n\ttHt/YHqZkmj5w==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1662601347;\n\tbh=RgQ0EimBXyyZ7oUBujLkXwHHuR6LacOnWdWazuG00yM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=PfTF/Kf35Elt3GxfURo2Rd41U3yOKNAbDIxxi4VWZgV0csinxldEshWpbgH21AiYB\n\tjkXq12WuD90aTwIVncodT9hnHzzdR7T7MlRGoamN1PUXBTyLx2vA4dce46+x11/btS\n\t1kxkriKbVaJEHS/58IXj2K2cKj5xA9/IdKiU8UHk=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"PfTF/Kf3\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 8 Sep 2022 04:41:35 +0300", "Message-Id": "<20220908014200.28728-8-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 07/32] 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": "<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 frame number of the current frame being processed.\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- Update the documentation of ipa::rkisp1::Agc::process()\n---\n src/ipa/ipu3/algorithms/af.cpp | 4 +++-\n src/ipa/ipu3/algorithms/af.h | 3 ++-\n src/ipa/ipu3/algorithms/agc.cpp | 4 +++-\n src/ipa/ipu3/algorithms/agc.h | 3 ++-\n src/ipa/ipu3/algorithms/awb.cpp | 3 ++-\n src/ipa/ipu3/algorithms/awb.h | 3 ++-\n src/ipa/ipu3/algorithms/tone_mapping.cpp | 4 +++-\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 | 2 +-\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, 29 insertions(+), 13 deletions(-)", "diff": "diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp\nindex bc01b232ec59..b00a34f9e090 100644\n--- a/src/ipa/ipu3/algorithms/af.cpp\n+++ b/src/ipa/ipu3/algorithms/af.cpp\n@@ -406,6 +406,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@@ -420,7 +421,8 @@ 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]] const uint32_t frame,\n+\t\t [[maybe_unused]] IPAFrameContext &frameContext,\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 fbfd171b6465..89d37ac18615 100644\n--- a/src/ipa/ipu3/algorithms/af.h\n+++ b/src/ipa/ipu3/algorithms/af.h\n@@ -34,7 +34,8 @@ public:\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+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &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 f8ca29640a44..a1a3c38ffe84 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -317,13 +317,15 @@ 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 * 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, IPAFrameContext &frameContext,\n+void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n \t\t const ipu3_uapi_stats_3a *stats)\n {\n \t/*\ndiff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h\nindex 876fbbb6b585..59b4b9843c2f 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, IPAFrameContext &frameContext,\n+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &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 e6e2951b8abb..0dbd7d4c374f 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -387,7 +387,8 @@ 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]] const uint32_t frame,\n+\t\t [[maybe_unused]] IPAFrameContext &frameContext,\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 e9e816928fb4..28e2d38a711c 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -42,7 +42,8 @@ public:\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+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &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 10a2fb1935dc..eac3d4064443 100644\n--- a/src/ipa/ipu3/algorithms/tone_mapping.cpp\n+++ b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n@@ -76,13 +76,15 @@ void ToneMapping::prepare([[maybe_unused]] IPAContext &context,\n /**\n * \\brief Calculate the tone mapping look up table\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 * 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]] const uint32_t frame,\n+\t\t\t [[maybe_unused]] IPAFrameContext &frameContext,\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 c24a7e485aaf..822e5168df82 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, const uint32_t frame,\n \t\t IPAFrameContext &frameContext, ipu3_uapi_params *params) override;\n-\tvoid process(IPAContext &context, IPAFrameContext &frameContext,\n+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &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 ac6f66afecb5..e5a763fd2b08 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -618,7 +618,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 cde2e6399e8e..ee93d260ca3f 100644\n--- a/src/ipa/libipa/algorithm.h\n+++ b/src/ipa/libipa/algorithm.h\n@@ -52,6 +52,7 @@ public:\n \t}\n \n \tvirtual void process([[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]] const typename Module::Stats *stats)\n \t{\ndiff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\nindex 0d22d9dc98fb..4c246d71a739 100644\n--- a/src/ipa/rkisp1/algorithms/agc.cpp\n+++ b/src/ipa/rkisp1/algorithms/agc.cpp\n@@ -281,7 +281,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+void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n \t\t [[maybe_unused]] IPAFrameContext &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 8724cb602158..f115ba2ed85c 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, 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+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &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 da22a0970a4f..aefba6382807 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -155,6 +155,7 @@ void Awb::queueRequest(IPAContext &context,\n * \\copydoc libcamera::ipa::Algorithm::process\n */\n void Awb::process([[maybe_unused]] IPAContext &context,\n+\t\t [[maybe_unused]] const uint32_t frame,\n \t\t [[maybe_unused]] IPAFrameContext &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 7ae6c7a9bb10..806e11a2ec93 100644\n--- a/src/ipa/rkisp1/algorithms/awb.h\n+++ b/src/ipa/rkisp1/algorithms/awb.h\n@@ -25,7 +25,8 @@ public:\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,\n+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &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 0932c73b14e4..b2593a584a1a 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -333,7 +333,7 @@ void IPARkISP1::processStatsBuffer(const uint32_t frame, const uint32_t bufferId\n \tIPAFrameContext frameContext;\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", "v4", "07/32" ] }