Patch Detail
Show a patch.
GET /api/patches/758/?format=api
{ "id": 758, "url": "https://patchwork.libcamera.org/api/patches/758/?format=api", "web_url": "https://patchwork.libcamera.org/patch/758/", "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": "<20190320163055.22056-13-jacopo@jmondi.org>", "date": "2019-03-20T16:30:36", "name": "[libcamera-devel,v4,12/31] libcamera: ipu3: Connect CIO2 and ImgU bufferReady signals", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "132fd96e0135a70e16926e5d6977e4ba68869329", "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/758/mbox/", "series": [ { "id": 214, "url": "https://patchwork.libcamera.org/api/series/214/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=214", "date": "2019-03-20T16:30:24", "name": "libcamera: ipu3: Add ImgU support + multiple streams", "version": 4, "mbox": "https://patchwork.libcamera.org/series/214/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/758/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/758/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A3E0F611A7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 20 Mar 2019 17:30:35 +0100 (CET)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id 3C8A020000B;\n\tWed, 20 Mar 2019 16:30:35 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 20 Mar 2019 17:30:36 +0100", "Message-Id": "<20190320163055.22056-13-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190320163055.22056-1-jacopo@jmondi.org>", "References": "<20190320163055.22056-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 12/31] libcamera: ipu3: Connect CIO2\n\tand ImgU bufferReady signals", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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>", "X-List-Received-Date": "Wed, 20 Mar 2019 16:30:35 -0000" }, "content": "Connect the CIO2 output bufferRead signal to a slot that simply\nqueue the received buffer to ImgU for processing, and connect the ImgU\nmain output bufferReady signal to the cameraData slot that notifies\nto applications that a new image buffer is available.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 58 +++++++++++++++++++++++++---\n 1 file changed, 53 insertions(+), 5 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 8410e1f4b4a6..2623b2fe65f1 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -124,7 +124,9 @@ private:\n \t\t{\n \t\t}\n \n-\t\tvoid bufferReady(Buffer *buffer);\n+\t\tvoid imguOutputBufferReady(Buffer *buffer);\n+\t\tvoid imguInputBufferReady(Buffer *buffer);\n+\t\tvoid cio2BufferReady(Buffer *buffer);\n \n \t\tCIO2Device cio2;\n \t\tImgUDevice *imgu;\n@@ -398,6 +400,21 @@ int PipelineHandlerIPU3::start(Camera *camera)\n \tIPU3CameraData *data = cameraData(camera);\n \tint ret;\n \n+\t/*\n+\t * Connect video devices' 'bufferReady' signals to their slot to\n+\t * implement the image processing pipeline.\n+\t *\n+\t * Frames produced by the CIO2 unit are shared with the associated\n+\t * ImgU input where they get processed and returned through the ImgU\n+\t * main and secondary outputs.\n+\t */\n+\tdata->cio2.output->bufferReady.connect(data,\n+\t\t\t\t\t&IPU3CameraData::cio2BufferReady);\n+\tdata->imgu->input->bufferReady.connect(data,\n+\t\t\t\t\t&IPU3CameraData::imguInputBufferReady);\n+\tdata->imgu->output->bufferReady.connect(data,\n+\t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n+\n \t/*\n \t * Enqueue all available buffers to the CIO2 unit to start frame\n \t * capture. Start ImgU video devices and queue buffers to the output\n@@ -986,9 +1003,6 @@ void PipelineHandlerIPU3::registerCameras()\n \t\t\t\t\t\t\t\tcameraName,\n \t\t\t\t\t\t\t\tstreams);\n \n-\t\tcio2->output->bufferReady.connect(data.get(),\n-\t\t\t\t\t\t &IPU3CameraData::bufferReady);\n-\n \t\tregisterCamera(std::move(camera), std::move(data));\n \n \t\tLOG(IPU3, Info)\n@@ -1000,7 +1014,29 @@ void PipelineHandlerIPU3::registerCameras()\n \t}\n }\n \n-void PipelineHandlerIPU3::IPU3CameraData::bufferReady(Buffer *buffer)\n+/* ----------------------------------------------------------------------------\n+ * Buffer Ready slots\n+ */\n+\n+/**\n+ * \\brief ImgU input BufferReady slot\n+ * \\param buffer The completed buffer\n+ *\n+ * Buffer completed from the ImgU input are immediately queued back to the\n+ * CIO2 unit to continue frame capture.\n+ */\n+void PipelineHandlerIPU3::IPU3CameraData::imguInputBufferReady(Buffer *buffer)\n+{\n+\tcio2.output->queueBuffer(buffer);\n+}\n+\n+/**\n+ * \\brief ImgU output BufferReady slot\n+ * \\param buffer The completed buffer\n+ *\n+ * Buffer completed from the ImgU output are directed to the applications.\n+ */\n+void PipelineHandlerIPU3::IPU3CameraData::imguOutputBufferReady(Buffer *buffer)\n {\n \tRequest *request = queuedRequests_.front();\n \n@@ -1008,6 +1044,18 @@ void PipelineHandlerIPU3::IPU3CameraData::bufferReady(Buffer *buffer)\n \tpipe_->completeRequest(camera_, request);\n }\n \n+/**\n+ * \\brief CIO2 BufferReady slot\n+ * \\param buffer The completed buffer\n+ *\n+ * Buffer completed from the CIO2 are immediately queued to the ImgU unit\n+ * for further processing.\n+ */\n+void PipelineHandlerIPU3::IPU3CameraData::cio2BufferReady(Buffer *buffer)\n+{\n+\timgu->input->queueBuffer(buffer);\n+}\n+\n REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3);\n \n } /* namespace libcamera */\n", "prefixes": [ "libcamera-devel", "v4", "12/31" ] }