Patch Detail
Show a patch.
GET /api/1.1/patches/1069/?format=api
{ "id": 1069, "url": "https://patchwork.libcamera.org/api/1.1/patches/1069/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1069/", "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": "<20190418164638.400-5-jacopo@jmondi.org>", "date": "2019-04-18T16:46:36", "name": "[libcamera-devel,v6,4/6] libcamera: ipu3: Queue requests for multiple streams", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e3c647e31a11bdc5d9e27c1f0dee3423ddf9f621", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1069/mbox/", "series": [ { "id": 259, "url": "https://patchwork.libcamera.org/api/1.1/series/259/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=259", "date": "2019-04-18T16:46:32", "name": "libcamera: ipu3: Multiple streams support", "version": 6, "mbox": "https://patchwork.libcamera.org/series/259/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1069/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1069/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2A07560DB4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 18 Apr 2019 18:45:55 +0200 (CEST)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 803631C000D;\n\tThu, 18 Apr 2019 16:45:54 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 18 Apr 2019 18:46:36 +0200", "Message-Id": "<20190418164638.400-5-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190418164638.400-1-jacopo@jmondi.org>", "References": "<20190418164638.400-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v6 4/6] libcamera: ipu3: Queue requests\n\tfor multiple streams", "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": "Thu, 18 Apr 2019 16:45:55 -0000" }, "content": "Add support for queueing requests for multiple streams in the IPU3\npipeline handler class. The output video node should be queued with\nbuffers even if not part of the requested streams.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 23 +++++++++--------------\n 1 file changed, 9 insertions(+), 14 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex d14ba47e1c2c..8353272642bd 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -545,25 +545,20 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n \n int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n {\n-\tIPU3CameraData *data = cameraData(camera);\n-\tV4L2Device *output = data->imgu_->output_.dev;\n-\tIPU3Stream *stream = &data->outStream_;\n+\tint ret = 0;\n \n-\t/* Queue a buffer to the ImgU output for capture. */\n-\tBuffer *buffer = request->findBuffer(stream);\n-\tif (!buffer) {\n-\t\tLOG(IPU3, Error)\n-\t\t\t<< \"Attempt to queue request with invalid stream\";\n-\t\treturn -ENOENT;\n-\t}\n+\tfor (auto it : request->buffers()) {\n+\t\tIPU3Stream *stream = static_cast<IPU3Stream *>(it.first);\n+\t\tBuffer *buffer = it.second;\n \n-\tint ret = output->queueBuffer(buffer);\n-\tif (ret < 0)\n-\t\treturn ret;\n+\t\tint status = stream->device_->dev->queueBuffer(buffer);\n+\t\tif (status < 0)\n+\t\t\tret = status;\n+\t}\n \n \tPipelineHandler::queueRequest(camera, request);\n \n-\treturn 0;\n+\treturn ret;\n }\n \n bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\n", "prefixes": [ "libcamera-devel", "v6", "4/6" ] }