{"id":12929,"url":"https://patchwork.libcamera.org/api/1.1/patches/12929/?format=json","web_url":"https://patchwork.libcamera.org/patch/12929/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210712215645.30478-17-laurent.pinchart@ideasonboard.com>","date":"2021-07-12T21:56:31","name":"[libcamera-devel,v2,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/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12929/mbox/","series":[{"id":2229,"url":"https://patchwork.libcamera.org/api/1.1/series/2229/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2229","date":"2021-07-12T21:56:15","name":"Multi-camera support in the cam application","version":2,"mbox":"https://patchwork.libcamera.org/series/2229/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12929/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12929/checks/","tags":{},"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 E6539C3226\n\tfor ;\n\tMon, 12 Jul 2021 21:57:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 608A568545;\n\tMon, 12 Jul 2021 23:57:50 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3444168547\n\tfor ;\n\tMon, 12 Jul 2021 23:57:41 +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 C36FE3F1\n\tfor ;\n\tMon, 12 Jul 2021 23:57:40 +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=\"VzEy/+Mf\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626127060;\n\tbh=tH6sCl3HLJOlhY89bsKzLByhXJgCVBhv4Mld+StTeDY=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=VzEy/+MfOy2zYEy1EAfwRMlCgC2t33an6NhqJfX5TZHGEB5VCu+mRVWAOnUyHN/Cm\n\tnWJ4VfIFGGJ40MZL75vtNSmxvoa4e4XKOZ2K1BH56JsVHqkhif9nmJawI6hhKOub0g\n\tYfNmCKf216mAAQvJVn+0hUXsdU5PU6Aeg8XGN+i8=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 13 Jul 2021 00:56:31 +0300","Message-Id":"<20210712215645.30478-17-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210712215645.30478-1-laurent.pinchart@ideasonboard.com>","References":"<20210712215645.30478-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 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":"","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\" "},"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 \nReviewed-by: Kieran Bingham \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,\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(options[OptFile]);\n \t\telse\n-\t\t\twriter_ = new BufferWriter();\n+\t\t\twriter_ = std::make_unique();\n \t}\n \n-\tallocator_ = new FrameBufferAllocator(camera_);\n+\tallocator_ = std::make_unique(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 streamName_;\n-\tBufferWriter *writer_;\n+\tstd::unique_ptr 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 allocator_;\n \tstd::vector> requests_;\n };\n \n","prefixes":["libcamera-devel","v2","16/30"]}