[{"id":18500,"web_url":"https://patchwork.libcamera.org/comment/18500/","msgid":"<20210803061806.GW2167@pyrite.rasen.tech>","date":"2021-08-03T06:18:06","subject":"Re: [libcamera-devel] [PATCH v2 4/8] cam: Rename BufferWriter to\n\tFileSink","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Laurent,\n\nOn Fri, Jul 30, 2021 at 04:03:02AM +0300, Laurent Pinchart wrote:\n> Rename the BufferWriter class to FileSink to establish a common naming\n> scheme for all sinks.\n> \n> Signed-off-by: Laurent Pinchart \n> Reviewed-by: Niklas Söderlund \n\nReviewed-by: Paul Elder \n\n> ---\n> src/cam/camera_session.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} (89%)\n> rename src/cam/{buffer_writer.h => file_sink.h} (69%)\n> \n> diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\n> index 465c8e24190e..4f1f9ec8eb10 100644\n> --- a/src/cam/camera_session.cpp\n> +++ b/src/cam/camera_session.cpp\n> @@ -13,9 +13,9 @@\n> #include \n> #include \n> \n> -#include \"buffer_writer.h\"\n> #include \"camera_session.h\"\n> #include \"event_loop.h\"\n> +#include \"file_sink.h\"\n> #include \"main.h\"\n> #include \"stream_options.h\"\n> \n> @@ -163,9 +163,9 @@ int CameraSession::start()\n> \n> \tif (options_.isSet(OptFile)) {\n> \t\tif (!options_[OptFile].toString().empty())\n> -\t\t\tsink_ = std::make_unique(options_[OptFile]);\n> +\t\t\tsink_ = std::make_unique(options_[OptFile]);\n> \t\telse\n> -\t\t\tsink_ = std::make_unique();\n> +\t\t\tsink_ = std::make_unique();\n> \t}\n> \n> \tif (sink_) {\n> diff --git a/src/cam/buffer_writer.cpp b/src/cam/file_sink.cpp\n> similarity index 89%\n> rename from src/cam/buffer_writer.cpp\n> rename to src/cam/file_sink.cpp\n> index 2cf8644e843d..0ff8107c811b 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::consumeRequest(Request *request)\n> +bool FileSink::consumeRequest(Request *request)\n> {\n> \tconst Stream *stream = request->buffers().begin()->first;\n> \tFrameBuffer *buffer = request->buffers().begin()->second;\n> diff --git a/src/cam/buffer_writer.h b/src/cam/file_sink.h\n> similarity index 69%\n> rename from src/cam/buffer_writer.h\n> rename to src/cam/file_sink.h\n> index 955bc2713f4c..545b1771189a 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 = \"\");\n> -\t~BufferWriter();\n> +\tFileSink(const std::string &pattern = \"\");\n> +\t~FileSink();\n> \n> \tint configure(const libcamera::CameraConfiguration &config) override;\n> \n> @@ -32,4 +32,4 @@ private:\n> \tstd::map> mappedBuffers_;\n> };\n> \n> -#endif /* __CAM_BUFFER_WRITER_H__ */\n> +#endif /* __CAM_FILE_SINK_H__ */\n> diff --git a/src/cam/meson.build b/src/cam/meson.build\n> index 649cc990d867..e692ea351987 100644\n> --- a/src/cam/meson.build\n> +++ b/src/cam/meson.build\n> @@ -10,9 +10,9 @@ endif\n> cam_enabled = true\n> \n> cam_sources = files([\n> - 'buffer_writer.cpp',\n> 'camera_session.cpp',\n> 'event_loop.cpp',\n> + 'file_sink.cpp',\n> 'frame_sink.cpp',\n> 'main.cpp',\n> 'options.cpp',\n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","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 29DDAC3232\n\tfor ;\n\tTue, 3 Aug 2021 06:18:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 816C3687CB;\n\tTue, 3 Aug 2021 08:18:15 +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 3924560269\n\tfor ;\n\tTue, 3 Aug 2021 08:18:14 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AECD54A3;\n\tTue, 3 Aug 2021 08:18:12 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"d49EKXfD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627971493;\n\tbh=aHCmo9NlVZ8/FOCJ6YdZQs3TVzTe/epBw+DuR4sxBb8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=d49EKXfDgShMFV/1+kmLF+98bwq31ZlpUfVeGAgS32hhl/hcaQzJiVSInnTSX4yZ+\n\toFD1pBA3RaX/WQZWhrLLlQ+E2EEA1yPQ5zvNflr3GoSaos/6ZzFNeJDbhA48PTUf+d\n\tgL1Ln5X52H5ysIqpdl2hGgW/sfYLJiHC5oz+Ja4s=","Date":"Tue, 3 Aug 2021 15:18:06 +0900","From":"paul.elder@ideasonboard.com","To":"Laurent Pinchart ","Message-ID":"<20210803061806.GW2167@pyrite.rasen.tech>","References":"<20210730010306.19956-1-laurent.pinchart@ideasonboard.com>\n\t<20210730010306.19956-5-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20210730010306.19956-5-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 4/8] cam: Rename BufferWriter to\n\tFileSink","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":18518,"web_url":"https://patchwork.libcamera.org/comment/18518/","msgid":"<34ec28ba-3f2b-f7cc-b8a4-a238bce1fcab@ideasonboard.com>","date":"2021-08-03T14:31:02","subject":"Re: [libcamera-devel] [PATCH v2 4/8] cam: Rename BufferWriter to\n\tFileSink","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 30/07/2021 02:03, Laurent Pinchart wrote:\n> Rename the BufferWriter class to FileSink to establish a common naming\n> scheme for all sinks.\n> \n> Signed-off-by: Laurent Pinchart \n> Reviewed-by: Niklas Söderlund \n\nReviewed-by: Kieran Bingham \n\n\n> ---\n> src/cam/camera_session.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} (89%)\n> rename src/cam/{buffer_writer.h => file_sink.h} (69%)\n> \n> diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\n> index 465c8e24190e..4f1f9ec8eb10 100644\n> --- a/src/cam/camera_session.cpp\n> +++ b/src/cam/camera_session.cpp\n> @@ -13,9 +13,9 @@\n> #include \n> #include \n> \n> -#include \"buffer_writer.h\"\n> #include \"camera_session.h\"\n> #include \"event_loop.h\"\n> +#include \"file_sink.h\"\n> #include \"main.h\"\n> #include \"stream_options.h\"\n> \n> @@ -163,9 +163,9 @@ int CameraSession::start()\n> \n> \tif (options_.isSet(OptFile)) {\n> \t\tif (!options_[OptFile].toString().empty())\n> -\t\t\tsink_ = std::make_unique(options_[OptFile]);\n> +\t\t\tsink_ = std::make_unique(options_[OptFile]);\n> \t\telse\n> -\t\t\tsink_ = std::make_unique();\n> +\t\t\tsink_ = std::make_unique();\n> \t}\n> \n> \tif (sink_) {\n> diff --git a/src/cam/buffer_writer.cpp b/src/cam/file_sink.cpp\n> similarity index 89%\n> rename from src/cam/buffer_writer.cpp\n> rename to src/cam/file_sink.cpp\n> index 2cf8644e843d..0ff8107c811b 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::consumeRequest(Request *request)\n> +bool FileSink::consumeRequest(Request *request)\n> {\n> \tconst Stream *stream = request->buffers().begin()->first;\n> \tFrameBuffer *buffer = request->buffers().begin()->second;\n> diff --git a/src/cam/buffer_writer.h b/src/cam/file_sink.h\n> similarity index 69%\n> rename from src/cam/buffer_writer.h\n> rename to src/cam/file_sink.h\n> index 955bc2713f4c..545b1771189a 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 = \"\");\n> -\t~BufferWriter();\n> +\tFileSink(const std::string &pattern = \"\");\n> +\t~FileSink();\n> \n> \tint configure(const libcamera::CameraConfiguration &config) override;\n> \n> @@ -32,4 +32,4 @@ private:\n> \tstd::map> mappedBuffers_;\n> };\n> \n> -#endif /* __CAM_BUFFER_WRITER_H__ */\n> +#endif /* __CAM_FILE_SINK_H__ */\n> diff --git a/src/cam/meson.build b/src/cam/meson.build\n> index 649cc990d867..e692ea351987 100644\n> --- a/src/cam/meson.build\n> +++ b/src/cam/meson.build\n> @@ -10,9 +10,9 @@ endif\n> cam_enabled = true\n> \n> cam_sources = files([\n> - 'buffer_writer.cpp',\n> 'camera_session.cpp',\n> 'event_loop.cpp',\n> + 'file_sink.cpp',\n> 'frame_sink.cpp',\n> 'main.cpp',\n> 'options.cpp',\n>","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 BFA09C3232\n\tfor ;\n\tTue, 3 Aug 2021 14:31:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 207C4687CE;\n\tTue, 3 Aug 2021 16:31:06 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 59F536026A\n\tfor ;\n\tTue, 3 Aug 2021 16:31:05 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CD8E03F0;\n\tTue, 3 Aug 2021 16:31:04 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"UL3VIm5m\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628001065;\n\tbh=ameK7QfMBT56FEwDBgOSIbuGvDxi6+eala8aoKWaF7E=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=UL3VIm5mYwmQy75csfwAMwwEG0q2ggS6k7EePxDGh0FFuOtuS2lI3o4d40EJwz9K9\n\tC5eH1gidp7qLK5fXtl6AK9FYDi9VHz28jnq14WXBgejs3wN+qziL5Y6X3fAw4H9NgG\n\t8QCv1Ms71YMoBERoCXxwn6rK0S0xUrI+79JxwIGM=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210730010306.19956-1-laurent.pinchart@ideasonboard.com>\n\t<20210730010306.19956-5-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"<34ec28ba-3f2b-f7cc-b8a4-a238bce1fcab@ideasonboard.com>","Date":"Tue, 3 Aug 2021 15:31:02 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"<20210730010306.19956-5-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH v2 4/8] cam: Rename BufferWriter to\n\tFileSink","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\" "}},{"id":18539,"web_url":"https://patchwork.libcamera.org/comment/18539/","msgid":"<05b5aa41-5322-f7e1-939e-436f351fe6e9@ideasonboard.com>","date":"2021-08-04T08:27:42","subject":"Re: [libcamera-devel] [PATCH v2 4/8] cam: Rename BufferWriter to\n\tFileSink","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 7/30/21 6:33 AM, Laurent Pinchart wrote:\n> Rename the BufferWriter class to FileSink to establish a common naming\n> scheme for all sinks.\n>\n> Signed-off-by: Laurent Pinchart \n> Reviewed-by: Niklas Söderlund \nLooks good:\nReviewed-by: Umang Jain \n> ---\n> src/cam/camera_session.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} (89%)\n> rename src/cam/{buffer_writer.h => file_sink.h} (69%)\n>\n> diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\n> index 465c8e24190e..4f1f9ec8eb10 100644\n> --- a/src/cam/camera_session.cpp\n> +++ b/src/cam/camera_session.cpp\n> @@ -13,9 +13,9 @@\n> #include \n> #include \n> \n> -#include \"buffer_writer.h\"\n> #include \"camera_session.h\"\n> #include \"event_loop.h\"\n> +#include \"file_sink.h\"\n> #include \"main.h\"\n> #include \"stream_options.h\"\n> \n> @@ -163,9 +163,9 @@ int CameraSession::start()\n> \n> \tif (options_.isSet(OptFile)) {\n> \t\tif (!options_[OptFile].toString().empty())\n> -\t\t\tsink_ = std::make_unique(options_[OptFile]);\n> +\t\t\tsink_ = std::make_unique(options_[OptFile]);\n> \t\telse\n> -\t\t\tsink_ = std::make_unique();\n> +\t\t\tsink_ = std::make_unique();\n> \t}\n> \n> \tif (sink_) {\n> diff --git a/src/cam/buffer_writer.cpp b/src/cam/file_sink.cpp\n> similarity index 89%\n> rename from src/cam/buffer_writer.cpp\n> rename to src/cam/file_sink.cpp\n> index 2cf8644e843d..0ff8107c811b 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::consumeRequest(Request *request)\n> +bool FileSink::consumeRequest(Request *request)\n> {\n> \tconst Stream *stream = request->buffers().begin()->first;\n> \tFrameBuffer *buffer = request->buffers().begin()->second;\n> diff --git a/src/cam/buffer_writer.h b/src/cam/file_sink.h\n> similarity index 69%\n> rename from src/cam/buffer_writer.h\n> rename to src/cam/file_sink.h\n> index 955bc2713f4c..545b1771189a 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 = \"\");\n> -\t~BufferWriter();\n> +\tFileSink(const std::string &pattern = \"\");\n> +\t~FileSink();\n> \n> \tint configure(const libcamera::CameraConfiguration &config) override;\n> \n> @@ -32,4 +32,4 @@ private:\n> \tstd::map> mappedBuffers_;\n> };\n> \n> -#endif /* __CAM_BUFFER_WRITER_H__ */\n> +#endif /* __CAM_FILE_SINK_H__ */\n> diff --git a/src/cam/meson.build b/src/cam/meson.build\n> index 649cc990d867..e692ea351987 100644\n> --- a/src/cam/meson.build\n> +++ b/src/cam/meson.build\n> @@ -10,9 +10,9 @@ endif\n> cam_enabled = true\n> \n> cam_sources = files([\n> - 'buffer_writer.cpp',\n> 'camera_session.cpp',\n> 'event_loop.cpp',\n> + 'file_sink.cpp',\n> 'frame_sink.cpp',\n> 'main.cpp',\n> 'options.cpp',","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 69F82C3232\n\tfor ;\n\tWed, 4 Aug 2021 08:27:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CE5C26881B;\n\tWed, 4 Aug 2021 10:27:49 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 91F9E6026C\n\tfor ;\n\tWed, 4 Aug 2021 10:27:48 +0200 (CEST)","from [192.168.1.104] (unknown [103.251.226.40])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8380124F;\n\tWed, 4 Aug 2021 10:27:47 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"OlkuMwfz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628065668;\n\tbh=qCCGd7OCpgIguRL0tYIo0U+K9KDccfkx8FTsAhWHdPs=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=OlkuMwfzHGANMEwhlJZ+IBfSdWoJuiWZcRGKrPAouGK6mCcWW5dwZZUJuXeARprRK\n\tvCtGXKkr4enCbP745VLiTIgn08yZB0uZz4fUJWFgo9qmFh24YvCVwUJMFzzrgO0IRM\n\taoInPP+1WzYJcd7azd8j+iOccwl/2GLdaTW/+FTI=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210730010306.19956-1-laurent.pinchart@ideasonboard.com>\n\t<20210730010306.19956-5-laurent.pinchart@ideasonboard.com>","From":"Umang Jain ","Message-ID":"<05b5aa41-5322-f7e1-939e-436f351fe6e9@ideasonboard.com>","Date":"Wed, 4 Aug 2021 13:57:42 +0530","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.10.2","MIME-Version":"1.0","In-Reply-To":"<20210730010306.19956-5-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8; format=flowed","Content-Transfer-Encoding":"8bit","Content-Language":"en-US","Subject":"Re: [libcamera-devel] [PATCH v2 4/8] cam: Rename BufferWriter to\n\tFileSink","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\" "}}]