Patch Detail
Show a patch.
GET /api/patches/12838/?format=api
{ "id": 12838, "url": "https://patchwork.libcamera.org/api/patches/12838/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12838/", "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-26-laurent.pinchart@ideasonboard.com>", "date": "2021-07-07T02:19:36", "name": "[libcamera-devel,25/30] cam: Move session_ member variable to a local variable in run() function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e5ca7eaaf4082ee88839fcefbdc2f66190e82b98", "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/12838/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/12838/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12838/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 CB381BD794\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 7 Jul 2021 02:20:55 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7F9F168506;\n\tWed, 7 Jul 2021 04:20: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 F333668510\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Jul 2021 04:20:40 +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 8E75A466\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Jul 2021 04:20:40 +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=\"qwOJ77vK\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625624440;\n\tbh=RPi1pVmUr/YuYSiysQqbAJoBNcqSZyIOESMQetdHMRU=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=qwOJ77vKjdri9unEVA0bdk1vberQ70/BNQon+W632v/BlO5X40UF648wwp6UUcGmW\n\tMU5bx1AsZ1GC1iHiTWAR0IsvjQIoTiDgyFCx0e3v+dO8p73DLAF1fmSUhFKb0hKzyr\n\tg73z35cGz6ZUPCL9SEYBxSHC2evZAn0Nl4NMNpJc=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 7 Jul 2021 05:19:36 +0300", "Message-Id": "<20210707021941.20804-26-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 25/30] cam: Move session_ member variable\n\tto a local variable in run() function", "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": "The session_ member of the CamApp class is only needed in the run()\nfunction. Make it a local variable.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/main.cpp | 30 ++++++++++++++----------------\n 1 file changed, 14 insertions(+), 16 deletions(-)", "diff": "diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 4fe0c4c368d1..380c14e02cf0 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -47,7 +47,6 @@ private:\n \tOptionsParser::Options options_;\n \n \tstd::unique_ptr<CameraManager> cm_;\n-\tstd::unique_ptr<CameraSession> session_;\n \n \tEventLoop loop_;\n };\n@@ -86,8 +85,6 @@ int CamApp::init(int argc, char **argv)\n \n void CamApp::cleanup()\n {\n-\tsession_.reset();\n-\n \tcm_->stop();\n }\n \n@@ -172,6 +169,7 @@ void CamApp::captureDone()\n \n int CamApp::run()\n {\n+\tstd::unique_ptr<CameraSession> session;\n \tint ret;\n \n \tif (options_.isSet(OptList)) {\n@@ -185,55 +183,55 @@ int CamApp::run()\n \t}\n \n \tif (options_.isSet(OptCamera)) {\n-\t\tsession_ = std::make_unique<CameraSession>(cm_.get(), options_);\n-\t\tif (!session_->isValid()) {\n+\t\tsession = std::make_unique<CameraSession>(cm_.get(), options_);\n+\t\tif (!session->isValid()) {\n \t\t\tstd::cout << \"Failed to create camera session\" << std::endl;\n \t\t\treturn -EINVAL;\n \t\t}\n \n-\t\tstd::cout << \"Using camera \" << session_->camera()->id()\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\tsession->captureDone.connect(this, &CamApp::captureDone);\n \t}\n \n \tif (options_.isSet(OptListControls)) {\n-\t\tif (!session_) {\n+\t\tif (!session) {\n \t\t\tstd::cout << \"Cannot list controls without a camera\"\n \t\t\t\t << std::endl;\n \t\t\treturn -EINVAL;\n \t\t}\n \n-\t\tsession_->listControls();\n+\t\tsession->listControls();\n \t}\n \n \tif (options_.isSet(OptListProperties)) {\n-\t\tif (!session_) {\n+\t\tif (!session) {\n \t\t\tstd::cout << \"Cannot list properties without a camera\"\n \t\t\t\t << std::endl;\n \t\t\treturn -EINVAL;\n \t\t}\n \n-\t\tsession_->listProperties();\n+\t\tsession->listProperties();\n \t}\n \n \tif (options_.isSet(OptInfo)) {\n-\t\tif (!session_) {\n+\t\tif (!session) {\n \t\t\tstd::cout << \"Cannot print stream information without a camera\"\n \t\t\t\t << std::endl;\n \t\t\treturn -EINVAL;\n \t\t}\n \n-\t\tsession_->infoConfiguration();\n+\t\tsession->infoConfiguration();\n \t}\n \n \tif (options_.isSet(OptCapture)) {\n-\t\tif (!session_) {\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 \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@@ -241,7 +239,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", "25/30" ] }