Patch Detail
Show a patch.
GET /api/1.1/patches/12826/?format=api
{ "id": 12826, "url": "https://patchwork.libcamera.org/api/1.1/patches/12826/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12826/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20210707021941.20804-14-laurent.pinchart@ideasonboard.com>", "date": "2021-07-07T02:19:24", "name": "[libcamera-devel,13/30] cam: camera_session: Access event loop through global instance", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b066e1c34a78a759afa349b520a3324b43a8e1b7", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/12826/mbox/", "series": [ { "id": 2213, "url": "https://patchwork.libcamera.org/api/1.1/series/2213/?format=api", "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/12826/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12826/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 055D5C3228\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 7 Jul 2021 02:20:45 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 62DBB68541;\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 24EBF68514\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Jul 2021 04:20:36 +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 B0B1DDEF\n\tfor <libcamera-devel@lists.libcamera.org>;\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=\"HIuWvjE5\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625624435;\n\tbh=XEVUJYry8Fm6ckrZGCc20IYe2JVXI7ybn3dzBBiTwJo=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=HIuWvjE5aNXh7npRpF9tsemvuNkeLAHcxNttHsBGZ24+thYsU5yerbx1QirwuDsWR\n\t7VBZWIS4gij+FxUAbGAs3zKP8dwLWVpqDd9b3dnhlXGqb3xFPhxJtIcZKa0MoI+PJo\n\tiEC5RcpVyasoEWY4WqXNgLn80PWUJ9pb2LKvjAl8=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 7 Jul 2021 05:19:24 +0300", "Message-Id": "<20210707021941.20804-14-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 13/30] cam: camera_session: Access event\n\tloop through global instance", "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": "Don't pass the event loop to the CameraSession constructor, as passing\nthis global object explicitly isn't a design that can scale.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/camera_session.cpp | 11 ++++++-----\n src/cam/camera_session.h | 6 ++----\n src/cam/main.cpp | 2 +-\n 3 files changed, 9 insertions(+), 10 deletions(-)", "diff": "diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 439dcdb29ad7..b26c7974056d 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -13,13 +13,14 @@\n #include <libcamera/control_ids.h>\n \n #include \"camera_session.h\"\n+#include \"event_loop.h\"\n #include \"main.h\"\n \n using namespace libcamera;\n \n CameraSession::CameraSession(std::shared_ptr<Camera> camera,\n-\t\t\t CameraConfiguration *config, EventLoop *loop)\n-\t: camera_(camera), config_(config), writer_(nullptr), last_(0), loop_(loop),\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 {\n@@ -145,7 +146,7 @@ int CameraSession::capture(FrameBufferAllocator *allocator)\n \telse\n \t\tstd::cout << \"Capture until user interrupts by SIGINT\" << std::endl;\n \n-\tret = loop_->exec();\n+\tret = EventLoop::instance()->exec();\n \tif (ret)\n \t\tstd::cout << \"Failed to run capture loop\" << std::endl;\n \n@@ -175,7 +176,7 @@ void CameraSession::requestComplete(Request *request)\n \t * Defer processing of the completed request to the event loop, to avoid\n \t * blocking the camera manager thread.\n \t */\n-\tloop_->callLater([=]() { processRequest(request); });\n+\tEventLoop::instance()->callLater([=]() { processRequest(request); });\n }\n \n void CameraSession::processRequest(Request *request)\n@@ -231,7 +232,7 @@ void CameraSession::processRequest(Request *request)\n \n \tcaptureCount_++;\n \tif (captureLimit_ && captureCount_ >= captureLimit_) {\n-\t\tloop_->exit(0);\n+\t\tEventLoop::instance()->exit(0);\n \t\treturn;\n \t}\n \ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex ef8a11c3bfb4..270ba3e929e7 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -18,17 +18,16 @@\n #include <libcamera/stream.h>\n \n #include \"buffer_writer.h\"\n-#include \"event_loop.h\"\n #include \"options.h\"\n \n class CameraSession\n {\n public:\n \tCameraSession(std::shared_ptr<libcamera::Camera> camera,\n-\t\t libcamera::CameraConfiguration *config,\n-\t\t EventLoop *loop);\n+\t\t libcamera::CameraConfiguration *config);\n \n \tint run(const OptionsParser::Options &options);\n+\n private:\n \tint capture(libcamera::FrameBufferAllocator *allocator);\n \n@@ -43,7 +42,6 @@ private:\n \tBufferWriter *writer_;\n \tuint64_t last_;\n \n-\tEventLoop *loop_;\n \tunsigned int queueCount_;\n \tunsigned int captureCount_;\n \tunsigned int captureLimit_;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex f71b65a20fe2..90435206d386 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -363,7 +363,7 @@ int CamApp::run()\n \t}\n \n \tif (options_.isSet(OptCapture)) {\n-\t\tCameraSession session(camera_, config_.get(), &loop_);\n+\t\tCameraSession session(camera_, config_.get());\n \t\treturn session.run(options_);\n \t}\n \n", "prefixes": [ "libcamera-devel", "13/30" ] }