[{"id":4864,"web_url":"https://patchwork.libcamera.org/comment/4864/","msgid":"<20200519143850.GO470768@oden.dyn.berto.se>","date":"2020-05-19T14:38:50","subject":"Re: [libcamera-devel] [PATCH 4/8] cam: Rename BufferWriter to\n\tFileSink","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2020-05-19 06:25:01 +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\nReviewed-by: Niklas Söderlund \n\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%)\n> \n> diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\n> index 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_) {\n> diff --git a/src/cam/buffer_writer.cpp b/src/cam/file_sink.cpp\n> similarity index 85%\n> rename from src/cam/buffer_writer.cpp\n> rename to src/cam/file_sink.cpp\n> index 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;\n> diff --git a/src/cam/buffer_writer.h b/src/cam/file_sink.h\n> similarity index 70%\n> rename from src/cam/buffer_writer.h\n> rename to src/cam/file_sink.h\n> index 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__ */\n> diff --git a/src/cam/meson.build b/src/cam/meson.build\n> index 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> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lj1-x242.google.com (mail-lj1-x242.google.com\n\t[IPv6:2a00:1450:4864:20::242])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8441F603D9\n\tfor ;\n\tTue, 19 May 2020 16:38:51 +0200 (CEST)","by mail-lj1-x242.google.com with SMTP id b6so14251ljj.1\n\tfor ;\n\tTue, 19 May 2020 07:38:51 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tu3sm9108181lfq.59.2020.05.19.07.38.50\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 19 May 2020 07:38:50 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com header.b=\"0EGgFqpp\"; \n\tdkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=Gk4Cboqvyv3N7DcaP37YonrfCrEpTcDKbYAw9ytFEUo=;\n\tb=0EGgFqppgaQef0fVVEuRV1Qe54HV8h0qnPlEw4h/kWd3fhHB/hVDHCiXLA9MNjNG7k\n\tufi3lyI1/zJkb/dazCxyW13Rjwjyf5VANxYYmZaXg+FaXdKETS1fwKijg5aWcRTGwu4h\n\tE63RBCFK+c0Tl4yfi+cTNsWk4KUSsoFh3BMownzBDJgkeWoOkXpnE4D2Pc23AREdjYqK\n\tJ0b1NbPGnWjTTNVp0mCcBatce58asjrV+Y/Yz+XsMDpiRKhQd1U511HCJPaBmDHIwwYv\n\tZvusSe3B1KgzvIY99k3F0/NtMlF90kjKUlV0L8mwiLabQkn1smiQrwXeYraQKrqwGIv6\n\tDgQw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=Gk4Cboqvyv3N7DcaP37YonrfCrEpTcDKbYAw9ytFEUo=;\n\tb=ZqffKGV+auoL2g0izTIYdPXycJ51jrphmnScKFKY9vd0ekCfpXCCwkddIp1yxLrtmt\n\tThayFTJCV3gJK7XGgPMWOl+/veJ1LaOya1foWoDyN5TUBJtuv/FxIjrqVPI+OwzoNPoK\n\teaNoJXPYPVb4YP1cNIgP970QG4Bk4sIbMZJ97vMwbKwKxJRk1wP1gbqHei5KkaBG4WMk\n\tG/UhUCypZsO/czWc9IMyIjyoMIr1QnJwlcYeiNjWQx8SbxgUH+JxFL5rxAmh/10BjCH7\n\txUHcZn6zJeHCGqeOMvICqzsew3JjD13MqUZWOCt+8d7bSDT2zRUBtN2ZavmNlsDA7bXM\n\t7bHA==","X-Gm-Message-State":"AOAM530W7OEJ37sh1CTtVZ6DafxPPUqCavZtp45PP4o42ZuFmUuLCovB\n\tM9xr0SFDQaHZ13aMjcidCCu/3OjYSn/gWw==","X-Google-Smtp-Source":"ABdhPJyIXrdS8u++tko8y3pXpDM4Lp6R30NNBq+1SMeP8b5ZuotcC0fMxrd9X3GU1RoXwiJKWeqIzw==","X-Received":"by 2002:a2e:920e:: with SMTP id\n\tk14mr14218152ljg.288.1589899130927; \n\tTue, 19 May 2020 07:38:50 -0700 (PDT)","Date":"Tue, 19 May 2020 16:38:50 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200519143850.GO470768@oden.dyn.berto.se>","References":"<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>\n\t<20200519032505.17307-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":"<20200519032505.17307-5-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 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","X-List-Received-Date":"Tue, 19 May 2020 14:38:51 -0000"}}]