[{"id":18124,"web_url":"https://patchwork.libcamera.org/comment/18124/","msgid":"<14af8c68-ddc5-9ec7-4ca9-edee2d5fd6ee@ideasonboard.com>","date":"2021-07-12T15:12:31","subject":"Re: [libcamera-devel] [PATCH 12/30] cam: Rename Capture to\n\tCameraSession","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 07/07/2021 03:19, Laurent Pinchart wrote:\n> Rename the Capture class to CameraSession, to prepare for multi-camera\n> support that will gather more camera-related operations than capture in\n> that class.\n> \n> While at it, remove an unneeded blank line.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/cam/{capture.cpp => camera_session.cpp} | 21 ++++++++++-----------\n> src/cam/{capture.h => camera_session.h} | 16 ++++++++--------\n> src/cam/main.cpp | 6 +++---\n> src/cam/meson.build | 2 +-\n> 4 files changed, 22 insertions(+), 23 deletions(-)\n> rename src/cam/{capture.cpp => camera_session.cpp} (90%)\n> rename src/cam/{capture.h => camera_session.h} (77%)\n> \n> diff --git a/src/cam/capture.cpp b/src/cam/camera_session.cpp\n> similarity index 90%\n> rename from src/cam/capture.cpp\n> rename to src/cam/camera_session.cpp\n> index 3c3e3a53adf7..439dcdb29ad7 100644\n> --- a/src/cam/capture.cpp\n> +++ b/src/cam/camera_session.cpp\n> @@ -2,7 +2,7 @@\n> /*\n> * Copyright (C) 2019, Google Inc.\n> *\n> - * capture.cpp - Cam capture\n> + * camera_session.cpp - Camera capture session\n> */\n> \n> #include \n> @@ -12,20 +12,20 @@\n> \n> #include \n> \n> -#include \"capture.h\"\n> +#include \"camera_session.h\"\n> #include \"main.h\"\n> \n> using namespace libcamera;\n> \n> -Capture::Capture(std::shared_ptr camera, CameraConfiguration *config,\n> -\t\t EventLoop *loop)\n> +CameraSession::CameraSession(std::shared_ptr camera,\n> +\t\t\t CameraConfiguration *config, EventLoop *loop)\n> \t: camera_(camera), config_(config), writer_(nullptr), last_(0), loop_(loop),\n> \t queueCount_(0), captureCount_(0), captureLimit_(0),\n> \t printMetadata_(false)\n> {\n> }\n> \n> -int Capture::run(const OptionsParser::Options &options)\n> +int CameraSession::run(const OptionsParser::Options &options)\n> {\n> \tint ret;\n> \n> @@ -51,7 +51,7 @@ int Capture::run(const OptionsParser::Options &options)\n> \t\tstreamName_[cfg.stream()] = \"stream\" + std::to_string(index);\n> \t}\n> \n> -\tcamera_->requestCompleted.connect(this, &Capture::requestComplete);\n> +\tcamera_->requestCompleted.connect(this, &CameraSession::requestComplete);\n> \n> \tif (options.isSet(OptFile)) {\n> \t\tif (!options[OptFile].toString().empty())\n> @@ -60,7 +60,6 @@ int Capture::run(const OptionsParser::Options &options)\n> \t\t\twriter_ = new BufferWriter();\n> \t}\n> \n> -\n> \tFrameBufferAllocator *allocator = new FrameBufferAllocator(camera_);\n> \n> \tret = capture(allocator);\n> @@ -77,7 +76,7 @@ int Capture::run(const OptionsParser::Options &options)\n> \treturn ret;\n> }\n> \n> -int Capture::capture(FrameBufferAllocator *allocator)\n> +int CameraSession::capture(FrameBufferAllocator *allocator)\n> {\n> \tint ret;\n> \n> @@ -157,7 +156,7 @@ int Capture::capture(FrameBufferAllocator *allocator)\n> \treturn ret;\n> }\n> \n> -int Capture::queueRequest(Request *request)\n> +int CameraSession::queueRequest(Request *request)\n> {\n> \tif (captureLimit_ && queueCount_ >= captureLimit_)\n> \t\treturn 0;\n> @@ -167,7 +166,7 @@ int Capture::queueRequest(Request *request)\n> \treturn camera_->queueRequest(request);\n> }\n> \n> -void Capture::requestComplete(Request *request)\n> +void CameraSession::requestComplete(Request *request)\n> {\n> \tif (request->status() == Request::RequestCancelled)\n> \t\treturn;\n> @@ -179,7 +178,7 @@ void Capture::requestComplete(Request *request)\n> \tloop_->callLater([=]() { processRequest(request); });\n> }\n> \n> -void Capture::processRequest(Request *request)\n> +void CameraSession::processRequest(Request *request)\n> {\n> \tconst Request::BufferMap &buffers = request->buffers();\n> \n> diff --git a/src/cam/capture.h b/src/cam/camera_session.h\n> similarity index 77%\n> rename from src/cam/capture.h\n> rename to src/cam/camera_session.h\n> index de478c98e9c1..ef8a11c3bfb4 100644\n> --- a/src/cam/capture.h\n> +++ b/src/cam/camera_session.h\n> @@ -2,10 +2,10 @@\n> /*\n> * Copyright (C) 2019, Google Inc.\n> *\n> - * capture.h - Cam capture\n> + * camera_session.h - Camera capture session\n> */\n> -#ifndef __CAM_CAPTURE_H__\n> -#define __CAM_CAPTURE_H__\n> +#ifndef __CAM_CAMERA_SESSION_H__\n> +#define __CAM_CAMERA_SESSION_H__\n> \n> #include \n> #include \n> @@ -21,12 +21,12 @@\n> #include \"event_loop.h\"\n> #include \"options.h\"\n> \n> -class Capture\n> +class CameraSession\n> {\n> public:\n> -\tCapture(std::shared_ptr camera,\n> -\t\tlibcamera::CameraConfiguration *config,\n> -\t\tEventLoop *loop);\n> +\tCameraSession(std::shared_ptr camera,\n> +\t\t libcamera::CameraConfiguration *config,\n> +\t\t EventLoop *loop);\n> \n> \tint run(const OptionsParser::Options &options);\n> private:\n> @@ -52,4 +52,4 @@ private:\n> \tstd::vector> requests_;\n> };\n> \n> -#endif /* __CAM_CAPTURE_H__ */\n> +#endif /* __CAM_CAMERA_SESSION_H__ */\n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 70e9f62c7cb0..f71b65a20fe2 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -13,7 +13,7 @@\n> #include \n> #include \n> \n> -#include \"capture.h\"\n> +#include \"camera_session.h\"\n> #include \"event_loop.h\"\n> #include \"main.h\"\n> #include \"options.h\"\n> @@ -363,8 +363,8 @@ int CamApp::run()\n> \t}\n> \n> \tif (options_.isSet(OptCapture)) {\n> -\t\tCapture capture(camera_, config_.get(), &loop_);\n> -\t\treturn capture.run(options_);\n> +\t\tCameraSession session(camera_, config_.get(), &loop_);\n> +\t\treturn session.run(options_);\n> \t}\n> \n> \tif (options_.isSet(OptMonitor)) {\n> diff --git a/src/cam/meson.build b/src/cam/meson.build\n> index 6234ed0a059a..1e90ee521f74 100644\n> --- a/src/cam/meson.build\n> +++ b/src/cam/meson.build\n> @@ -11,7 +11,7 @@ cam_enabled = true\n> \n> cam_sources = files([\n> 'buffer_writer.cpp',\n> - 'capture.cpp',\n> + 'camera_session.cpp',\n> 'event_loop.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 EBC2DC3226\n\tfor ;\n\tMon, 12 Jul 2021 15:12:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7682668524;\n\tMon, 12 Jul 2021 17:12:35 +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 0219C68513\n\tfor ;\n\tMon, 12 Jul 2021 17:12:33 +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 80140CC;\n\tMon, 12 Jul 2021 17:12:33 +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=\"AdH8rdlS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626102753;\n\tbh=pANR8cq25l1wuZe5Sygd0st9H+a0TfCWG08FTJbB1M4=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=AdH8rdlSyFEHohdWsK5I2QiWVFYwi4zuTIs764WlIiGlvjRTAy79kaJ1IOFIuBsJh\n\tmpGJXccFe25yCMOAb3+UXpTWzhe9n1APPGUpgxcREJFo7EDJ2wcx6BL/TEltYDWDjG\n\tB3XkD0/+kE2MIUm+ykNRkc1QKzeuG5EsYXK6IpbQ=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>\n\t<20210707021941.20804-13-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"<14af8c68-ddc5-9ec7-4ca9-edee2d5fd6ee@ideasonboard.com>","Date":"Mon, 12 Jul 2021 16:12:31 +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":"<20210707021941.20804-13-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 12/30] cam: Rename Capture to\n\tCameraSession","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\" "}}]