Patch Detail
Show a patch.
GET /api/patches/12990/?format=api
{ "id": 12990, "url": "https://patchwork.libcamera.org/api/patches/12990/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12990/", "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-19-laurent.pinchart@ideasonboard.com>", "date": "2021-07-15T21:14:44", "name": "[libcamera-devel,v3,18/33] cam: Move event loop execution from CameraSession to CamApp", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "36f48e6d3fde735ab420e3196bcfb663fc5dcf3f", "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/12990/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/12990/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12990/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 3689EC322D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 15 Jul 2021 21:15:24 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id ABFAE68555;\n\tThu, 15 Jul 2021 23:15:23 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B79B968559\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 15 Jul 2021 23:15:10 +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 580B4340\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 15 Jul 2021 23:15:10 +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=\"m+qvhsWw\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626383710;\n\tbh=mJ6Mw3MY+zxfZWeHnYT7XiSA4SjTFubSC+sdmJ3J2G8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=m+qvhsWwEMLh/0f/d4Umf/vcvhTU0BJCNkFcY4MHb52gNxVz3n3zMnlLiShWCca0y\n\tH+gLieHSlabl9F1W3Ik5IiVWiqaTMg3PP3H/+b8c+XFdJA1huc2BxmoCETbGxXLxLZ\n\ty96r67FFNSlvEGE/legVjLdksWOVgktG/jWbT8mg=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 16 Jul 2021 00:14:44 +0300", "Message-Id": "<20210715211459.19373-19-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 18/33] cam: Move event loop execution\n\tfrom CameraSession to CamApp", "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": "To prepare for multiple concurrent camera sessions, move the event loop\nexec() call from the CameraSession class to the CamApp class.\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 | 43 +++++++++++++++++---------------------\n src/cam/camera_session.h | 6 ++++--\n src/cam/main.cpp | 12 ++++++++++-\n 3 files changed, 34 insertions(+), 27 deletions(-)", "diff": "diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 16c1c66a285a..b1200e60329c 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -22,11 +22,11 @@ CameraSession::CameraSession(std::shared_ptr<Camera> 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)\n+\t printMetadata_(false), allocator_(nullptr)\n {\n }\n \n-int CameraSession::run(const OptionsParser::Options &options)\n+int CameraSession::start(const OptionsParser::Options &options)\n {\n \tint ret;\n \n@@ -61,36 +61,39 @@ int CameraSession::run(const OptionsParser::Options &options)\n \t\t\twriter_ = new BufferWriter();\n \t}\n \n-\tFrameBufferAllocator *allocator = new FrameBufferAllocator(camera_);\n+\tallocator_ = new FrameBufferAllocator(camera_);\n \n-\tret = capture(allocator);\n+\treturn startCapture();\n+}\n \n-\tif (options.isSet(OptFile)) {\n-\t\tdelete writer_;\n-\t\twriter_ = nullptr;\n-\t}\n+void CameraSession::stop()\n+{\n+\tint ret = camera_->stop();\n+\tif (ret)\n+\t\tstd::cout << \"Failed to stop capture\" << std::endl;\n+\n+\tdelete writer_;\n+\twriter_ = nullptr;\n \n \trequests_.clear();\n \n-\tdelete allocator;\n-\n-\treturn ret;\n+\tdelete allocator_;\n }\n \n-int CameraSession::capture(FrameBufferAllocator *allocator)\n+int CameraSession::startCapture()\n {\n \tint ret;\n \n \t/* Identify the stream with the least number of buffers. */\n \tunsigned int nbuffers = UINT_MAX;\n \tfor (StreamConfiguration &cfg : *config_) {\n-\t\tret = allocator->allocate(cfg.stream());\n+\t\tret = allocator_->allocate(cfg.stream());\n \t\tif (ret < 0) {\n \t\t\tstd::cerr << \"Can't allocate buffers\" << std::endl;\n \t\t\treturn -ENOMEM;\n \t\t}\n \n-\t\tunsigned int allocated = allocator->buffers(cfg.stream()).size();\n+\t\tunsigned int allocated = allocator_->buffers(cfg.stream()).size();\n \t\tnbuffers = std::min(nbuffers, allocated);\n \t}\n \n@@ -109,7 +112,7 @@ int CameraSession::capture(FrameBufferAllocator *allocator)\n \t\tfor (StreamConfiguration &cfg : *config_) {\n \t\t\tStream *stream = cfg.stream();\n \t\t\tconst std::vector<std::unique_ptr<FrameBuffer>> &buffers =\n-\t\t\t\tallocator->buffers(stream);\n+\t\t\t\tallocator_->buffers(stream);\n \t\t\tconst std::unique_ptr<FrameBuffer> &buffer = buffers[i];\n \n \t\t\tret = request->addBuffer(stream, buffer.get());\n@@ -146,15 +149,7 @@ int CameraSession::capture(FrameBufferAllocator *allocator)\n \telse\n \t\tstd::cout << \"Capture until user interrupts by SIGINT\" << std::endl;\n \n-\tret = EventLoop::instance()->exec();\n-\tif (ret)\n-\t\tstd::cout << \"Failed to run capture loop\" << std::endl;\n-\n-\tret = camera_->stop();\n-\tif (ret)\n-\t\tstd::cout << \"Failed to stop capture\" << std::endl;\n-\n-\treturn ret;\n+\treturn 0;\n }\n \n int CameraSession::queueRequest(Request *request)\ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex 2728d7607db2..5131cfd48b4e 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -28,12 +28,13 @@ public:\n \tCameraSession(std::shared_ptr<libcamera::Camera> camera,\n \t\t libcamera::CameraConfiguration *config);\n \n-\tint run(const OptionsParser::Options &options);\n+\tint start(const OptionsParser::Options &options);\n+\tvoid stop();\n \n \tlibcamera::Signal<> captureDone;\n \n private:\n-\tint capture(libcamera::FrameBufferAllocator *allocator);\n+\tint startCapture();\n \n \tint queueRequest(libcamera::Request *request);\n \tvoid requestComplete(libcamera::Request *request);\n@@ -51,6 +52,7 @@ private:\n \tunsigned int captureLimit_;\n \tbool printMetadata_;\n \n+\tlibcamera::FrameBufferAllocator *allocator_;\n \tstd::vector<std::unique_ptr<libcamera::Request>> requests_;\n };\n \ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex a567a7cc7653..b13230c374ad 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -371,7 +371,17 @@ int CamApp::run()\n \tif (options_.isSet(OptCapture)) {\n \t\tCameraSession session(camera_, config_.get());\n \t\tsession.captureDone.connect(this, &CamApp::captureDone);\n-\t\treturn session.run(options_);\n+\n+\t\tret = session.start(options_);\n+\t\tif (ret) {\n+\t\t\tstd::cout << \"Failed to start camera session\" << std::endl;\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\tloop_.exec();\n+\n+\t\tsession.stop();\n+\t\treturn 0;\n \t}\n \n \tif (options_.isSet(OptMonitor)) {\n", "prefixes": [ "libcamera-devel", "v3", "18/33" ] }