{"id":17419,"url":"https://patchwork.libcamera.org/api/1.1/patches/17419/?format=json","web_url":"https://patchwork.libcamera.org/patch/17419/","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":"<20220927023642.12341-9-laurent.pinchart@ideasonboard.com>","date":"2022-09-27T02:36:17","name":"[libcamera-devel,v5,08/33] ipa: libipa: algorithm: queueRequest(): Pass frame context","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"b64f093ac797cfdf9dff7c30cc20f1ab709c0a28","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17419/mbox/","series":[{"id":3506,"url":"https://patchwork.libcamera.org/api/1.1/series/3506/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3506","date":"2022-09-27T02:36:09","name":"ipa: Frame context queue, IPU3 & RkISP consolidation, and RkISP1 improvements","version":5,"mbox":"https://patchwork.libcamera.org/series/3506/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17419/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17419/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 F07A9C0DA4\n\tfor ;\n\tTue, 27 Sep 2022 02:37:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 865B46228A;\n\tTue, 27 Sep 2022 04:37:14 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AE20B6227B\n\tfor ;\n\tTue, 27 Sep 2022 04:37:11 +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 320EEE5;\n\tTue, 27 Sep 2022 04:37:11 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1664246234;\n\tbh=/CIW0eUrjoMlixPe6qEJ+Wgkq7GIJp7JAABKOr7bq4c=;\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=Qxz8NyUrdr4oWdJTFLmZG2l8snGlC11sPXJ5LDyLq26x4ouNeFEXGNKmsAiNiooUf\n\tB/oF2r/x8FWb6Vteczl2PJbEXPcSvzI/AvhtrRezjf+8x4fcVV/hvnZqqir+oNL6Jp\n\tp/lGX2ZTFeo+VxXYqIbJvmKYdLgMv+y9+IMpr3Trc19VlvcO5k++1/lxOsasGZA1Ev\n\tiqNyu7Vv+CrXTET7QZImSSIWSr/tHCuLBDvIgRj7BTLlUO2/dxZOQ49FTyuEAC5rTd\n\ty8UAfg6quskthRL/55nJ3JqLvoAzXSWApq6DviRnZLehi3T+ouyuxw9pe/KxDZoxi1\n\thkgPowW94Hnvg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1664246231;\n\tbh=/CIW0eUrjoMlixPe6qEJ+Wgkq7GIJp7JAABKOr7bq4c=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=lSq8wkM+/LxdaJoraZHZZVe39tSy7R6i+Dl0zFTXWq20zZMErJiknpOX+uOOP8Klb\n\tWr2mqGp2U7nOU1KVzFrxVLz4F+4gm59qsVkGcPV03fdVaofmrPloQVsZ4s25LeVzOF\n\tzbQSeNlqOg+Vbqw54U5Q8vBFshVJ+xGO18a5tcv0="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"lSq8wkM+\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 27 Sep 2022 05:36:17 +0300","Message-Id":"<20220927023642.12341-9-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220927023642.12341-1-laurent.pinchart@ideasonboard.com>","References":"<20220927023642.12341-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 08/33] ipa: libipa: algorithm:\n\tqueueRequest(): Pass frame 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":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Kieran Bingham \n\nIPA modules have access to incoming Request's controls list and need to\nstore them in the frame context at queueRequest() time. Pass the frame\ncontext to the Algorithm::queueRequest() function.\n\nSigned-off-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \nReviewed-by: Umang Jain \nReviewed-by: Kieran Bingham \n---\nChanges since v4:\n\n- Rewrite commit message\n---\n src/ipa/libipa/algorithm.cpp | 1 +\n src/ipa/libipa/algorithm.h | 1 +\n src/ipa/rkisp1/algorithms/awb.cpp | 1 +\n src/ipa/rkisp1/algorithms/awb.h | 1 +\n src/ipa/rkisp1/algorithms/cproc.cpp | 1 +\n src/ipa/rkisp1/algorithms/cproc.h | 1 +\n src/ipa/rkisp1/algorithms/dpf.cpp | 1 +\n src/ipa/rkisp1/algorithms/dpf.h | 1 +\n src/ipa/rkisp1/algorithms/filter.cpp | 1 +\n src/ipa/rkisp1/algorithms/filter.h | 1 +\n src/ipa/rkisp1/rkisp1.cpp | 5 ++++-\n 11 files changed, 14 insertions(+), 1 deletion(-)","diff":"diff --git a/src/ipa/libipa/algorithm.cpp b/src/ipa/libipa/algorithm.cpp\nindex 30eab67f71fc..c152b885aee1 100644\n--- a/src/ipa/libipa/algorithm.cpp\n+++ b/src/ipa/libipa/algorithm.cpp\n@@ -88,6 +88,7 @@ namespace ipa {\n * \\brief Provide control values to the algorithm\n * \\param[in] context The shared IPA context\n * \\param[in] frame The frame number to apply the control values\n+ * \\param[in] frameContext The current frame's context\n * \\param[in] controls The list of user controls\n *\n * This function is called for each request queued to the camera. It provides\ndiff --git a/src/ipa/libipa/algorithm.h b/src/ipa/libipa/algorithm.h\nindex ee93d260ca3f..d8601f9ccaff 100644\n--- a/src/ipa/libipa/algorithm.h\n+++ b/src/ipa/libipa/algorithm.h\n@@ -47,6 +47,7 @@ public:\n \n \tvirtual void queueRequest([[maybe_unused]] typename Module::Context &context,\n \t\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t [[maybe_unused]] typename Module::FrameContext &frameContext,\n \t\t\t\t [[maybe_unused]] const ControlList &controls)\n \t{\n \t}\ndiff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\nindex aefba6382807..a23c32015454 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -128,6 +128,7 @@ void Awb::prepare(IPAContext &context,\n */\n void Awb::queueRequest(IPAContext &context,\n \t\t [[maybe_unused]] const uint32_t frame,\n+\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t const ControlList &controls)\n {\n \tauto &awb = context.frameContext.awb;\ndiff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h\nindex 806e11a2ec93..6d4a39467038 100644\n--- a/src/ipa/rkisp1/algorithms/awb.h\n+++ b/src/ipa/rkisp1/algorithms/awb.h\n@@ -24,6 +24,7 @@ public:\n \t\t IPAFrameContext &frameContext,\n \t\t rkisp1_params_cfg *params) override;\n \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n+\t\t\t IPAFrameContext &frameContext,\n \t\t\t const ControlList &controls) override;\n \tvoid process(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameCtx,\ndiff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\nindex c0505c68765b..bc4a07073706 100644\n--- a/src/ipa/rkisp1/algorithms/cproc.cpp\n+++ b/src/ipa/rkisp1/algorithms/cproc.cpp\n@@ -38,6 +38,7 @@ LOG_DEFINE_CATEGORY(RkISP1CProc)\n */\n void ColorProcessing::queueRequest(IPAContext &context,\n \t\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t\t\t const ControlList &controls)\n {\n \tauto &cproc = context.frameContext.cproc;\ndiff --git a/src/ipa/rkisp1/algorithms/cproc.h b/src/ipa/rkisp1/algorithms/cproc.h\nindex 02c3d9c95488..ba6e901ae110 100644\n--- a/src/ipa/rkisp1/algorithms/cproc.h\n+++ b/src/ipa/rkisp1/algorithms/cproc.h\n@@ -22,6 +22,7 @@ public:\n \t~ColorProcessing() = default;\n \n \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n+\t\t\t IPAFrameContext &frameContext,\n \t\t\t const ControlList &controls) override;\n \tvoid prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\ndiff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\nindex 8286f83facc1..be024fc5fe90 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n@@ -176,6 +176,7 @@ int Dpf::init([[maybe_unused]] IPAContext &context,\n */\n void Dpf::queueRequest(IPAContext &context,\n \t\t [[maybe_unused]] const uint32_t frame,\n+\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t const ControlList &controls)\n {\n \tauto &dpf = context.frameContext.dpf;\ndiff --git a/src/ipa/rkisp1/algorithms/dpf.h b/src/ipa/rkisp1/algorithms/dpf.h\nindex 656d78dee67c..e232cad4ee87 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.h\n+++ b/src/ipa/rkisp1/algorithms/dpf.h\n@@ -23,6 +23,7 @@ public:\n \n \tint init(IPAContext &context, const YamlObject &tuningData) override;\n \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n+\t\t\t IPAFrameContext &frameContext,\n \t\t\t const ControlList &controls) override;\n \tvoid prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\ndiff --git a/src/ipa/rkisp1/algorithms/filter.cpp b/src/ipa/rkisp1/algorithms/filter.cpp\nindex 02562339d008..6aa5476aa25e 100644\n--- a/src/ipa/rkisp1/algorithms/filter.cpp\n+++ b/src/ipa/rkisp1/algorithms/filter.cpp\n@@ -44,6 +44,7 @@ static constexpr uint32_t kFiltModeDefault = 0x000004f2;\n */\n void Filter::queueRequest(IPAContext &context,\n \t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t\t const ControlList &controls)\n {\n \tauto &filter = context.frameContext.filter;\ndiff --git a/src/ipa/rkisp1/algorithms/filter.h b/src/ipa/rkisp1/algorithms/filter.h\nindex ac69657e2f0f..3fd882ea41dc 100644\n--- a/src/ipa/rkisp1/algorithms/filter.h\n+++ b/src/ipa/rkisp1/algorithms/filter.h\n@@ -22,6 +22,7 @@ public:\n \t~Filter() = default;\n \n \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n+\t\t\t IPAFrameContext &frameContext,\n \t\t\t const ControlList &controls) override;\n \tvoid prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex b2593a584a1a..07210d16b5b5 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -292,8 +292,11 @@ void IPARkISP1::unmapBuffers(const std::vector &ids)\n \n void IPARkISP1::queueRequest(const uint32_t frame, const ControlList &controls)\n {\n+\t/* \\todo Obtain the frame context to pass to process from the FCQueue */\n+\tIPAFrameContext frameContext;\n+\n \tfor (auto const &algo : algorithms())\n-\t\talgo->queueRequest(context_, frame, controls);\n+\t\talgo->queueRequest(context_, frame, frameContext, controls);\n }\n \n void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n","prefixes":["libcamera-devel","v5","08/33"]}