{"id":12933,"url":"https://patchwork.libcamera.org/api/1.1/patches/12933/?format=json","web_url":"https://patchwork.libcamera.org/patch/12933/","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-20-laurent.pinchart@ideasonboard.com>","date":"2021-07-12T21:56:34","name":"[libcamera-devel,v2,19/30] cam: Move camera acquire to the CameraSession class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f62c244513fc58b66ea6e105e33e49a601141291","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/12933/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/12933/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12933/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 93F9FC3227\n\tfor ;\n\tMon, 12 Jul 2021 21:57:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 382AF6853B;\n\tMon, 12 Jul 2021 23:57:55 +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 2C75768524\n\tfor ;\n\tMon, 12 Jul 2021 23:57:42 +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 BF5D3CC\n\tfor ;\n\tMon, 12 Jul 2021 23:57:41 +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=\"GFkzYy1W\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626127061;\n\tbh=MhT7UvMhBXE+588XRfw+boaaODDPM6BD/Pu49EGdrcQ=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=GFkzYy1WQ8i442Q7ycHgPSRtLWjjDPy2Oq3wdI0+Do7nkzPABJtw3k2dawLYp1bpk\n\twWkov2nqRs2O/eazGFcqdBVvLBxHudvfPJS0OMZayCidN7eSUs+1iuiFa8Si0EfWTm\n\ta2wUoAW0XZDISfhqiN++Evf/LgxOOcc3G4l4wKkM=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 13 Jul 2021 00:56:34 +0300","Message-Id":"<20210712215645.30478-20-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 19/30] cam: Move camera acquire to the\n\tCameraSession class","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":"Continue moving towards making the CameraSession class the central point\nto handle a camera by moving the camera acquire operation. A new\nCameraSession::camera() function is needed to allow access to the camera\nfrom CamApp.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\n src/cam/camera_session.cpp | 29 ++++++++++++++++++++--\n src/cam/camera_session.h | 6 ++++-\n src/cam/main.cpp | 49 +++++++++-----------------------------\n 3 files changed, 43 insertions(+), 41 deletions(-)","diff":"diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex edc7205d6bda..10e66446ee67 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -19,11 +19,30 @@\n \n using namespace libcamera;\n \n-CameraSession::CameraSession(std::shared_ptr camera,\n+CameraSession::CameraSession(CameraManager *cm,\n \t\t\t const OptionsParser::Options &options)\n-\t: camera_(camera), last_(0), queueCount_(0), captureCount_(0),\n+\t: last_(0), queueCount_(0), captureCount_(0),\n \t captureLimit_(0), printMetadata_(false)\n {\n+\tconst std::string &cameraId = options[OptCamera];\n+\tchar *endptr;\n+\tunsigned long index = strtoul(cameraId.c_str(), &endptr, 10);\n+\tif (*endptr == '\\0' && index > 0 && index <= cm->cameras().size())\n+\t\tcamera_ = cm->cameras()[index - 1];\n+\telse\n+\t\tcamera_ = cm->get(cameraId);\n+\n+\tif (!camera_) {\n+\t\tstd::cerr << \"Camera \" << cameraId << \" not found\" << std::endl;\n+\t\treturn;\n+\t}\n+\n+\tif (camera_->acquire()) {\n+\t\tstd::cerr << \"Failed to acquire camera \" << cameraId\n+\t\t\t << std::endl;\n+\t\treturn;\n+\t}\n+\n \tStreamRoles roles = StreamKeyValueParser::roles(options[OptStream]);\n \n \tstd::unique_ptr config =\n@@ -64,6 +83,12 @@ CameraSession::CameraSession(std::shared_ptr camera,\n \tconfig_ = std::move(config);\n }\n \n+CameraSession::~CameraSession()\n+{\n+\tif (camera_)\n+\t\tcamera_->release();\n+}\n+\n int CameraSession::start(const OptionsParser::Options &options)\n {\n \tint ret;\ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex 39dbbdf37913..88baf9061629 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -14,6 +14,7 @@\n #include \n \n #include \n+#include \n #include \n #include \n #include \n@@ -25,10 +26,13 @@\n class CameraSession\n {\n public:\n-\tCameraSession(std::shared_ptr camera,\n+\tCameraSession(libcamera::CameraManager *cm,\n \t\t const OptionsParser::Options &options);\n+\t~CameraSession();\n \n \tbool isValid() const { return config_ != nullptr; }\n+\n+\tlibcamera::Camera *camera() { return camera_.get(); }\n \tlibcamera::CameraConfiguration *config() { return config_.get(); }\n \n \tint start(const OptionsParser::Options &options);\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 082a053efeda..8ed5e841a1e9 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -51,7 +51,6 @@ private:\n \tOptionsParser::Options options_;\n \tCameraManager *cm_;\n \n-\tstd::shared_ptr camera_;\n \tstd::unique_ptr session_;\n \n \tEventLoop loop_;\n@@ -60,7 +59,7 @@ private:\n CamApp *CamApp::app_ = nullptr;\n \n CamApp::CamApp()\n-\t: cm_(nullptr), camera_(nullptr)\n+\t: cm_(nullptr)\n {\n \tCamApp::app_ = this;\n }\n@@ -93,37 +92,16 @@ int CamApp::init(int argc, char **argv)\n \t}\n \n \tif (options_.isSet(OptCamera)) {\n-\t\tconst std::string &cameraId = options_[OptCamera];\n-\t\tchar *endptr;\n-\t\tunsigned long index = strtoul(cameraId.c_str(), &endptr, 10);\n-\t\tif (*endptr == '\\0' && index > 0 && index <= cm_->cameras().size())\n-\t\t\tcamera_ = cm_->cameras()[index - 1];\n-\t\telse\n-\t\t\tcamera_ = cm_->get(cameraId);\n-\n-\t\tif (!camera_) {\n-\t\t\tstd::cout << \"Camera \"\n-\t\t\t\t << std::string(options_[OptCamera])\n-\t\t\t\t << \" not found\" << std::endl;\n-\t\t\tcleanup();\n-\t\t\treturn -ENODEV;\n-\t\t}\n-\n-\t\tif (camera_->acquire()) {\n-\t\t\tstd::cout << \"Failed to acquire camera\" << std::endl;\n-\t\t\tcleanup();\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\n-\t\tstd::cout << \"Using camera \" << camera_->id() << std::endl;\n-\n-\t\tsession_ = std::make_unique(camera_, options_);\n+\t\tsession_ = std::make_unique(cm_, options_);\n \t\tif (!session_->isValid()) {\n \t\t\tstd::cout << \"Failed to create camera session\" << std::endl;\n \t\t\tcleanup();\n \t\t\treturn -EINVAL;\n \t\t}\n \n+\t\tstd::cout << \"Using camera \" << session_->camera()->id()\n+\t\t\t << std::endl;\n+\n \t\tsession_->captureDone.connect(this, &CamApp::captureDone);\n \t}\n \n@@ -138,11 +116,6 @@ int CamApp::init(int argc, char **argv)\n \n void CamApp::cleanup()\n {\n-\tif (camera_) {\n-\t\tcamera_->release();\n-\t\tcamera_.reset();\n-\t}\n-\n \tsession_.reset();\n \n \tcm_->stop();\n@@ -214,13 +187,13 @@ int CamApp::parseOptions(int argc, char *argv[])\n \n int CamApp::listControls()\n {\n-\tif (!camera_) {\n+\tif (!session_) {\n \t\tstd::cout << \"Cannot list controls without a camera\"\n \t\t\t << std::endl;\n \t\treturn -EINVAL;\n \t}\n \n-\tfor (const auto &ctrl : camera_->controls()) {\n+\tfor (const auto &ctrl : session_->camera()->controls()) {\n \t\tconst ControlId *id = ctrl.first;\n \t\tconst ControlInfo &info = ctrl.second;\n \n@@ -233,13 +206,13 @@ int CamApp::listControls()\n \n int CamApp::listProperties()\n {\n-\tif (!camera_) {\n+\tif (!session_) {\n \t\tstd::cout << \"Cannot list properties without a camera\"\n \t\t\t << std::endl;\n \t\treturn -EINVAL;\n \t}\n \n-\tfor (const auto &prop : camera_->properties()) {\n+\tfor (const auto &prop : session_->camera()->properties()) {\n \t\tconst ControlId *id = properties::properties.at(prop.first);\n \t\tconst ControlValue &value = prop.second;\n \n@@ -252,7 +225,7 @@ int CamApp::listProperties()\n \n int CamApp::infoConfiguration()\n {\n-\tif (!camera_) {\n+\tif (!session_) {\n \t\tstd::cout << \"Cannot print stream information without a camera\"\n \t\t\t << std::endl;\n \t\treturn -EINVAL;\n@@ -328,7 +301,7 @@ int CamApp::run()\n \t}\n \n \tif (options_.isSet(OptCapture)) {\n-\t\tif (!camera_) {\n+\t\tif (!session_) {\n \t\t\tstd::cout << \"Can't capture without a camera\" << std::endl;\n \t\t\treturn -ENODEV;\n \t\t}\n","prefixes":["libcamera-devel","v2","19/30"]}