Patch Detail
Show a patch.
GET /api/1.1/patches/12290/?format=api
{ "id": 12290, "url": "https://patchwork.libcamera.org/api/1.1/patches/12290/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12290/", "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": "<20210514075808.282479-4-umang.jain@ideasonboard.com>", "date": "2021-05-14T07:58:05", "name": "[libcamera-devel,v1,3/6] ipa: ipu3: Introduce IPAConfigInfo in IPC", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "d9338f1fc93d590d8b3a3123e3e2e2babb983df3", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/1.1/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": { "id": 12, "url": "https://patchwork.libcamera.org/api/1.1/users/12/?format=api", "username": "uajain", "first_name": "Umang", "last_name": "Jain", "email": "umang.jain@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/12290/mbox/", "series": [ { "id": 2029, "url": "https://patchwork.libcamera.org/api/1.1/series/2029/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2029", "date": "2021-05-14T07:58:02", "name": "External IPU3 IPA support", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2029/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12290/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12290/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 829B5C31F6\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 14 May 2021 07:58:29 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3FB4368919;\n\tFri, 14 May 2021 09:58: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 38F6A68918\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 14 May 2021 09:58:28 +0200 (CEST)", "from perceval.ideasonboard.com (unknown [103.251.226.50])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id ED7D69F0;\n\tFri, 14 May 2021 09:58:26 +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=\"i3KPqV4v\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1620979107;\n\tbh=wVzXWPp3/Zl4/140IaxD3MXYLIqLHEkdHvg6JqNeAPo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=i3KPqV4vREVZQPaOB584+xkniqT5riJCxM7yW9E4Dc9ORDzhZUHD20sQ6vH8zCESA\n\t+GcrKN168SUdFJzb3d8Y1i75iYal58UYya9eJrWmsTIQoKHDnjIKzrpXKyq/7z/OOp\n\t/TXVUJH8Zg+PcZL1nOygCxDOF+0qO5iy1Q9Ayfro=", "From": "Umang Jain <umang.jain@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 14 May 2021 13:28:05 +0530", "Message-Id": "<20210514075808.282479-4-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20210514075808.282479-1-umang.jain@ideasonboard.com>", "References": "<20210514075808.282479-1-umang.jain@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v1 3/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": "<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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "IPAConfigInfo is a consolidated data structure passed from IPU3\npipeline-handler to IPU3 IPA. The structure can be extended with\nadditional parameiters to accommodate the requirements of multiple\nIPU3 IPA modules for e.g., an open-source IPA (in-tree) and a closed\nsource IPA (for ChromeOS).\n\nAs usual, the documentation for .mojom files are kept in a separate\n.cpp file. Hence, create and document IPAConfigInfo in\nipu3_ipa_interface.cpp.\n\nFinally, adapt the in-tree IPU3 IPA to use IPAConfigInfo as well.\n\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n include/libcamera/ipa/ipu3.mojom | 10 ++++-\n include/libcamera/ipa/ipu3_ipa_interface.cpp | 39 ++++++++++++++++++++\n include/libcamera/ipa/meson.build | 1 +\n src/ipa/ipu3/ipu3.cpp | 14 +++----\n src/libcamera/pipeline/ipu3/ipu3.cpp | 10 +++--\n 5 files changed, 61 insertions(+), 13 deletions(-)\n create mode 100644 include/libcamera/ipa/ipu3_ipa_interface.cpp", "diff": "diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\nindex a717b1e6..22c4ce1b 100644\n--- a/include/libcamera/ipa/ipu3.mojom\n+++ b/include/libcamera/ipa/ipu3.mojom\n@@ -25,13 +25,19 @@ struct IPU3Action {\n \tlibcamera.ControlList controls;\n };\n \n+struct IPAConfigInfo {\n+\tlibcamera.IPACameraSensorInfo sensorInfo;\n+\tmap<uint32, ControlInfoMap> 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<uint32, libcamera.ControlInfoMap> entityControls,\n-\t\t libcamera.Size bdsOutputSize) => ();\n+\tconfigure(IPAConfigInfo configInfo);\n \n \tmapBuffers(array<libcamera.IPABuffer> buffers);\n \tunmapBuffers(array<uint32> ids);\ndiff --git a/include/libcamera/ipa/ipu3_ipa_interface.cpp b/include/libcamera/ipa/ipu3_ipa_interface.cpp\nnew file mode 100644\nindex 00000000..9aafbcdb\n--- /dev/null\n+++ b/include/libcamera/ipa/ipu3_ipa_interface.cpp\n@@ -0,0 +1,39 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+\n+namespace libcamera {\n+\n+/**\n+ * \\struct IPAConfigInfo\n+ * \\brief Information to be passed from IPU3 pipeline-handler to the IPA\n+ *\n+ * The IPAConfigInfo structure stores the data passed from IPU3 pipeline-handler\n+ * to the IPAIPU3Interface::configure(). The structure provides extensibility\n+ * for additional configuration data as required, for closed-source or\n+ * open-source IPAs' configure() phases.\n+ */\n+\n+/**\n+ * \\var IPAConfigInfo::sensorInfo\n+ * \\brief Camera sensor information\n+ *\n+ * \\sa IPACameraSensorInfo\n+ */\n+\n+/**\n+ * \\var IPAConfigInfo::entityControls\n+ * \\brief Controls supported by the sensor\n+ *\n+ * A map of V4L2 controls supported by the sensor in order to read or write\n+ * control values to them.\n+ */\n+\n+/**\n+ * \\var IPAConfigInfo::bdsOutputSize\n+ * \\brief Size of ImgU BDS rectangle\n+ */\n+\n+/**\n+ * \\var IPAConfigInfo::iif\n+ * \\brief Size of ImgU input-feeder rectangle\n+ */\n+} /* namespace libcamera */\ndiff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\nindex da60aa68..9684a34f 100644\n--- a/include/libcamera/ipa/meson.build\n+++ b/include/libcamera/ipa/meson.build\n@@ -10,6 +10,7 @@ libcamera_ipa_headers = files([\n \n libcamera_ipa_docs = files([\n 'core_ipa_interface.cpp',\n+ 'ipu3_ipa_interface.cpp',\n ])\n \n install_headers(libcamera_ipa_headers,\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<uint32_t, ControlInfoMap> &entityControls,\n-\t\t const Size &bdsOutputSize) override;\n+\tvoid configure(const IPAConfigInfo &configInfo) override;\n \n \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override;\n \tvoid unmapBuffers(const std::vector<unsigned int> &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<uint32_t, ControlInfoMap> &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<uint32_t, ControlInfoMap> &entityControls\n \n \tparams_ = {};\n \n-\tcalculateBdsGrid(bdsOutputSize);\n+\tcalculateBdsGrid(configInfo.bdsOutputSize);\n \n \tawbAlgo_ = std::make_unique<IPU3Awb>();\n-\tawbAlgo_->initialise(params_, bdsOutputSize, bdsGrid_);\n+\tawbAlgo_->initialise(params_, configInfo.bdsOutputSize, bdsGrid_);\n \n \tagcAlgo_ = std::make_unique<IPU3Agc>();\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<uint32_t, ControlInfoMap> 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", "v1", "3/6" ] }