{"id":879,"url":"https://patchwork.libcamera.org/api/patches/879/?format=json","web_url":"https://patchwork.libcamera.org/patch/879/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190403011235.12782-4-niklas.soderlund@ragnatech.se>","date":"2019-04-03T01:12:34","name":"[libcamera-devel,v2,3/4] cam: Extend request completion handler to deal with multiple streams","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2b14df5aaeff20a9605d249722fb5f96edb23bff","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/879/mbox/","series":[{"id":233,"url":"https://patchwork.libcamera.org/api/series/233/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=233","date":"2019-04-03T01:12:31","name":"cam: Add support to specify multiple stream configurations with roles","version":2,"mbox":"https://patchwork.libcamera.org/series/233/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/879/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/879/checks/","tags":{},"headers":{"Return-Path":"","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6043E610B3\n\tfor ;\n\tWed, 3 Apr 2019 03:12:49 +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 96cf1a04-55ad-11e9-8144-0050569116f7;\n\tWed, 03 Apr 2019 03:12:46 +0200 (CEST)"],"X-Halon-ID":"96cf1a04-55ad-11e9-8144-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 3 Apr 2019 03:12:34 +0200","Message-Id":"<20190403011235.12782-4-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190403011235.12782-1-niklas.soderlund@ragnatech.se>","References":"<20190403011235.12782-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 3/4] 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 03 Apr 2019 01:12:49 -0000"},"content":"The completion handler needs to handle all buffers in the request. Solve\nthis by iterating over all buffers in the completed request and assign\neach stream a name as we encounter them. The buffer writer needs to be\nextended to learn about stream names so it can prefix the files it\nwrites with it.\n\nSigned-off-by: Niklas Söderlund \n---\n src/cam/buffer_writer.cpp | 5 +++--\n src/cam/buffer_writer.h | 2 +-\n src/cam/main.cpp | 42 ++++++++++++++++++++++++++++-----------\n 3 files changed, 34 insertions(+), 15 deletions(-)","diff":"diff --git a/src/cam/buffer_writer.cpp b/src/cam/buffer_writer.cpp\nindex 2d2258b4cd1cbbc2..b82ffaded688226a 100644\n--- a/src/cam/buffer_writer.cpp\n+++ b/src/cam/buffer_writer.cpp\n@@ -19,13 +19,14 @@ BufferWriter::BufferWriter(const std::string &pattern)\n {\n }\n \n-int BufferWriter::write(libcamera::Buffer *buffer)\n+int BufferWriter::write(libcamera::Buffer *buffer,\n+\t\t\tconst std::string &streamName)\n {\n \tstd::string filename;\n \tsize_t pos;\n \tint fd, ret = 0;\n \n-\tfilename = pattern_;\n+\tfilename = streamName + \"-\" + pattern_;\n \tpos = filename.find_first_of('#');\n \tif (pos != std::string::npos) {\n \t\tstd::stringstream ss;\ndiff --git a/src/cam/buffer_writer.h b/src/cam/buffer_writer.h\nindex 9705773e0e397d45..7bf785d1e83235ff 100644\n--- a/src/cam/buffer_writer.h\n+++ b/src/cam/buffer_writer.h\n@@ -16,7 +16,7 @@ class BufferWriter\n public:\n \tBufferWriter(const std::string &pattern = \"frame-#.bin\");\n \n-\tint write(libcamera::Buffer *buffer);\n+\tint write(libcamera::Buffer *buffer, const std::string &streamName);\n \n private:\n \tstd::string pattern_;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex b47bda21cbb7f220..9af7907a3d937c28 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -145,28 +145,46 @@ static int prepareCameraConfig(std::map *config)\n \treturn 0;\n }\n \n+static std::string streamToName(const Stream *stream)\n+{\n+\tstatic std::map names;\n+\n+\tif (names.find(stream) == names.end())\n+\t\tnames[stream] = std::string(\"stream\") + std::to_string(names.size());\n+\n+\treturn names[stream];\n+}\n+\n static void requestComplete(Request *request, const std::map &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 = streamToName(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);\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","v2","3/4"]}