Patch Detail
Show a patch.
GET /api/patches/13150/?format=api
{ "id": 13150, "url": "https://patchwork.libcamera.org/api/patches/13150/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13150/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210730010306.19956-5-laurent.pinchart@ideasonboard.com>", "date": "2021-07-30T01:03:02", "name": "[libcamera-devel,v2,4/8] cam: Rename BufferWriter to FileSink", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "55d043e0026b3fb5246b0a4770caa0a3a4e11341", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13150/mbox/", "series": [ { "id": 2289, "url": "https://patchwork.libcamera.org/api/series/2289/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2289", "date": "2021-07-30T01:02:59", "name": "libcamera: Add DRM/KMS viewfinder display to cam", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2289/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13150/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13150/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 0F09FC3232\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 30 Jul 2021 01:03:27 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A70F5687C6;\n\tFri, 30 Jul 2021 03:03:26 +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 EBBC7687BE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Jul 2021 03:03:19 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8BE419FB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Jul 2021 03:03:19 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"l+FJKWBX\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627606999;\n\tbh=4TzzbLhuRmMH/t9rrPRbYyzh6hWs+j/wiGBfngZFHf4=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=l+FJKWBXjjTJmDiPKGC1H8RTxRAeCsEY0juyAvO8ZvnY34JqdtZXQnI9ooeXjsDXk\n\txKgbR60WZ3siN/2e2s7zl0gOQCvprCbQGGYuk8FSdlF/6KHOOAaIb34iNulaLU3KuK\n\tiUXNaK8oEsZw2skpX2c02cFEqYCBtrj+vrw1LLc0=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "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", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Rename the BufferWriter class to FileSink to establish a common naming\nscheme for all sinks.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\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%)", "diff": "diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 465c8e24190e..4f1f9ec8eb10 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -13,9 +13,9 @@\n #include <libcamera/control_ids.h>\n #include <libcamera/property_ids.h>\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<BufferWriter>(options_[OptFile]);\n+\t\t\tsink_ = std::make_unique<FileSink>(options_[OptFile]);\n \t\telse\n-\t\t\tsink_ = std::make_unique<BufferWriter>();\n+\t\t\tsink_ = std::make_unique<FileSink>();\n \t}\n \n \tif (sink_) {\ndiff --git a/src/cam/buffer_writer.cpp b/src/cam/file_sink.cpp\nsimilarity index 89%\nrename from src/cam/buffer_writer.cpp\nrename to src/cam/file_sink.cpp\nindex 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 <fcntl.h>\n@@ -15,16 +15,16 @@\n \n #include <libcamera/camera.h>\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;\ndiff --git a/src/cam/buffer_writer.h b/src/cam/file_sink.h\nsimilarity index 69%\nrename from src/cam/buffer_writer.h\nrename to src/cam/file_sink.h\nindex 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 <map>\n #include <string>\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<int, std::pair<void *, unsigned int>> 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 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", "prefixes": [ "libcamera-devel", "v2", "4/8" ] }