{"id":13148,"url":"https://patchwork.libcamera.org/api/patches/13148/?format=json","web_url":"https://patchwork.libcamera.org/patch/13148/","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":"<20210730010306.19956-4-laurent.pinchart@ideasonboard.com>","date":"2021-07-30T01:03:01","name":"[libcamera-devel,v2,3/8] cam: Turn BufferWriter into a FrameSink","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"9672d93a794c0584102cb005b5c4d7a08f91881a","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13148/mbox/","series":[{"id":2289,"url":"https://patchwork.libcamera.org/api/series/2289/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2289","date":"2021-07-30T01:02:59","name":"libcamera: Add DRM/KMS viewfinder display to cam","version":2,"mbox":"https://patchwork.libcamera.org/series/2289/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13148/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13148/checks/","tags":{},"headers":{"Return-Path":"","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 2BE2BC3231\n\tfor ;\n\tFri, 30 Jul 2021 01:03:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E19D0687C8;\n\tFri, 30 Jul 2021 03:03:23 +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 9345F687BF\n\tfor ;\n\tFri, 30 Jul 2021 03:03:19 +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 3BCA8101E\n\tfor ;\n\tFri, 30 Jul 2021 03:03:19 +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=\"Gj9MGOSz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627606999;\n\tbh=yB7zZUjUyj0n8p1NblBiZjn+PRFy4w8j2SNWYy5fsoY=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Gj9MGOSz/Hu2p6DaJh5gZpdV6CCJBgTZXGlI7PNzNGPypAfyP2SHw4QqMeNgg448c\n\tEbeK2lxSjJy0TSoQ9Zhge0PBbbgtfg0ilziUSy36h5cM1JK8j5+4a/mcosP0tUH9IO\n\t/EdLpWiAJJjKbGnwSIh10rTtc9t6R+sCrpcg8R1c=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 30 Jul 2021 04:03:01 +0300","Message-Id":"<20210730010306.19956-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210730010306.19956-1-laurent.pinchart@ideasonboard.com>","References":"<20210730010306.19956-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \n---\nChanges since v1:\n\n- Print message if the file can't be opened\n---\n src/cam/buffer_writer.cpp | 33 +++++++++++++++++---\n src/cam/buffer_writer.h | 14 ++++++---\n src/cam/camera_session.cpp | 64 ++++++++++++++++++++++++++++++++------\n src/cam/camera_session.h | 6 ++--\n 4 files changed, 96 insertions(+), 21 deletions(-)","diff":"diff --git a/src/cam/buffer_writer.cpp b/src/cam/buffer_writer.cpp\nindex a7648a92fc92..2cf8644e843d 100644\n--- a/src/cam/buffer_writer.cpp\n+++ b/src/cam/buffer_writer.cpp\n@@ -13,6 +13,8 @@\n #include \n #include \n \n+#include \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,8 +60,11 @@ void BufferWriter::mapBuffer(FrameBuffer *buffer)\n \t}\n }\n \n-int BufferWriter::write(FrameBuffer *buffer, const std::string &streamName)\n+bool BufferWriter::consumeRequest(Request *request)\n {\n+\tconst Stream *stream = request->buffers().begin()->first;\n+\tFrameBuffer *buffer = request->buffers().begin()->second;\n+\n \tstd::string filename;\n \tsize_t pos;\n \tint fd, ret = 0;\n@@ -58,7 +78,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 +86,11 @@ 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\tstd::cerr << \"failed to open file \" << filename << \": \"\n+\t\t\t << strerror(-ret) << std::endl;\n+\t\treturn true;\n+\t}\n \n \tfor (unsigned int i = 0; i < buffer->planes().size(); ++i) {\n \t\tconst FrameBuffer::Plane &plane = buffer->planes()[i];\n@@ -97,5 +120,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 7626de42d369..955bc2713f4c 100644\n--- a/src/cam/buffer_writer.h\n+++ b/src/cam/buffer_writer.h\n@@ -10,20 +10,24 @@\n #include \n #include \n \n-#include \n+#include \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 consumeRequest(libcamera::Request *request) override;\n \n private:\n+\tstd::map streamNames_;\n \tstd::string pattern_;\n \tstd::map> mappedBuffers_;\n };\ndiff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 0d49fc1ade83..465c8e24190e 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -13,6 +13,7 @@\n #include \n #include \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(options_[OptFile]);\n+\t\t\tsink_ = std::make_unique(options_[OptFile]);\n \t\telse\n-\t\t\twriter_ = std::make_unique();\n+\t\t\tsink_ = std::make_unique();\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_->requestReleased.connect(this, &CameraSession::sinkRelease);\n \t}\n \n \tallocator_ = std::make_unique(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_->consumeRequest(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 \n #include \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 camera_;\n \tstd::unique_ptr config_;\n \n \tstd::map streamName_;\n-\tstd::unique_ptr writer_;\n+\tstd::unique_ptr sink_;\n \tunsigned int cameraIndex_;\n \n \tuint64_t last_;\n","prefixes":["libcamera-devel","v2","3/8"]}