{"id":3815,"url":"https://patchwork.libcamera.org/api/patches/3815/?format=json","web_url":"https://patchwork.libcamera.org/patch/3815/","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":"<20200519032505.17307-5-laurent.pinchart@ideasonboard.com>","date":"2020-05-19T03:25:01","name":"[libcamera-devel,4/8] cam: Rename BufferWriter to FileSink","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"cc413aa91ad43840585f92edbd0fbc56094118a5","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":{"id":14,"url":"https://patchwork.libcamera.org/api/users/14/?format=json","username":"pinchartl","first_name":"Laurent","last_name":"Pinchart","email":"laurent.pinchart@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/3815/mbox/","series":[{"id":912,"url":"https://patchwork.libcamera.org/api/series/912/?format=json","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/3815/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3815/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D4B1B603D6\n\tfor ;\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 7AF0B30C\n\tfor ;\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=\"R8dOyCzj\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589858719;\n\tbh=l3/7Y0VQ24TJkmu2AhPJYKcG0R0h94aW+5rUePXqJ68=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=R8dOyCzjgGhyn460Fxh+cQQPOb0Q4TsOwXtCW0WWBZ9hU8n+RhVsEXtHkEROHu514\n\t/ltL315Dghk9k8ywcp5ADRwqVOVFpTKjpkWThRZEgMl7c3LJQLf75+rZa81z1SvLMk\n\t60LWiFgHYLVmmgRFIkclNi2nWkDLLGztpF+8+uRs=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 19 May 2020 06:25:01 +0300","Message-Id":"<20200519032505.17307-5-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 4/8] cam: Rename BufferWriter to FileSink","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","X-List-Received-Date":"Tue, 19 May 2020 03:25:21 -0000"},"content":"Rename the BufferWriter class to FileSink to establish a common naming\nscheme for all sinks.\n\nSigned-off-by: Laurent Pinchart \n---\n src/cam/capture.cpp | 6 +++---\n src/cam/{buffer_writer.cpp => file_sink.cpp} | 14 +++++++-------\n src/cam/{buffer_writer.h => file_sink.h} | 14 +++++++-------\n src/cam/meson.build | 2 +-\n 4 files changed, 18 insertions(+), 18 deletions(-)\n rename src/cam/{buffer_writer.cpp => file_sink.cpp} (85%)\n rename src/cam/{buffer_writer.h => file_sink.h} (70%)","diff":"diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\nindex 7fc9cba48892..6982d89fabe7 100644\n--- a/src/cam/capture.cpp\n+++ b/src/cam/capture.cpp\n@@ -11,8 +11,8 @@\n #include \n #include \n \n-#include \"buffer_writer.h\"\n #include \"capture.h\"\n+#include \"file_sink.h\"\n #include \"main.h\"\n \n using namespace libcamera;\n@@ -48,9 +48,9 @@ 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\tsink_ = new BufferWriter(options[OptFile]);\n+\t\t\tsink_ = new FileSink(options[OptFile]);\n \t\telse\n-\t\t\tsink_ = new BufferWriter();\n+\t\t\tsink_ = new FileSink();\n \t}\n \n \tif (sink_) {\ndiff --git a/src/cam/buffer_writer.cpp b/src/cam/file_sink.cpp\nsimilarity index 85%\nrename from src/cam/buffer_writer.cpp\nrename to src/cam/file_sink.cpp\nindex 2bec4b132155..225f3d2200c1 100644\n--- a/src/cam/buffer_writer.cpp\n+++ b/src/cam/file_sink.cpp\n@@ -2,7 +2,7 @@\n /*\n * Copyright (C) 2019, Google Inc.\n *\n- * buffer_writer.cpp - Buffer writer\n+ * file_sink.cpp - File Sink\n */\n \n #include \n@@ -15,16 +15,16 @@\n \n #include \n \n-#include \"buffer_writer.h\"\n+#include \"file_sink.h\"\n \n using namespace libcamera;\n \n-BufferWriter::BufferWriter(const std::string &pattern)\n+FileSink::FileSink(const std::string &pattern)\n \t: pattern_(pattern)\n {\n }\n \n-BufferWriter::~BufferWriter()\n+FileSink::~FileSink()\n {\n \tfor (auto &iter : mappedBuffers_) {\n \t\tvoid *memory = iter.second.first;\n@@ -34,7 +34,7 @@ BufferWriter::~BufferWriter()\n \tmappedBuffers_.clear();\n }\n \n-int BufferWriter::configure(const libcamera::CameraConfiguration &config)\n+int FileSink::configure(const libcamera::CameraConfiguration &config)\n {\n \tint ret = FrameSink::configure(config);\n \tif (ret < 0)\n@@ -49,7 +49,7 @@ int BufferWriter::configure(const libcamera::CameraConfiguration &config)\n \treturn 0;\n }\n \n-void BufferWriter::mapBuffer(FrameBuffer *buffer)\n+void FileSink::mapBuffer(FrameBuffer *buffer)\n {\n \tfor (const FrameBuffer::Plane &plane : buffer->planes()) {\n \t\tvoid *memory = mmap(NULL, plane.length, PROT_READ, MAP_SHARED,\n@@ -60,7 +60,7 @@ void BufferWriter::mapBuffer(FrameBuffer *buffer)\n \t}\n }\n \n-bool BufferWriter::consumeBuffer(const Stream *stream, FrameBuffer *buffer)\n+bool FileSink::consumeBuffer(const Stream *stream, FrameBuffer *buffer)\n {\n \tstd::string filename;\n \tsize_t pos;\ndiff --git a/src/cam/buffer_writer.h b/src/cam/file_sink.h\nsimilarity index 70%\nrename from src/cam/buffer_writer.h\nrename to src/cam/file_sink.h\nindex 5a5b176f73d8..9d427918a785 100644\n--- a/src/cam/buffer_writer.h\n+++ b/src/cam/file_sink.h\n@@ -2,10 +2,10 @@\n /*\n * Copyright (C) 2019, Google Inc.\n *\n- * buffer_writer.h - Buffer writer\n+ * file_sink.h - File Sink\n */\n-#ifndef __CAM_BUFFER_WRITER_H__\n-#define __CAM_BUFFER_WRITER_H__\n+#ifndef __CAM_FILE_SINK_H__\n+#define __CAM_FILE_SINK_H__\n \n #include \n #include \n@@ -14,11 +14,11 @@\n \n #include \"frame_sink.h\"\n \n-class BufferWriter : public FrameSink\n+class FileSink : public FrameSink\n {\n public:\n-\tBufferWriter(const std::string &pattern = \"frame-#.bin\");\n-\t~BufferWriter();\n+\tFileSink(const std::string &pattern = \"frame-#.bin\");\n+\t~FileSink();\n \n \tint configure(const libcamera::CameraConfiguration &config) override;\n \n@@ -33,4 +33,4 @@ private:\n \tstd::map> mappedBuffers_;\n };\n \n-#endif /* __CAM_BUFFER_WRITER_H__ */\n+#endif /* __CAM_FILE_SINK_H__ */\ndiff --git a/src/cam/meson.build b/src/cam/meson.build\nindex d7b72ec02f8c..6ba49e82fbd1 100644\n--- a/src/cam/meson.build\n+++ b/src/cam/meson.build\n@@ -1,9 +1,9 @@\n # SPDX-License-Identifier: CC0-1.0\n \n cam_sources = files([\n- 'buffer_writer.cpp',\n 'capture.cpp',\n 'event_loop.cpp',\n+ 'file_sink.cpp',\n 'frame_sink.cpp',\n 'main.cpp',\n 'options.cpp',\n","prefixes":["libcamera-devel","4/8"]}