Patch Detail
Show a patch.
GET /api/patches/937/?format=api
{ "id": 937, "url": "https://patchwork.libcamera.org/api/patches/937/?format=api", "web_url": "https://patchwork.libcamera.org/patch/937/", "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": "<20190405235929.27987-5-niklas.soderlund@ragnatech.se>", "date": "2019-04-05T23:59:28", "name": "[libcamera-devel,v3,4/5] cam: Extend request completion handler to deal with multiple streams", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6a38f3aa3b8de3b9c904437d60090b506905db3a", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/937/mbox/", "series": [ { "id": 243, "url": "https://patchwork.libcamera.org/api/series/243/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=243", "date": "2019-04-05T23:59:24", "name": "cam: Add support to specify multiple stream configurations with roles", "version": 3, "mbox": "https://patchwork.libcamera.org/series/243/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/937/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/937/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 90261611A7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 6 Apr 2019 01:59:39 +0200 (CEST)", "from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid ddff9235-57fe-11e9-8144-0050569116f7;\n\tSat, 06 Apr 2019 01:59:37 +0200 (CEST)" ], "X-Halon-ID": "ddff9235-57fe-11e9-8144-0050569116f7", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 6 Apr 2019 01:59:28 +0200", "Message-Id": "<20190405235929.27987-5-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190405235929.27987-1-niklas.soderlund@ragnatech.se>", "References": "<20190405235929.27987-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 4/5] cam: Extend request completion\n\thandler to deal with 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": "Fri, 05 Apr 2019 23:59:40 -0000" }, "content": "The completion handler needs to handle all buffers in the request. Solve\nthis by iterating over all buffers in the completed request. The streams\nare named automatically streamX, where X is the order of how the stream\nwas passed to configureStream().\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/cam/main.cpp | 39 +++++++++++++++++++++++++++------------\n 1 file changed, 27 insertions(+), 12 deletions(-)", "diff": "diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex da05612b1c347b31..da5ca3402ce1a823 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -23,6 +23,7 @@ using namespace libcamera;\n \n OptionsParser::Options options;\n std::shared_ptr<Camera> camera;\n+std::map<Stream *, std::string> streamInfo;\n EventLoop *loop;\n BufferWriter *writer;\n \n@@ -87,9 +88,12 @@ static int prepareCameraConfig(CameraConfiguration *config)\n {\n \tstd::vector<StreamUsage> roles;\n \n+\tstreamInfo.clear();\n+\n \t/* If no configuration is provided assume a single video stream. */\n \tif (!options.isSet(OptStream)) {\n \t\t*config = camera->streamConfiguration({ Stream::VideoRecording() });\n+\t\tstreamInfo[config->front()] = \"stream0\";\n \t\treturn 0;\n \t}\n \n@@ -142,31 +146,42 @@ static int prepareCameraConfig(CameraConfiguration *config)\n \t\t\t(*config)[stream].pixelFormat = conf[\"pixelformat\"];\n \t}\n \n+\tfor (unsigned int i = 0; i < config->size(); i++)\n+\t\tstreamInfo[(*config)[i]] = \"stream\" + std::to_string(i);\n+\n \treturn 0;\n }\n \n static void requestComplete(Request *request, const std::map<Stream *, Buffer *> &buffers)\n {\n \tstatic uint64_t last = 0;\n+\tdouble fps = 0.0;\n \n \tif (request->status() == Request::RequestCancelled)\n \t\treturn;\n \n-\tBuffer *buffer = buffers.begin()->second;\n+\tfor (auto it = buffers.begin(); it != buffers.end(); ++it) {\n+\t\tStream *stream = it->first;\n+\t\tBuffer *buffer = it->second;\n+\t\tstd::string name = streamInfo[stream];\n \n-\tdouble fps = buffer->timestamp() - last;\n-\tfps = last && fps ? 1000000000.0 / fps : 0.0;\n-\tlast = buffer->timestamp();\n+\t\tif (it == buffers.begin()) {\n+\t\t\tfps = buffer->timestamp() - last;\n+\t\t\tfps = last && fps ? 1000000000.0 / fps : 0.0;\n+\t\t\tlast = buffer->timestamp();\n+\t\t}\n \n-\tstd::cout << \"seq: \" << std::setw(6) << std::setfill('0') << buffer->sequence()\n-\t\t << \" buf: \" << buffer->index()\n-\t\t << \" bytesused: \" << buffer->bytesused()\n-\t\t << \" timestamp: \" << buffer->timestamp()\n-\t\t << \" fps: \" << std::fixed << std::setprecision(2) << fps\n-\t\t << std::endl;\n+\t\tstd::cout << name << \" seq: \" << std::setw(6)\n+\t\t\t << std::setfill('0') << buffer->sequence()\n+\t\t\t << \" buf: \" << buffer->index()\n+\t\t\t << \" bytesused: \" << buffer->bytesused()\n+\t\t\t << \" timestamp: \" << buffer->timestamp()\n+\t\t\t << \" fps: \" << std::fixed << std::setprecision(2) << fps\n+\t\t\t << std::endl;\n \n-\tif (writer)\n-\t\twriter->write(buffer, \"stream0\");\n+\t\tif (writer)\n+\t\t\twriter->write(buffer, name);\n+\t}\n \n \trequest = camera->createRequest();\n \tif (!request) {\n", "prefixes": [ "libcamera-devel", "v3", "4/5" ] }