Patch Detail
Show a patch.
GET /api/patches/8889/?format=api
{ "id": 8889, "url": "https://patchwork.libcamera.org/api/patches/8889/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8889/", "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": "<20200720104736.19986-18-jacopo@jmondi.org>", "date": "2020-07-20T10:47:34", "name": "[libcamera-devel,v4,17/19] libcamera: ipu3: Validate the pipe configuration", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "68c47efc234af32bb1b742d1cfd6bc8918efaf42", "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/8889/mbox/", "series": [ { "id": 1118, "url": "https://patchwork.libcamera.org/api/series/1118/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1118", "date": "2020-07-20T10:47:17", "name": "ipu3: rework pipe confiuguration", "version": 4, "mbox": "https://patchwork.libcamera.org/series/1118/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8889/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8889/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 AD21DC2E68\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 20 Jul 2020 10:44:30 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 807386081A;\n\tMon, 20 Jul 2020 12:44:30 +0200 (CEST)", "from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1E9876039F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 20 Jul 2020 12:44:27 +0200 (CEST)", "from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 5CC1E60010;\n\tMon, 20 Jul 2020 10:44:26 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 20 Jul 2020 12:47:34 +0200", "Message-Id": "<20200720104736.19986-18-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200720104736.19986-1-jacopo@jmondi.org>", "References": "<20200720104736.19986-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v4 17/19] libcamera: ipu3: Validate the\n\tpipe configuration", "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=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Collect the desired ImgU pipe configuration while assigning\nstreams in the pipeline handler validate() function and ask the\nImgUDevice class to calculate the pipe configuration parameters.\n\nIf the requested pipe configuration results in a non-valid\nconfiguration, return an error from the validate() function.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 19 +++++++++++++++++++\n 1 file changed, 19 insertions(+)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 0379fb7b92a7..5237c3b306df 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -77,6 +77,7 @@ private:\n \tconst IPU3CameraData *data_;\n \n \tStreamConfiguration cio2Configuration_;\n+\tImgUDevice::PipeConfig pipeConfig_;\n };\n \n class PipelineHandlerIPU3 : public PipelineHandler\n@@ -189,6 +190,9 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \n \tLOG(IPU3, Debug) << \"CIO2 configuration: \" << cio2Configuration_.toString();\n \n+\tImgUDevice::Pipe pipe{};\n+\tpipe.input = cio2Configuration_.size;\n+\n \t/*\n \t * Adjust the configurations if needed and assign streams while\n \t * iterating them.\n@@ -262,10 +266,15 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\t\t\tcfg->setStream(const_cast<Stream *>(&data_->outStream_));\n \t\t\t\tmainOutputAvailable = false;\n \n+\t\t\t\tpipe.output = cfg->size;\n+\t\t\t\tif (yuvCount == 1)\n+\t\t\t\t\tpipe.viewfinder = pipe.output;\n+\n \t\t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg->toString()\n \t\t\t\t\t\t << \" to the main output\";\n \t\t\t} else {\n \t\t\t\tcfg->setStream(const_cast<Stream *>(&data_->vfStream_));\n+\t\t\t\tpipe.viewfinder = cfg->size;\n \n \t\t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg->toString()\n \t\t\t\t\t\t << \" to the viewfinder output\";\n@@ -281,6 +290,16 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\t}\n \t}\n \n+\t/* Only compute the ImgU configuration if a YUV stream has been requested. */\n+\tif (yuvCount) {\n+\t\tpipeConfig_ = data_->imgu_->calculatePipeConfig(&pipe);\n+\t\tif (pipeConfig_.isNull()) {\n+\t\t\tLOG(IPU3, Error) << \"Failed to calculate pipe configuration: \"\n+\t\t\t\t\t << \"unsupported resolutions.\";\n+\t\t\treturn Invalid;\n+\t\t}\n+\t}\n+\n \treturn status;\n }\n \n", "prefixes": [ "libcamera-devel", "v4", "17/19" ] }