{"id":12825,"url":"https://patchwork.libcamera.org/api/1.1/patches/12825/?format=json","web_url":"https://patchwork.libcamera.org/patch/12825/","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":"<20210707021941.20804-13-laurent.pinchart@ideasonboard.com>","date":"2021-07-07T02:19:23","name":"[libcamera-devel,12/30] cam: Rename Capture to CameraSession","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6b9df29883718d155ae34e716c5f81414379c9d4","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/12825/mbox/","series":[{"id":2213,"url":"https://patchwork.libcamera.org/api/1.1/series/2213/?format=json","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/12825/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12825/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 D07B8C3227\n\tfor ;\n\tWed, 7 Jul 2021 02:20:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0BB7F6852B;\n\tWed, 7 Jul 2021 04:20:42 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E059F6851A\n\tfor ;\n\tWed, 7 Jul 2021 04:20:35 +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 5CB48DEE\n\tfor ;\n\tWed, 7 Jul 2021 04:20:35 +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=\"PcNDBqmo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625624435;\n\tbh=74Gxy3EchgCNmN7Hmxhtn6mDQuN1SrHqQgq8ZcXWR6M=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=PcNDBqmobB0Oc5LkJW6PM0+qPeXU+3q2GEfNZrLqp2FTr8fM43PC2m7U7N/CynRmo\n\tDDpzorVcyL4TzkcK9Y91x2y8QBt5OiyHd+atVz7+VNvuTAIFDXUxj0514g77PlnnzH\n\tcJWeRRdc1pqGY+swUdnKFSauqWh8rwfuPX8F2O10=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 7 Jul 2021 05:19:23 +0300","Message-Id":"<20210707021941.20804-13-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 12/30] cam: Rename Capture to CameraSession","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":"Rename the Capture class to CameraSession, to prepare for multi-camera\nsupport that will gather more camera-related operations than capture in\nthat class.\n\nWhile at it, remove an unneeded blank line.\n\nSigned-off-by: Laurent Pinchart \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%)","diff":"diff --git a/src/cam/capture.cpp b/src/cam/camera_session.cpp\nsimilarity index 90%\nrename from src/cam/capture.cpp\nrename to src/cam/camera_session.cpp\nindex 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 \ndiff --git a/src/cam/capture.h b/src/cam/camera_session.h\nsimilarity index 77%\nrename from src/cam/capture.h\nrename to src/cam/camera_session.h\nindex 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__ */\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 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)) {\ndiff --git a/src/cam/meson.build b/src/cam/meson.build\nindex 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","prefixes":["libcamera-devel","12/30"]}