{"id":12115,"url":"https://patchwork.libcamera.org/api/patches/12115/?format=json","web_url":"https://patchwork.libcamera.org/patch/12115/","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":"<20210426171608.145784-1-umang.jain@ideasonboard.com>","date":"2021-04-26T17:16:08","name":"[libcamera-devel] ipa: ipu3: Introduce IPAConfigInfo in IPC","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"36a16ff18a6c77a0a2e1b67818144e7ad2da9fe6","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/12115/mbox/","series":[{"id":1979,"url":"https://patchwork.libcamera.org/api/series/1979/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1979","date":"2021-04-26T17:16:08","name":"[libcamera-devel] ipa: ipu3: Introduce IPAConfigInfo in IPC","version":1,"mbox":"https://patchwork.libcamera.org/series/1979/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12115/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12115/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 80276BDC9F\n\tfor ;\n\tMon, 26 Apr 2021 17:16:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CD8F068882;\n\tMon, 26 Apr 2021 19:16:16 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CB5FB602D1\n\tfor ;\n\tMon, 26 Apr 2021 19:16:15 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.238.109.25])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A6BE6ED;\n\tMon, 26 Apr 2021 19:16:14 +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=\"CYnDgwZA\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619457375;\n\tbh=NQ44DQpG3etwuxWa2LHGNLtZQFGXTGQia4mS3orkqpo=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=CYnDgwZAWO5kTWSPA62cX9cqMFCVdV3+QE/v4Z1q/zEz64zKsnTRDyi7l3iBcszD3\n\tPNpwh5LWE3ZYWBueZsRtQgsGwGXgvuWa75FC9tpNO1GBe9JTFR+CRB382Qs9K1nM0I\n\tj+PT1B9soYLt93bGbEqFXSqt5iNX4xJUdS7jw+r8=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 26 Apr 2021 22:46:08 +0530","Message-Id":"<20210426171608.145784-1-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.26.2","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH] ipa: ipu3: Introduce IPAConfigInfo in 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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","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. This provides a streamlined and\nextensible way to provide the configuration data to IPA interface.\n\nSigned-off-by: Umang Jain \n---\n include/libcamera/ipa/ipu3.mojom | 11 +++++++++--\n src/ipa/ipu3/ipu3.cpp | 14 ++++++--------\n src/libcamera/pipeline/ipu3/ipu3.cpp | 7 ++++++-\n 3 files changed, 21 insertions(+), 11 deletions(-)","diff":"diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\nindex a717b1e6..88cbb403 100644\n--- a/include/libcamera/ipa/ipu3.mojom\n+++ b/include/libcamera/ipa/ipu3.mojom\n@@ -25,13 +25,20 @@ struct IPU3Action {\n \tlibcamera.ControlList controls;\n };\n \n+struct IPAConfigInfo {\n+\tlibcamera.CameraSensorInfo sensorInfo;\n+\tmap entityControls;\n+\tlibcamera.Size bdsOutputSize;\n+\tlibcamera.Size iif;\n+\tlibcamera.Size cropRegion;\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..a77afd55 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 struct 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 struct 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 73306cea..be43d5a1 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -635,7 +635,12 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \n \tstd::map entityControls;\n \tentityControls.emplace(0, data->cio2_.sensor()->controls());\n-\tdata->ipa_->configure(entityControls, config->imguConfig().bds);\n+\n+\tstruct ipa::ipu3::IPAConfigInfo configInfo = {\n+\t\tsensorInfo, entityControls, config->imguConfig().bds,\n+\t\tconfig->imguConfig().iif, data->cropRegion_.size()\n+\t};\n+\tdata->ipa_->configure(configInfo);\n \n \treturn 0;\n }\n","prefixes":["libcamera-devel"]}