From patchwork Tue May 19 03:25:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3815 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D4B1B603D6 for ; Tue, 19 May 2020 05:25:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="R8dOyCzj"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7AF0B30C for ; Tue, 19 May 2020 05:25:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1589858719; bh=l3/7Y0VQ24TJkmu2AhPJYKcG0R0h94aW+5rUePXqJ68=; h=From:To:Subject:Date:In-Reply-To:References:From; b=R8dOyCzjgGhyn460Fxh+cQQPOb0Q4TsOwXtCW0WWBZ9hU8n+RhVsEXtHkEROHu514 /ltL315Dghk9k8ywcp5ADRwqVOVFpTKjpkWThRZEgMl7c3LJQLf75+rZa81z1SvLMk 60LWiFgHYLVmmgRFIkclNi2nWkDLLGztpF+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 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: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2020 03:25:21 -0000 Rename the BufferWriter class to FileSink to establish a common naming scheme for all sinks. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/cam/capture.cpp | 6 +++--- src/cam/{buffer_writer.cpp => file_sink.cpp} | 14 +++++++------- src/cam/{buffer_writer.h => file_sink.h} | 14 +++++++------- src/cam/meson.build | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) rename src/cam/{buffer_writer.cpp => file_sink.cpp} (85%) rename src/cam/{buffer_writer.h => file_sink.h} (70%) diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp index 7fc9cba48892..6982d89fabe7 100644 --- a/src/cam/capture.cpp +++ b/src/cam/capture.cpp @@ -11,8 +11,8 @@ #include #include -#include "buffer_writer.h" #include "capture.h" +#include "file_sink.h" #include "main.h" using namespace libcamera; @@ -48,9 +48,9 @@ int Capture::run(EventLoop *loop, const OptionsParser::Options &options) if (options.isSet(OptFile)) { if (!options[OptFile].toString().empty()) - sink_ = new BufferWriter(options[OptFile]); + sink_ = new FileSink(options[OptFile]); else - sink_ = new BufferWriter(); + sink_ = new FileSink(); } if (sink_) { diff --git a/src/cam/buffer_writer.cpp b/src/cam/file_sink.cpp similarity index 85% rename from src/cam/buffer_writer.cpp rename to src/cam/file_sink.cpp index 2bec4b132155..225f3d2200c1 100644 --- a/src/cam/buffer_writer.cpp +++ b/src/cam/file_sink.cpp @@ -2,7 +2,7 @@ /* * Copyright (C) 2019, Google Inc. * - * buffer_writer.cpp - Buffer writer + * file_sink.cpp - File Sink */ #include @@ -15,16 +15,16 @@ #include -#include "buffer_writer.h" +#include "file_sink.h" using namespace libcamera; -BufferWriter::BufferWriter(const std::string &pattern) +FileSink::FileSink(const std::string &pattern) : pattern_(pattern) { } -BufferWriter::~BufferWriter() +FileSink::~FileSink() { for (auto &iter : mappedBuffers_) { void *memory = iter.second.first; @@ -34,7 +34,7 @@ BufferWriter::~BufferWriter() mappedBuffers_.clear(); } -int BufferWriter::configure(const libcamera::CameraConfiguration &config) +int FileSink::configure(const libcamera::CameraConfiguration &config) { int ret = FrameSink::configure(config); if (ret < 0) @@ -49,7 +49,7 @@ int BufferWriter::configure(const libcamera::CameraConfiguration &config) return 0; } -void BufferWriter::mapBuffer(FrameBuffer *buffer) +void FileSink::mapBuffer(FrameBuffer *buffer) { for (const FrameBuffer::Plane &plane : buffer->planes()) { void *memory = mmap(NULL, plane.length, PROT_READ, MAP_SHARED, @@ -60,7 +60,7 @@ void BufferWriter::mapBuffer(FrameBuffer *buffer) } } -bool BufferWriter::consumeBuffer(const Stream *stream, FrameBuffer *buffer) +bool FileSink::consumeBuffer(const Stream *stream, FrameBuffer *buffer) { std::string filename; size_t pos; diff --git a/src/cam/buffer_writer.h b/src/cam/file_sink.h similarity index 70% rename from src/cam/buffer_writer.h rename to src/cam/file_sink.h index 5a5b176f73d8..9d427918a785 100644 --- a/src/cam/buffer_writer.h +++ b/src/cam/file_sink.h @@ -2,10 +2,10 @@ /* * Copyright (C) 2019, Google Inc. * - * buffer_writer.h - Buffer writer + * file_sink.h - File Sink */ -#ifndef __CAM_BUFFER_WRITER_H__ -#define __CAM_BUFFER_WRITER_H__ +#ifndef __CAM_FILE_SINK_H__ +#define __CAM_FILE_SINK_H__ #include #include @@ -14,11 +14,11 @@ #include "frame_sink.h" -class BufferWriter : public FrameSink +class FileSink : public FrameSink { public: - BufferWriter(const std::string &pattern = "frame-#.bin"); - ~BufferWriter(); + FileSink(const std::string &pattern = "frame-#.bin"); + ~FileSink(); int configure(const libcamera::CameraConfiguration &config) override; @@ -33,4 +33,4 @@ private: std::map> mappedBuffers_; }; -#endif /* __CAM_BUFFER_WRITER_H__ */ +#endif /* __CAM_FILE_SINK_H__ */ diff --git a/src/cam/meson.build b/src/cam/meson.build index d7b72ec02f8c..6ba49e82fbd1 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -1,9 +1,9 @@ # SPDX-License-Identifier: CC0-1.0 cam_sources = files([ - 'buffer_writer.cpp', 'capture.cpp', 'event_loop.cpp', + 'file_sink.cpp', 'frame_sink.cpp', 'main.cpp', 'options.cpp',