Patch Detail
Show a patch.
GET /api/patches/12831/?format=api
{ "id": 12831, "url": "https://patchwork.libcamera.org/api/patches/12831/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12831/", "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": "<20210707021941.20804-18-laurent.pinchart@ideasonboard.com>", "date": "2021-07-07T02:19:28", "name": "[libcamera-devel,17/30] cam: Store camera session pointer in CamApp class", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "84e9796efac55a17d88c403faee77f1b40e03aaa", "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/12831/mbox/", "series": [ { "id": 2213, "url": "https://patchwork.libcamera.org/api/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/12831/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12831/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 4D488C3227\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 7 Jul 2021 02:20:47 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0D76568552;\n\tWed, 7 Jul 2021 04:20:47 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8B52268527\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Jul 2021 04:20:37 +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 23978466\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Jul 2021 04:20:37 +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=\"ZwIekBFy\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625624437;\n\tbh=mlezaSWf/JFGVkViyqj57pW4csRaJ9RBwz26e+oRmwc=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=ZwIekBFyL7ygDPVlHzTYqWYk6gEe7qSak53nYnmxxNIF4pHbGYyxypwTiUCLdlGV8\n\t+gA7KgABtm3oQBbIUyp0WOfczxuCpzbDhPunvpedEGt9Tk5vQS+CcFC+G/sfFnINAn\n\tspokFSH0+LAeHVOgiy8vXYxguIwgSlU3HeN4folI=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 7 Jul 2021 05:19:28 +0300", "Message-Id": "<20210707021941.20804-18-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 17/30] cam: Store camera session pointer\n\tin CamApp 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": "Move the local CameraSession variable from the CamApp::run() function to\na member variable of the CamApp class, created in CamApp::init(). This\nis a first step towards moving code to the CameraSession class.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/camera_session.cpp | 5 -----\n src/cam/main.cpp | 16 ++++++++++++----\n 2 files changed, 12 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 1fb7c1b6ad5d..7bb75e86eab5 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -34,11 +34,6 @@ int CameraSession::start(const OptionsParser::Options &options)\n \tcaptureLimit_ = options[OptCapture].toInteger();\n \tprintMetadata_ = options.isSet(OptMetadata);\n \n-\tif (!camera_) {\n-\t\tstd::cout << \"Can't capture without a camera\" << std::endl;\n-\t\treturn -ENODEV;\n-\t}\n-\n \tret = camera_->configure(config_);\n \tif (ret < 0) {\n \t\tstd::cout << \"Failed to configure camera\" << std::endl;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex b13230c374ad..2c6500a5682b 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -51,8 +51,11 @@ private:\n \tstatic CamApp *app_;\n \tOptionsParser::Options options_;\n \tCameraManager *cm_;\n+\n \tstd::shared_ptr<Camera> camera_;\n \tstd::unique_ptr<libcamera::CameraConfiguration> config_;\n+\tstd::unique_ptr<CameraSession> session_;\n+\n \tEventLoop loop_;\n \n \tbool strictFormats_;\n@@ -127,6 +130,9 @@ int CamApp::init(int argc, char **argv)\n \t\t\tcleanup();\n \t\t\treturn ret;\n \t\t}\n+\n+\t\tsession_ = std::make_unique<CameraSession>(camera_, config_.get());\n+\t\tsession_->captureDone.connect(this, &CamApp::captureDone);\n \t}\n \n \tif (options_.isSet(OptMonitor)) {\n@@ -369,10 +375,12 @@ int CamApp::run()\n \t}\n \n \tif (options_.isSet(OptCapture)) {\n-\t\tCameraSession session(camera_, config_.get());\n-\t\tsession.captureDone.connect(this, &CamApp::captureDone);\n+\t\tif (!camera_) {\n+\t\t\tstd::cout << \"Can't capture without a camera\" << std::endl;\n+\t\t\treturn -ENODEV;\n+\t\t}\n \n-\t\tret = session.start(options_);\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@@ -380,7 +388,7 @@ int CamApp::run()\n \n \t\tloop_.exec();\n \n-\t\tsession.stop();\n+\t\tsession_->stop();\n \t\treturn 0;\n \t}\n \n", "prefixes": [ "libcamera-devel", "17/30" ] }