Patch Detail
Show a patch.
GET /api/patches/3814/?format=api
{ "id": 3814, "url": "https://patchwork.libcamera.org/api/patches/3814/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3814/", "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": "<20200519032505.17307-4-laurent.pinchart@ideasonboard.com>", "date": "2020-05-19T03:25:00", "name": "[libcamera-devel,3/8] cam: Turn BufferWriter into a FrameSink", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "edb819226417cd41f90eeae10ededfccedce38dc", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": { "id": 14, "url": "https://patchwork.libcamera.org/api/users/14/?format=api", "username": "pinchartl", "first_name": "Laurent", "last_name": "Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/3814/mbox/", "series": [ { "id": 912, "url": "https://patchwork.libcamera.org/api/series/912/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=912", "date": "2020-05-19T03:24:57", "name": "libcamera: Add DRM/KMS viewfinder display to cam", "version": 1, "mbox": "https://patchwork.libcamera.org/series/912/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3814/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3814/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8C15660E4B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 05:25:19 +0200 (CEST)", "from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2872A9CD\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 05:25:19 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"uUE7DOw9\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589858719;\n\tbh=bbo2GZaNhzdqroS5K4iCIOQID0bTa3t6YBlyQNjWN48=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=uUE7DOw9yGPR53o2YFJjaNGiJAAUyNJ7JvDSis7cCnArip2LbSO6/8vfayVr9CxMd\n\tqwiZoK6NtsdwH+6/vwu8zJEJjkSdy3NfXvFujQbRSwA2fTLbobXgrnY7BAK3ItFusA\n\tVtU9tVWvaH37/y7qH1TGt5CFLZB5RZF4TmAI8s3U=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 19 May 2020 06:25:00 +0300", "Message-Id": "<20200519032505.17307-4-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>", "References": "<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 3/8] cam: Turn BufferWriter into a\n\tFrameSink", "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>", "X-List-Received-Date": "Tue, 19 May 2020 03:25:21 -0000" }, "content": "Make the BufferWriter class inherit from FrameSink, and use the\nFrameSink API to manage it. This makes the code more generic, and will\nallow usage of other sinks.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/buffer_writer.cpp | 25 ++++++++++---\n src/cam/buffer_writer.h | 13 ++++---\n src/cam/capture.cpp | 76 ++++++++++++++++++++++++++++++++-------\n src/cam/capture.h | 6 ++--\n 4 files changed, 97 insertions(+), 23 deletions(-)", "diff": "diff --git a/src/cam/buffer_writer.cpp b/src/cam/buffer_writer.cpp\nindex c5a5eb46224a..2bec4b132155 100644\n--- a/src/cam/buffer_writer.cpp\n+++ b/src/cam/buffer_writer.cpp\n@@ -13,6 +13,8 @@\n #include <sys/mman.h>\n #include <unistd.h>\n \n+#include <libcamera/camera.h>\n+\n #include \"buffer_writer.h\"\n \n using namespace libcamera;\n@@ -32,6 +34,21 @@ BufferWriter::~BufferWriter()\n \tmappedBuffers_.clear();\n }\n \n+int BufferWriter::configure(const libcamera::CameraConfiguration &config)\n+{\n+\tint ret = FrameSink::configure(config);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tstreamNames_.clear();\n+\tfor (unsigned int index = 0; index < config.size(); ++index) {\n+\t\tconst StreamConfiguration &cfg = config.at(index);\n+\t\tstreamNames_[cfg.stream()] = \"stream\" + std::to_string(index);\n+\t}\n+\n+\treturn 0;\n+}\n+\n void BufferWriter::mapBuffer(FrameBuffer *buffer)\n {\n \tfor (const FrameBuffer::Plane &plane : buffer->planes()) {\n@@ -43,7 +60,7 @@ void BufferWriter::mapBuffer(FrameBuffer *buffer)\n \t}\n }\n \n-int BufferWriter::write(FrameBuffer *buffer, const std::string &streamName)\n+bool BufferWriter::consumeBuffer(const Stream *stream, FrameBuffer *buffer)\n {\n \tstd::string filename;\n \tsize_t pos;\n@@ -53,7 +70,7 @@ int BufferWriter::write(FrameBuffer *buffer, const std::string &streamName)\n \tpos = filename.find_first_of('#');\n \tif (pos != std::string::npos) {\n \t\tstd::stringstream ss;\n-\t\tss << streamName << \"-\" << std::setw(6)\n+\t\tss << streamNames_[stream] << \"-\" << std::setw(6)\n \t\t << std::setfill('0') << buffer->metadata().sequence;\n \t\tfilename.replace(pos, 1, ss.str());\n \t}\n@@ -62,7 +79,7 @@ int BufferWriter::write(FrameBuffer *buffer, const std::string &streamName)\n \t\t (pos == std::string::npos ? O_APPEND : O_TRUNC),\n \t\t S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);\n \tif (fd == -1)\n-\t\treturn -errno;\n+\t\treturn true;\n \n \tfor (const FrameBuffer::Plane &plane : buffer->planes()) {\n \t\tvoid *data = mappedBuffers_[plane.fd.fd()].first;\n@@ -84,5 +101,5 @@ int BufferWriter::write(FrameBuffer *buffer, const std::string &streamName)\n \n \tclose(fd);\n \n-\treturn ret;\n+\treturn true;\n }\ndiff --git a/src/cam/buffer_writer.h b/src/cam/buffer_writer.h\nindex 47e26103e13e..5a5b176f73d8 100644\n--- a/src/cam/buffer_writer.h\n+++ b/src/cam/buffer_writer.h\n@@ -12,18 +12,23 @@\n \n #include <libcamera/buffer.h>\n \n-class BufferWriter\n+#include \"frame_sink.h\"\n+\n+class BufferWriter : public FrameSink\n {\n public:\n \tBufferWriter(const std::string &pattern = \"frame-#.bin\");\n \t~BufferWriter();\n \n-\tvoid mapBuffer(libcamera::FrameBuffer *buffer);\n+\tint configure(const libcamera::CameraConfiguration &config) override;\n \n-\tint write(libcamera::FrameBuffer *buffer,\n-\t\t const std::string &streamName);\n+\tvoid mapBuffer(libcamera::FrameBuffer *buffer) override;\n+\n+\tbool consumeBuffer(const libcamera::Stream *stream,\n+\t\t\t libcamera::FrameBuffer *buffer) override;\n \n private:\n+\tstd::map<const libcamera::Stream *, std::string> streamNames_;\n \tstd::string pattern_;\n \tstd::map<int, std::pair<void *, unsigned int>> mappedBuffers_;\n };\ndiff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\nindex b7e06bcc9463..7fc9cba48892 100644\n--- a/src/cam/capture.cpp\n+++ b/src/cam/capture.cpp\n@@ -11,6 +11,7 @@\n #include <limits.h>\n #include <sstream>\n \n+#include \"buffer_writer.h\"\n #include \"capture.h\"\n #include \"main.h\"\n \n@@ -18,7 +19,7 @@ using namespace libcamera;\n \n Capture::Capture(std::shared_ptr<Camera> camera, CameraConfiguration *config,\n \t\t const StreamRoles &roles)\n-\t: camera_(camera), config_(config), roles_(roles), writer_(nullptr)\n+\t: camera_(camera), config_(config), roles_(roles), sink_(nullptr)\n {\n }\n \n@@ -47,20 +48,28 @@ int Capture::run(EventLoop *loop, const OptionsParser::Options &options)\n \n \tif (options.isSet(OptFile)) {\n \t\tif (!options[OptFile].toString().empty())\n-\t\t\twriter_ = new BufferWriter(options[OptFile]);\n+\t\t\tsink_ = new BufferWriter(options[OptFile]);\n \t\telse\n-\t\t\twriter_ = new BufferWriter();\n+\t\t\tsink_ = new BufferWriter();\n \t}\n \n+\tif (sink_) {\n+\t\tret = sink_->configure(*config_);\n+\t\tif (ret < 0) {\n+\t\t\tstd::cout << \"Failed to configure frame sink\"\n+\t\t\t\t << std::endl;\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\tsink_->bufferReleased.connect(this, &Capture::sinkRelease);\n+\t}\n \n \tFrameBufferAllocator *allocator = new FrameBufferAllocator(camera_);\n \n \tret = capture(loop, allocator);\n \n-\tif (options.isSet(OptFile)) {\n-\t\tdelete writer_;\n-\t\twriter_ = nullptr;\n-\t}\n+\tdelete sink_;\n+\tsink_ = nullptr;\n \n \tdelete allocator;\n \n@@ -110,16 +119,26 @@ int Capture::capture(EventLoop *loop, FrameBufferAllocator *allocator)\n \t\t\t\treturn ret;\n \t\t\t}\n \n-\t\t\tif (writer_)\n-\t\t\t\twriter_->mapBuffer(buffer.get());\n+\t\t\tif (sink_)\n+\t\t\t\tsink_->mapBuffer(buffer.get());\n \t\t}\n \n \t\trequests.push_back(request);\n \t}\n \n+\tif (sink_) {\n+\t\tret = sink_->start();\n+\t\tif (ret) {\n+\t\t\tstd::cout << \"Failed to start frame sink\" << std::endl;\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n \tret = camera_->start();\n \tif (ret) {\n \t\tstd::cout << \"Failed to start capture\" << std::endl;\n+\t\tif (sink_)\n+\t\t\tsink_->stop();\n \t\treturn ret;\n \t}\n \n@@ -128,6 +147,8 @@ int Capture::capture(EventLoop *loop, FrameBufferAllocator *allocator)\n \t\tif (ret < 0) {\n \t\t\tstd::cerr << \"Can't queue request\" << std::endl;\n \t\t\tcamera_->stop();\n+\t\t\tif (sink_)\n+\t\t\t\tsink_->stop();\n \t\t\treturn ret;\n \t\t}\n \t}\n@@ -141,6 +162,12 @@ int Capture::capture(EventLoop *loop, FrameBufferAllocator *allocator)\n \tif (ret)\n \t\tstd::cout << \"Failed to stop capture\" << std::endl;\n \n+\tif (sink_) {\n+\t\tret = sink_->stop();\n+\t\tif (ret)\n+\t\t\tstd::cout << \"Failed to stop frame sink\" << std::endl;\n+\t}\n+\n \treturn ret;\n }\n \n@@ -157,17 +184,18 @@ void Capture::requestComplete(Request *request)\n \t ? 1000.0 / fps : 0.0;\n \tlast_ = now;\n \n+\tbool requeue = true;\n+\n \tstd::stringstream info;\n \tinfo << \"fps: \" << std::fixed << std::setprecision(2) << fps;\n \n \tfor (auto it = buffers.begin(); it != buffers.end(); ++it) {\n \t\tStream *stream = it->first;\n \t\tFrameBuffer *buffer = it->second;\n-\t\tconst std::string &name = streamName_[stream];\n \n \t\tconst FrameMetadata &metadata = buffer->metadata();\n \n-\t\tinfo << \" \" << name\n+\t\tinfo << \" \" << streamName_[stream]\n \t\t << \" seq: \" << std::setw(6) << std::setfill('0') << metadata.sequence\n \t\t << \" bytesused: \";\n \n@@ -178,12 +206,21 @@ void Capture::requestComplete(Request *request)\n \t\t\t\tinfo << \"/\";\n \t\t}\n \n-\t\tif (writer_)\n-\t\t\twriter_->write(buffer, name);\n+\t\tif (sink_) {\n+\t\t\tif (!sink_->consumeBuffer(stream, buffer))\n+\t\t\t\trequeue = false;\n+\t\t}\n \t}\n \n \tstd::cout << info.str() << std::endl;\n \n+\t/*\n+\t * If the frame sink holds on the buffer, we'll requeue it later in the\n+\t * complete handler.\n+\t */\n+\tif (!requeue)\n+\t\treturn;\n+\n \t/*\n \t * Create a new request and populate it with one buffer for each\n \t * stream.\n@@ -203,3 +240,16 @@ void Capture::requestComplete(Request *request)\n \n \tcamera_->queueRequest(request);\n }\n+\n+void Capture::sinkRelease(libcamera::FrameBuffer *buffer)\n+{\n+\tRequest *request = camera_->createRequest();\n+\tif (!request) {\n+\t\tstd::cerr << \"Can't create request\" << std::endl;\n+\t\treturn;\n+\t}\n+\n+\trequest->addBuffer(config_->at(0).stream(), buffer);\n+\n+\tcamera_->queueRequest(request);\n+}\ndiff --git a/src/cam/capture.h b/src/cam/capture.h\nindex c0e697b831fb..3be1d98e4d3e 100644\n--- a/src/cam/capture.h\n+++ b/src/cam/capture.h\n@@ -16,10 +16,11 @@\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n-#include \"buffer_writer.h\"\n #include \"event_loop.h\"\n #include \"options.h\"\n \n+class FrameSink;\n+\n class Capture\n {\n public:\n@@ -33,13 +34,14 @@ private:\n \t\t libcamera::FrameBufferAllocator *allocator);\n \n \tvoid requestComplete(libcamera::Request *request);\n+\tvoid sinkRelease(libcamera::FrameBuffer *buffer);\n \n \tstd::shared_ptr<libcamera::Camera> camera_;\n \tlibcamera::CameraConfiguration *config_;\n \tlibcamera::StreamRoles roles_;\n \n \tstd::map<libcamera::Stream *, std::string> streamName_;\n-\tBufferWriter *writer_;\n+\tFrameSink *sink_;\n \tstd::chrono::steady_clock::time_point last_;\n };\n \n", "prefixes": [ "libcamera-devel", "3/8" ] }