From patchwork Fri Jul 30 01:03:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 13150 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 0F09FC3232 for ; Fri, 30 Jul 2021 01:03:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A70F5687C6; Fri, 30 Jul 2021 03:03:26 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="l+FJKWBX"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EBBC7687BE for ; Fri, 30 Jul 2021 03:03:19 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8BE419FB for ; Fri, 30 Jul 2021 03:03:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1627606999; bh=4TzzbLhuRmMH/t9rrPRbYyzh6hWs+j/wiGBfngZFHf4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=l+FJKWBXjjTJmDiPKGC1H8RTxRAeCsEY0juyAvO8ZvnY34JqdtZXQnI9ooeXjsDXk xKgbR60WZ3siN/2e2s7zl0gOQCvprCbQGGYuk8FSdlF/6KHOOAaIb34iNulaLU3KuK iUXNaK8oEsZw2skpX2c02cFEqYCBtrj+vrw1LLc0= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 30 Jul 2021 04:03:02 +0300 Message-Id: <20210730010306.19956-5-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 Subject: [libcamera-devel] [PATCH v2 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham Reviewed-by: Umang Jain --- src/cam/camera_session.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} (89%) rename src/cam/{buffer_writer.h => file_sink.h} (69%) diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp index 465c8e24190e..4f1f9ec8eb10 100644 --- a/src/cam/camera_session.cpp +++ b/src/cam/camera_session.cpp @@ -13,9 +13,9 @@ #include #include -#include "buffer_writer.h" #include "camera_session.h" #include "event_loop.h" +#include "file_sink.h" #include "main.h" #include "stream_options.h" @@ -163,9 +163,9 @@ int CameraSession::start() if (options_.isSet(OptFile)) { if (!options_[OptFile].toString().empty()) - sink_ = std::make_unique(options_[OptFile]); + sink_ = std::make_unique(options_[OptFile]); else - sink_ = std::make_unique(); + sink_ = std::make_unique(); } if (sink_) { diff --git a/src/cam/buffer_writer.cpp b/src/cam/file_sink.cpp similarity index 89% rename from src/cam/buffer_writer.cpp rename to src/cam/file_sink.cpp index 2cf8644e843d..0ff8107c811b 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::consumeRequest(Request *request) +bool FileSink::consumeRequest(Request *request) { const Stream *stream = request->buffers().begin()->first; FrameBuffer *buffer = request->buffers().begin()->second; diff --git a/src/cam/buffer_writer.h b/src/cam/file_sink.h similarity index 69% rename from src/cam/buffer_writer.h rename to src/cam/file_sink.h index 955bc2713f4c..545b1771189a 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 = ""); - ~BufferWriter(); + FileSink(const std::string &pattern = ""); + ~FileSink(); int configure(const libcamera::CameraConfiguration &config) override; @@ -32,4 +32,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 649cc990d867..e692ea351987 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -10,9 +10,9 @@ endif cam_enabled = true cam_sources = files([ - 'buffer_writer.cpp', 'camera_session.cpp', 'event_loop.cpp', + 'file_sink.cpp', 'frame_sink.cpp', 'main.cpp', 'options.cpp',