{"id":16985,"url":"https://patchwork.libcamera.org/api/1.1/patches/16985/?format=json","web_url":"https://patchwork.libcamera.org/patch/16985/","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":"<20220805135312.47497-11-jacopo@jmondi.org>","date":"2022-08-05T13:53:12","name":"[libcamera-devel,v2,10/10] ipa: libipa: algorithm: queueRequest(): Pass frame context","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"8d09665ab8898745b8fce0e6789c50f5473ed9ee","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16985/mbox/","series":[{"id":3376,"url":"https://patchwork.libcamera.org/api/1.1/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/16985/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16985/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 8A13CC3272\n\tfor ;\n\tFri, 5 Aug 2022 13:53:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3C53C63344;\n\tFri, 5 Aug 2022 15:53:36 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::225])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 675E763340\n\tfor ;\n\tFri, 5 Aug 2022 15:53:34 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 9546E1C0003;\n\tFri, 5 Aug 2022 13:53:33 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659707616;\n\tbh=KTMNfasVWVEpTkCFVyvywoM3njx3IKXpEVyZ8juVNzE=;\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=0lfvlWtkNDQB5hutuMEeU5HZ/gGtZbLwD/82yP9o0GPH9mzAHQRG+gZN3DQclVs1G\n\to1xLurOkjOtG8Gl4lRfByOBNN9xHg8Og3h/pLbFvNsZr/BFtu07EGjL9KTeptKbzqj\n\tOiUkgbhuKo9IOaplixIZ3VcQIydveYDMuUB7zsBe3Oichfqb4sU4VnOAkVnHhTt3wW\n\tQRjswoJ601Jz9lpDb/IU/jhJAdXw0RtgkJzWEiozHF/v8Bgjjd7IEEupqj8Ev9MsPI\n\tjmrvwrK6P9c6Dywtue/MpoZBxMjeI7zHdlB31xaNZ+z7LB19Xh4wYfUWe5cRZ/qfOr\n\tKCI8zOZPjNg5g==","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 5 Aug 2022 15:53:12 +0200","Message-Id":"<20220805135312.47497-11-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 10/10] 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":"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 current FrameContext for calls to queueRequest().\n\nNow that both the IPU3 and RkISP1 IPA modules comply with the same\ninterface, propagate the queueRequest() call to algorithms in the IPU3\nIPA module.\n\nSigned-off-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/ipa/ipu3/ipu3.cpp | 5 ++---\n src/ipa/libipa/algorithm.cpp | 1 +\n src/ipa/libipa/algorithm.h | 1 +\n src/ipa/rkisp1/algorithms/cproc.cpp | 1 +\n src/ipa/rkisp1/algorithms/cproc.h | 1 +\n src/ipa/rkisp1/algorithms/filter.cpp | 1 +\n src/ipa/rkisp1/algorithms/filter.h | 1 +\n src/ipa/rkisp1/rkisp1.cpp | 4 +++-\n 8 files changed, 11 insertions(+), 4 deletions(-)","diff":"diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex da4d416b6aef..e033891a9341 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -622,9 +622,8 @@ void IPAIPU3::queueRequest(const uint32_t frame, const ControlList &controls)\n \t/* \\todo Start processing for 'frame' based on 'controls'. */\n \tIPU3FrameContext &frameContext = context_.frameContexts.initialise(frame);\n \n-\t/* \\todo Implement queueRequest to each algorithm. */\n-\t(void)frameContext;\n-\t(void)controls;\n+\tfor (auto const &algo : algorithms_)\n+\t\talgo->queueRequest(context_, frame, frameContext, controls);\n }\n \n /**\ndiff --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 c2d990707b25..f92829ad7ac6 100644\n--- a/src/ipa/libipa/algorithm.h\n+++ b/src/ipa/libipa/algorithm.h\n@@ -46,6 +46,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/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\nindex edaf2d10e850..c0792926f9eb 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]] RKISP1FrameContext &frameContext,\n \t\t\t\t const ControlList &controls)\n {\n \tauto &cproc = context.activeState.cproc;\ndiff --git a/src/ipa/rkisp1/algorithms/cproc.h b/src/ipa/rkisp1/algorithms/cproc.h\nindex fde83f3c965c..13f8967e70a8 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 RKISP1FrameContext &frameContext,\n \t\t\t const ControlList &controls) override;\n \tvoid prepare(IPAContext &context, unsigned int frame,\n \t\t RKISP1FrameContext &frameContext,\ndiff --git a/src/ipa/rkisp1/algorithms/filter.cpp b/src/ipa/rkisp1/algorithms/filter.cpp\nindex f6577046442a..8c5af213d6d0 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]] RKISP1FrameContext &frameContext,\n \t\t\t const ControlList &controls)\n {\n \tauto &filter = context.activeState.filter;\ndiff --git a/src/ipa/rkisp1/algorithms/filter.h b/src/ipa/rkisp1/algorithms/filter.h\nindex 1fbe785a3cab..b10efa208a48 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 RKISP1FrameContext &frameContext,\n \t\t\t const ControlList &controls) override;\n \tvoid prepare(IPAContext &context, unsigned int frame,\n \t\t RKISP1FrameContext &frameContext,\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 9af8217c3b8a..548bbd202cfb 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -296,8 +296,10 @@ void IPARkISP1::unmapBuffers(const std::vector &ids)\n \n void IPARkISP1::queueRequest(const uint32_t frame, const ControlList &controls)\n {\n+\tRKISP1FrameContext &frameContext = context_.frameContexts.initialise(frame);\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","v2","10/10"]}