Patch Detail
Show a patch.
GET /api/patches/13931/?format=api
{ "id": 13931, "url": "https://patchwork.libcamera.org/api/patches/13931/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13931/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20210924172525.160482-2-jacopo@jmondi.org>", "date": "2021-09-24T17:25:21", "name": "[libcamera-devel,v3,1/5] libcamera: ipu3: Drop entityControls map", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d2a4005de5d20c2338b46159be864c2fa07599f3", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13931/mbox/", "series": [ { "id": 2567, "url": "https://patchwork.libcamera.org/api/series/2567/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2567", "date": "2021-09-24T17:25:20", "name": "libcamera: control serializer fixes", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2567/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13931/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13931/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 80F08BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 24 Sep 2021 17:24:46 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 59E6B69193;\n\tFri, 24 Sep 2021 19:24:46 +0200 (CEST)", "from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 68040687DD\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 24 Sep 2021 19:24:42 +0200 (CEST)", "(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 58EAA1BF204;\n\tFri, 24 Sep 2021 17:24:41 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 24 Sep 2021 19:25:21 +0200", "Message-Id": "<20210924172525.160482-2-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20210924172525.160482-1-jacopo@jmondi.org>", "References": "<20210924172525.160482-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 1/5] libcamera: ipu3: Drop\n\tentityControls map", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The IPA::configure() function has an IPAConfigInfo parameters which\ncontains a map of numerical indexes to ControlInfoMap instances.\n\nThis is a leftover of the old IPA protocol, where it was not possible to\nspecify a rich interface as it is possible today and each entity\nControlInfoMap was indexed by a numerical id and stored in a map.\n\nNow that the IPA interface allows to specify parameters by name, drop the\nmap and send the sensor's control info map only.\n\nIf we'll need more ControlInfoMap to be shared with the IPA, a new parameter\ncan be added to IPAConfigInfo.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\nReviewed-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n include/libcamera/ipa/ipu3.mojom | 2 +-\n src/ipa/ipu3/ipu3.cpp | 6 +++---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-\n 3 files changed, 5 insertions(+), 5 deletions(-)", "diff": "diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\nindex d561c2244907..2045ce909a88 100644\n--- a/include/libcamera/ipa/ipu3.mojom\n+++ b/include/libcamera/ipa/ipu3.mojom\n@@ -32,7 +32,7 @@ struct IPU3Action {\n \n struct IPAConfigInfo {\n \tlibcamera.IPACameraSensorInfo sensorInfo;\n-\tmap<uint32, libcamera.ControlInfoMap> entityControls;\n+\tlibcamera.ControlInfoMap sensorControls;\n \tlibcamera.Size bdsOutputSize;\n \tlibcamera.Size iif;\n };\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 30d2a53903ec..ac98a86b461e 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -337,14 +337,14 @@ void IPAIPU3::calculateBdsGrid(const Size &bdsOutputSize)\n \n int IPAIPU3::configure(const IPAConfigInfo &configInfo)\n {\n-\tif (configInfo.entityControls.empty()) {\n-\t\tLOG(IPAIPU3, Error) << \"No controls provided\";\n+\tif (configInfo.sensorControls.empty()) {\n+\t\tLOG(IPAIPU3, Error) << \"No sensor controls provided\";\n \t\treturn -ENODATA;\n \t}\n \n \tsensorInfo_ = configInfo.sensorInfo;\n \n-\tctrls_ = configInfo.entityControls.at(0);\n+\tctrls_ = configInfo.sensorControls;\n \n \tconst auto itExp = ctrls_.find(V4L2_CID_EXPOSURE);\n \tif (itExp == ctrls_.end()) {\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex c287bf86e79a..92e869257e53 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -654,7 +654,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t}\n \n \tipa::ipu3::IPAConfigInfo configInfo;\n-\tconfigInfo.entityControls.emplace(0, data->cio2_.sensor()->controls());\n+\tconfigInfo.sensorControls = data->cio2_.sensor()->controls();\n \tconfigInfo.sensorInfo = sensorInfo;\n \tconfigInfo.bdsOutputSize = config->imguConfig().bds;\n \tconfigInfo.iif = config->imguConfig().iif;\n", "prefixes": [ "libcamera-devel", "v3", "1/5" ] }