{"id":12382,"url":"https://patchwork.libcamera.org/api/patches/12382/?format=json","web_url":"https://patchwork.libcamera.org/patch/12382/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210524092023.91779-6-umang.jain@ideasonboard.com>","date":"2021-05-24T09:20:22","name":"[libcamera-devel,v4,5/6] ipa: ipu3: Introduce IPAConfigInfo in IPC","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4236d7a1b71b4defc4a751f5fa90969219c8adec","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12382/mbox/","series":[{"id":2053,"url":"https://patchwork.libcamera.org/api/series/2053/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2053","date":"2021-05-24T09:20:17","name":"External IPU3 IPA Support","version":4,"mbox":"https://patchwork.libcamera.org/series/2053/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12382/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12382/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 A6FBDC3200\n\tfor ;\n\tMon, 24 May 2021 09:20:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 68B266891D;\n\tMon, 24 May 2021 11:20:45 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BE40F602B1\n\tfor ;\n\tMon, 24 May 2021 11:20:44 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.251.226.203])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D765D1315;\n\tMon, 24 May 2021 11:20:42 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"d48ZpC1J\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621848044;\n\tbh=nrFmuM7lJywRiNys/ivIZk3OCn7tJujVrp9ZNhYM6XQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=d48ZpC1JizetLFEW0FCqj9ouB9oI2KZABTzQbe3zRkwDjBUssdVOtPG/U3+NsZpdL\n\tvfDWI8EC6e4TxHwhELVzkEEnwD9XBIHy2F9lWAXWwW1Rw3qDOxp5D4hOBZtHsSTXUm\n\tkIkrVq+5h3LysrfbFPNI7vO0gDd57SGOQzzYKnE0=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 24 May 2021 14:50:22 +0530","Message-Id":"<20210524092023.91779-6-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.26.2","In-Reply-To":"<20210524092023.91779-1-umang.jain@ideasonboard.com>","References":"<20210524092023.91779-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 5/6] ipa: ipu3: Introduce IPAConfigInfo\n\tin IPC","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"IPAConfigInfo is a consolidated data structure passed from IPU3\npipeline-handler to IPU3 IPA. The structure can be extended with\nadditional parameters to accommodate the requirements of multiple\nIPU3 IPA modules.\n\nAdapt the in-tree IPU3 IPA to use IPAConfigInfo as well.\n\nSigned-off-by: Umang Jain \nReviewed-by: Jacopo Mondi \nReviewed-by: Jean-Michel Hautbois \nReviewed-by: Paul Elder \nReviewed-by: Laurent Pinchart \n---\n include/libcamera/ipa/ipu3.mojom | 10 ++++++++--\n src/ipa/ipu3/ipu3.cpp | 14 ++++++--------\n src/libcamera/pipeline/ipu3/ipu3.cpp | 10 +++++++---\n 3 files changed, 21 insertions(+), 13 deletions(-)","diff":"diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\nindex 9e3cd885..6b6b431f 100644\n--- a/include/libcamera/ipa/ipu3.mojom\n+++ b/include/libcamera/ipa/ipu3.mojom\n@@ -30,13 +30,19 @@ struct IPU3Action {\n \tlibcamera.ControlList controls;\n };\n \n+struct IPAConfigInfo {\n+\tlibcamera.IPACameraSensorInfo sensorInfo;\n+\tmap entityControls;\n+\tlibcamera.Size bdsOutputSize;\n+\tlibcamera.Size iif;\n+};\n+\n interface IPAIPU3Interface {\n \tinit(libcamera.IPASettings settings) => (int32 ret);\n \tstart() => (int32 ret);\n \tstop();\n \n-\tconfigure(map entityControls,\n-\t\t libcamera.Size bdsOutputSize) => ();\n+\tconfigure(IPAConfigInfo configInfo) => ();\n \n \tmapBuffers(array buffers);\n \tunmapBuffers(array ids);\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex f5343547..769c24d3 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -43,8 +43,7 @@ public:\n \tint start() override;\n \tvoid stop() override {}\n \n-\tvoid configure(const std::map &entityControls,\n-\t\t const Size &bdsOutputSize) override;\n+\tvoid configure(const IPAConfigInfo &configInfo) override;\n \n \tvoid mapBuffers(const std::vector &buffers) override;\n \tvoid unmapBuffers(const std::vector &ids) override;\n@@ -139,13 +138,12 @@ void IPAIPU3::calculateBdsGrid(const Size &bdsOutputSize)\n \t\t\t << (int)bdsGrid_.height << \" << \" << (int)bdsGrid_.block_height_log2 << \")\";\n }\n \n-void IPAIPU3::configure(const std::map &entityControls,\n-\t\t\tconst Size &bdsOutputSize)\n+void IPAIPU3::configure(const IPAConfigInfo &configInfo)\n {\n-\tif (entityControls.empty())\n+\tif (configInfo.entityControls.empty())\n \t\treturn;\n \n-\tctrls_ = entityControls.at(0);\n+\tctrls_ = configInfo.entityControls.at(0);\n \n \tconst auto itExp = ctrls_.find(V4L2_CID_EXPOSURE);\n \tif (itExp == ctrls_.end()) {\n@@ -169,10 +167,10 @@ void IPAIPU3::configure(const std::map &entityControls\n \n \tparams_ = {};\n \n-\tcalculateBdsGrid(bdsOutputSize);\n+\tcalculateBdsGrid(configInfo.bdsOutputSize);\n \n \tawbAlgo_ = std::make_unique();\n-\tawbAlgo_->initialise(params_, bdsOutputSize, bdsGrid_);\n+\tawbAlgo_->initialise(params_, configInfo.bdsOutputSize, bdsGrid_);\n \n \tagcAlgo_ = std::make_unique();\n \tagcAlgo_->initialise(bdsGrid_);\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 98c6160f..5b15ca90 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -633,9 +633,13 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t\treturn ret;\n \t}\n \n-\tstd::map entityControls;\n-\tentityControls.emplace(0, data->cio2_.sensor()->controls());\n-\tdata->ipa_->configure(entityControls, config->imguConfig().bds);\n+\tipa::ipu3::IPAConfigInfo configInfo;\n+\tconfigInfo.entityControls.emplace(0, data->cio2_.sensor()->controls());\n+\tconfigInfo.sensorInfo = sensorInfo;\n+\tconfigInfo.bdsOutputSize = config->imguConfig().bds;\n+\tconfigInfo.iif = config->imguConfig().iif;\n+\n+\tdata->ipa_->configure(configInfo);\n \n \treturn 0;\n }\n","prefixes":["libcamera-devel","v4","5/6"]}