Patch Detail
Show a patch.
GET /api/patches/12994/?format=api
{ "id": 12994, "url": "https://patchwork.libcamera.org/api/patches/12994/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12994/", "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": "<20210715211459.19373-23-laurent.pinchart@ideasonboard.com>", "date": "2021-07-15T21:14:48", "name": "[libcamera-devel,v3,22/33] cam: Move camera acquire to the CameraSession class", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f62c244513fc58b66ea6e105e33e49a601141291", "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/12994/mbox/", "series": [ { "id": 2242, "url": "https://patchwork.libcamera.org/api/series/2242/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2242", "date": "2021-07-15T21:14:26", "name": "Multi-camera support in the cam application", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2242/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12994/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12994/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 204A4C3227\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 15 Jul 2021 21:15:27 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B135968544;\n\tThu, 15 Jul 2021 23:15:26 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 152D96855F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 15 Jul 2021 23:15:12 +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 A9FA656B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 15 Jul 2021 23:15:11 +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=\"bDtFEbSQ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626383711;\n\tbh=MhT7UvMhBXE+588XRfw+boaaODDPM6BD/Pu49EGdrcQ=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=bDtFEbSQi4an5MwfAPXEEZC4aDDelkkMrMSX/rAys7VcXzPsEVE1D+N4S4voQJjus\n\tPsaJi4cfZD5bCsGW8fTyMYVoiF+UHdAeCzTw7IeM7faQT6B6F1rvVslynMrhIXefI2\n\tMmXnj/ZotVMRZQ7PAOO3BEWeKykIJ1UF172VSi5c=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 16 Jul 2021 00:14:48 +0300", "Message-Id": "<20210715211459.19373-23-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210715211459.19373-1-laurent.pinchart@ideasonboard.com>", "References": "<20210715211459.19373-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 22/33] 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": "<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": "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 <laurent.pinchart@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\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> 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<CameraConfiguration> config =\n@@ -64,6 +83,12 @@ CameraSession::CameraSession(std::shared_ptr<Camera> 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 <libcamera/base/signal.h>\n \n #include <libcamera/camera.h>\n+#include <libcamera/camera_manager.h>\n #include <libcamera/framebuffer.h>\n #include <libcamera/framebuffer_allocator.h>\n #include <libcamera/request.h>\n@@ -25,10 +26,13 @@\n class CameraSession\n {\n public:\n-\tCameraSession(std::shared_ptr<libcamera::Camera> 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> camera_;\n \tstd::unique_ptr<CameraSession> 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<CameraSession>(camera_, options_);\n+\t\tsession_ = std::make_unique<CameraSession>(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", "v3", "22/33" ] }