Patch Detail
Show a patch.
GET /api/1.1/patches/13198/?format=api
{ "id": 13198, "url": "https://patchwork.libcamera.org/api/1.1/patches/13198/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13198/", "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": "<20210804124314.8044-4-laurent.pinchart@ideasonboard.com>", "date": "2021-08-04T12:43:09", "name": "[libcamera-devel,v3,3/8] cam: Turn BufferWriter into a FrameSink", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c4e05486841256a3c6676efc0fcf51a410387e01", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13198/mbox/", "series": [ { "id": 2303, "url": "https://patchwork.libcamera.org/api/1.1/series/2303/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2303", "date": "2021-08-04T12:43:06", "name": "libcamera: Add DRM/KMS viewfinder display to cam", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2303/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13198/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13198/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id CBE91C3236\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 4 Aug 2021 12:43:35 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5291568864;\n\tWed, 4 Aug 2021 14:43:33 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D9B376880F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 4 Aug 2021 14:43:30 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7F603891\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 4 Aug 2021 14:43:30 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"rxWQV+tH\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628081010;\n\tbh=jnIVCh/flwUzBTO2THYqGdu5Q93/IXVv6jILDZLUldA=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=rxWQV+tHS4nmQEaiLOBK2Brr3jd33lxLZ+RNmRh1IJqNB0yv6VCzFYmJl9Q3Ns4Dw\n\teUr8LRZ9hEdJrqpp74+LjMxHmu5qt1bXZD+MI4fqEcVRIafD3ob4bvvUl6FIXMHyxQ\n\tpwvWm9u9V6vVzWesVolC9QRbITZdlhJwZP9uSlLk=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 4 Aug 2021 15:43:09 +0300", "Message-Id": "<20210804124314.8044-4-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210804124314.8044-1-laurent.pinchart@ideasonboard.com>", "References": "<20210804124314.8044-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n---\nChanges since v2:\n\n- Write all buffers\n- Fix errno printing in writeBuffer()\n\nChanges since v1:\n\n- Print message if the file can't be opened\n---\n src/cam/buffer_writer.cpp | 39 +++++++++++++++++++----\n src/cam/buffer_writer.h | 17 +++++++---\n src/cam/camera_session.cpp | 64 ++++++++++++++++++++++++++++++++------\n src/cam/camera_session.h | 6 ++--\n 4 files changed, 104 insertions(+), 22 deletions(-)", "diff": "diff --git a/src/cam/buffer_writer.cpp b/src/cam/buffer_writer.cpp\nindex a7648a92fc92..2f4b2b02d3cb 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,15 @@ void BufferWriter::mapBuffer(FrameBuffer *buffer)\n \t}\n }\n \n-int BufferWriter::write(FrameBuffer *buffer, const std::string &streamName)\n+bool BufferWriter::processRequest(Request *request)\n+{\n+\tfor (auto [stream, buffer] : request->buffers())\n+\t\twriteBuffer(stream, buffer);\n+\n+\treturn true;\n+}\n+\n+void BufferWriter::writeBuffer(const Stream *stream, FrameBuffer *buffer)\n {\n \tstd::string filename;\n \tsize_t pos;\n@@ -58,7 +83,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@@ -66,8 +91,12 @@ int BufferWriter::write(FrameBuffer *buffer, const std::string &streamName)\n \tfd = open(filename.c_str(), O_CREAT | O_WRONLY |\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+\tif (fd == -1) {\n+\t\tret = -errno;\n+\t\tstd::cerr << \"failed to open file \" << filename << \": \"\n+\t\t\t << strerror(-ret) << std::endl;\n+\t\treturn;\n+\t}\n \n \tfor (unsigned int i = 0; i < buffer->planes().size(); ++i) {\n \t\tconst FrameBuffer::Plane &plane = buffer->planes()[i];\n@@ -96,6 +125,4 @@ int BufferWriter::write(FrameBuffer *buffer, const std::string &streamName)\n \t}\n \n \tclose(fd);\n-\n-\treturn ret;\n }\ndiff --git a/src/cam/buffer_writer.h b/src/cam/buffer_writer.h\nindex 7626de42d369..32bb6ed5e045 100644\n--- a/src/cam/buffer_writer.h\n+++ b/src/cam/buffer_writer.h\n@@ -10,20 +10,27 @@\n #include <map>\n #include <string>\n \n-#include <libcamera/framebuffer.h>\n+#include <libcamera/stream.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 = \"\");\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 processRequest(libcamera::Request *request) override;\n \n private:\n+\tvoid writeBuffer(const libcamera::Stream *stream,\n+\t\t\t libcamera::FrameBuffer *buffer);\n+\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/camera_session.cpp b/src/cam/camera_session.cpp\nindex 0d49fc1ade83..f91b5234a082 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -13,6 +13,7 @@\n #include <libcamera/control_ids.h>\n #include <libcamera/property_ids.h>\n \n+#include \"buffer_writer.h\"\n #include \"camera_session.h\"\n #include \"event_loop.h\"\n #include \"main.h\"\n@@ -162,9 +163,20 @@ int CameraSession::start()\n \n \tif (options_.isSet(OptFile)) {\n \t\tif (!options_[OptFile].toString().empty())\n-\t\t\twriter_ = std::make_unique<BufferWriter>(options_[OptFile]);\n+\t\t\tsink_ = std::make_unique<BufferWriter>(options_[OptFile]);\n \t\telse\n-\t\t\twriter_ = std::make_unique<BufferWriter>();\n+\t\t\tsink_ = std::make_unique<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_->requestProcessed.connect(this, &CameraSession::sinkRelease);\n \t}\n \n \tallocator_ = std::make_unique<FrameBufferAllocator>(camera_);\n@@ -178,7 +190,13 @@ void CameraSession::stop()\n \tif (ret)\n \t\tstd::cout << \"Failed to stop capture\" << std::endl;\n \n-\twriter_.reset();\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+\tsink_.reset();\n \n \trequests_.clear();\n \n@@ -227,16 +245,26 @@ int CameraSession::startCapture()\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(std::move(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@@ -245,6 +273,8 @@ int CameraSession::startCapture()\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@@ -296,6 +326,8 @@ void CameraSession::processRequest(Request *request)\n \tfps = last_ != 0 && fps ? 1000000000.0 / fps : 0.0;\n \tlast_ = ts;\n \n+\tbool requeue = true;\n+\n \tstd::stringstream info;\n \tinfo << ts / 1000000000 << \".\"\n \t << std::setw(6) << std::setfill('0') << ts / 1000 % 1000000\n@@ -304,11 +336,10 @@ void CameraSession::processRequest(Request *request)\n \tfor (auto it = buffers.begin(); it != buffers.end(); ++it) {\n \t\tconst Stream *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@@ -318,9 +349,11 @@ void CameraSession::processRequest(Request *request)\n \t\t\tif (++nplane < metadata.planes.size())\n \t\t\t\tinfo << \"/\";\n \t\t}\n+\t}\n \n-\t\tif (writer_)\n-\t\t\twriter_->write(buffer, name);\n+\tif (sink_) {\n+\t\tif (!sink_->processRequest(request))\n+\t\t\trequeue = false;\n \t}\n \n \tstd::cout << info.str() << std::endl;\n@@ -340,6 +373,19 @@ void CameraSession::processRequest(Request *request)\n \t\treturn;\n \t}\n \n+\t/*\n+\t * If the frame sink holds on the request, we'll requeue it later in the\n+\t * complete handler.\n+\t */\n+\tif (!requeue)\n+\t\treturn;\n+\n+\trequest->reuse(Request::ReuseBuffers);\n+\tcamera_->queueRequest(request);\n+}\n+\n+void CameraSession::sinkRelease(Request *request)\n+{\n \trequest->reuse(Request::ReuseBuffers);\n \tqueueRequest(request);\n }\ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex b0f50e7f998e..2ccc71977a99 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -21,9 +21,10 @@\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n-#include \"buffer_writer.h\"\n #include \"options.h\"\n \n+class FrameSink;\n+\n class CameraSession\n {\n public:\n@@ -53,13 +54,14 @@ private:\n \tint queueRequest(libcamera::Request *request);\n \tvoid requestComplete(libcamera::Request *request);\n \tvoid processRequest(libcamera::Request *request);\n+\tvoid sinkRelease(libcamera::Request *request);\n \n \tconst OptionsParser::Options &options_;\n \tstd::shared_ptr<libcamera::Camera> camera_;\n \tstd::unique_ptr<libcamera::CameraConfiguration> config_;\n \n \tstd::map<const libcamera::Stream *, std::string> streamName_;\n-\tstd::unique_ptr<BufferWriter> writer_;\n+\tstd::unique_ptr<FrameSink> sink_;\n \tunsigned int cameraIndex_;\n \n \tuint64_t last_;\n", "prefixes": [ "libcamera-devel", "v3", "3/8" ] }