Patch Detail
Show a patch.
GET /api/patches/12829/?format=api
{ "id": 12829, "url": "https://patchwork.libcamera.org/api/patches/12829/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12829/", "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": "<20210707021941.20804-17-laurent.pinchart@ideasonboard.com>", "date": "2021-07-07T02:19:27", "name": "[libcamera-devel,16/30] cam: camera_session: Use std::unique_ptr<> to manage class members", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b44a583094b370f44390e97fd1b6002615468e06", "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/12829/mbox/", "series": [ { "id": 2213, "url": "https://patchwork.libcamera.org/api/series/2213/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2213", "date": "2021-07-07T02:19:12", "name": "Multi-camera support in the cam application", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2213/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12829/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12829/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 3075CC3225\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 7 Jul 2021 02:20:46 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BFE1168545;\n\tWed, 7 Jul 2021 04:20:45 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 32A9968523\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Jul 2021 04:20:37 +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 C23082E4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Jul 2021 04:20:36 +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=\"T7D1Gm6i\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625624436;\n\tbh=TNBJQ7H1gudCydE7YE1DIMLhMDIjA1CN7mAyJlZtTPg=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=T7D1Gm6iEJ9Rp9BsCOM5COSBfHq3koHltM+I+a8upRSbzW2gTr9lp9mHI99O3KtUw\n\tV9o6qhpO9WdcPATS/+Ren0eniTjVYgznQf8Afh/vXpf0Npv42d/3WR/Y0GBHGR/UbF\n\t2FQc1DLz8pgsKMjMYtMYIww5gyE/aWqTDr/+dBG0=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 7 Jul 2021 05:19:27 +0300", "Message-Id": "<20210707021941.20804-17-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>", "References": "<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 16/30] cam: camera_session: Use\n\tstd::unique_ptr<> to manage class members", "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": "Store the BufferWriter and FrameBufferAllocator pointers in\nstd::unique_ptr<> instances to simplify memory management and avoid\nleaks.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/camera_session.cpp | 16 +++++++---------\n src/cam/camera_session.h | 4 ++--\n 2 files changed, 9 insertions(+), 11 deletions(-)", "diff": "diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex b1200e60329c..1fb7c1b6ad5d 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -20,9 +20,8 @@ using namespace libcamera;\n \n CameraSession::CameraSession(std::shared_ptr<Camera> camera,\n \t\t\t CameraConfiguration *config)\n-\t: camera_(camera), config_(config), writer_(nullptr), last_(0),\n-\t queueCount_(0), captureCount_(0), captureLimit_(0),\n-\t printMetadata_(false), allocator_(nullptr)\n+\t: camera_(camera), config_(config), last_(0), queueCount_(0),\n+\t captureCount_(0), captureLimit_(0), printMetadata_(false)\n {\n }\n \n@@ -56,12 +55,12 @@ int CameraSession::start(const OptionsParser::Options &options)\n \n \tif (options.isSet(OptFile)) {\n \t\tif (!options[OptFile].toString().empty())\n-\t\t\twriter_ = new BufferWriter(options[OptFile]);\n+\t\t\twriter_ = std::make_unique<BufferWriter>(options[OptFile]);\n \t\telse\n-\t\t\twriter_ = new BufferWriter();\n+\t\t\twriter_ = std::make_unique<BufferWriter>();\n \t}\n \n-\tallocator_ = new FrameBufferAllocator(camera_);\n+\tallocator_ = std::make_unique<FrameBufferAllocator>(camera_);\n \n \treturn startCapture();\n }\n@@ -72,12 +71,11 @@ void CameraSession::stop()\n \tif (ret)\n \t\tstd::cout << \"Failed to stop capture\" << std::endl;\n \n-\tdelete writer_;\n-\twriter_ = nullptr;\n+\twriter_.reset();\n \n \trequests_.clear();\n \n-\tdelete allocator_;\n+\tallocator_.reset();\n }\n \n int CameraSession::startCapture()\ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex 5131cfd48b4e..31e8d6db01d9 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -44,7 +44,7 @@ private:\n \tlibcamera::CameraConfiguration *config_;\n \n \tstd::map<const libcamera::Stream *, std::string> streamName_;\n-\tBufferWriter *writer_;\n+\tstd::unique_ptr<BufferWriter> writer_;\n \tuint64_t last_;\n \n \tunsigned int queueCount_;\n@@ -52,7 +52,7 @@ private:\n \tunsigned int captureLimit_;\n \tbool printMetadata_;\n \n-\tlibcamera::FrameBufferAllocator *allocator_;\n+\tstd::unique_ptr<libcamera::FrameBufferAllocator> allocator_;\n \tstd::vector<std::unique_ptr<libcamera::Request>> requests_;\n };\n \n", "prefixes": [ "libcamera-devel", "16/30" ] }