Patch Detail
Show a patch.
GET /api/patches/1284/?format=api
{ "id": 1284, "url": "https://patchwork.libcamera.org/api/patches/1284/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1284/", "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": "<20190524082333.8974-3-niklas.soderlund@ragnatech.se>", "date": "2019-05-24T08:23:33", "name": "[libcamera-devel,v3,2/2] cam: Add CamApp class", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c5bddcb1e8519b86c8e8b55d1e5def5bb279867b", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1284/mbox/", "series": [ { "id": 325, "url": "https://patchwork.libcamera.org/api/series/325/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=325", "date": "2019-05-24T08:23:31", "name": "cam: cleanup code structure", "version": 3, "mbox": "https://patchwork.libcamera.org/series/325/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1284/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1284/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5269160BFA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 24 May 2019 10:24:39 +0200 (CEST)", "from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 5df5c701-7dfd-11e9-8ab4-005056917a89;\n\tFri, 24 May 2019 10:24:37 +0200 (CEST)" ], "X-Halon-ID": "5df5c701-7dfd-11e9-8ab4-005056917a89", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 24 May 2019 10:23:33 +0200", "Message-Id": "<20190524082333.8974-3-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190524082333.8974-1-niklas.soderlund@ragnatech.se>", "References": "<20190524082333.8974-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 2/2] cam: Add CamApp class", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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>", "X-List-Received-Date": "Fri, 24 May 2019 08:24:39 -0000" }, "content": "Add more structure to main.cpp by breaking up the logic into a CamApp\nclass. This makes the code easier to read and removes all of the\norganically grown global variables.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/main.cpp | 198 ++++++++++++++++++++++++++++++++---------------\n 1 file changed, 136 insertions(+), 62 deletions(-)", "diff": "diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex d071a75dd5347cf7..dbf04917bcc5aa38 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -18,17 +18,115 @@\n \n using namespace libcamera;\n \n-OptionsParser::Options options;\n-std::shared_ptr<Camera> camera;\n-EventLoop *loop;\n+class CamApp\n+{\n+public:\n+\tCamApp();\n+\n+\tstatic CamApp *instance();\n+\n+\tint init(int argc, char **argv);\n+\tvoid cleanup();\n+\n+\tint exec();\n+\tvoid quit();\n+\n+private:\n+\tint parseOptions(int argc, char *argv[]);\n+\tint run();\n+\n+\tstatic CamApp *app_;\n+\tOptionsParser::Options options_;\n+\tCameraManager *cm_;\n+\tstd::shared_ptr<Camera> camera_;\n+\tEventLoop *loop_;\n+};\n+\n+CamApp *CamApp::app_ = nullptr;\n+\n+CamApp::CamApp()\n+\t: cm_(nullptr), camera_(nullptr), loop_(nullptr)\n+{\n+\tCamApp::app_ = this;\n+}\n+\n+CamApp *CamApp::instance()\n+{\n+\treturn CamApp::app_;\n+}\n+\n+int CamApp::init(int argc, char **argv)\n+{\n+\tint ret;\n+\n+\tret = parseOptions(argc, argv);\n+\tif (ret < 0)\n+\t\treturn ret == -EINTR ? 0 : ret;\n+\n+\tcm_ = CameraManager::instance();\n+\n+\tret = cm_->start();\n+\tif (ret) {\n+\t\tstd::cout << \"Failed to start camera manager: \"\n+\t\t\t << strerror(-ret) << std::endl;\n+\t\treturn ret;\n+\t}\n+\n+\tif (options_.isSet(OptCamera)) {\n+\t\tcamera_ = cm_->get(options_[OptCamera]);\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\tcm_->stop();\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\tcamera_.reset();\n+\t\t\tcm_->stop();\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tstd::cout << \"Using camera \" << camera_->name() << std::endl;\n+\t}\n+\n+\tloop_ = new EventLoop(cm_->eventDispatcher());\n+\n+\treturn 0;\n+}\n+\n+void CamApp::cleanup()\n+{\n+\tdelete loop_;\n+\tloop_ = nullptr;\n+\n+\tif (camera_) {\n+\t\tcamera_->release();\n+\t\tcamera_.reset();\n+\t}\n+\n+\tcm_->stop();\n+}\n+\n+int CamApp::exec()\n+{\n+\tint ret;\n+\n+\tret = run();\n+\tcleanup();\n+\n+\treturn ret;\n+}\n \n-void signalHandler(int signal)\n+void CamApp::quit()\n {\n-\tstd::cout << \"Exiting\" << std::endl;\n-\tloop->exit();\n+\tif (loop_)\n+\t\tloop_->exit();\n }\n \n-static int parseOptions(int argc, char *argv[])\n+int CamApp::parseOptions(int argc, char *argv[])\n {\n \tKeyValueParser streamKeyValue;\n \tstreamKeyValue.addOption(\"role\", OptionString,\n@@ -58,77 +156,53 @@ static int parseOptions(int argc, char *argv[])\n \t\t\t \"help\");\n \tparser.addOption(OptList, OptionNone, \"List all cameras\", \"list\");\n \n-\toptions = parser.parse(argc, argv);\n-\tif (!options.valid())\n+\toptions_ = parser.parse(argc, argv);\n+\tif (!options_.valid())\n \t\treturn -EINVAL;\n \n-\tif (options.empty() || options.isSet(OptHelp)) {\n+\tif (options_.empty() || options_.isSet(OptHelp)) {\n \t\tparser.usage();\n-\t\treturn options.empty() ? -EINVAL : -EINTR;\n+\t\treturn options_.empty() ? -EINVAL : -EINTR;\n \t}\n \n \treturn 0;\n }\n \n+int CamApp::run()\n+{\n+\tif (options_.isSet(OptList)) {\n+\t\tstd::cout << \"Available cameras:\" << std::endl;\n+\t\tfor (const std::shared_ptr<Camera> &cam : cm_->cameras())\n+\t\t\tstd::cout << \"- \" << cam->name() << std::endl;\n+\t}\n+\n+\tif (options_.isSet(OptCapture)) {\n+\t\tCapture capture(camera_.get());\n+\t\treturn capture.run(loop_, options_);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+void signalHandler(int signal)\n+{\n+\tstd::cout << \"Exiting\" << std::endl;\n+\tCamApp::instance()->quit();\n+}\n+\n int main(int argc, char **argv)\n {\n-\tint ret;\n+\tCamApp app;\n \n-\tret = parseOptions(argc, argv);\n-\tif (ret < 0)\n-\t\treturn ret == -EINTR ? 0 : EXIT_FAILURE;\n-\n-\tCameraManager *cm = CameraManager::instance();\n-\n-\tret = cm->start();\n-\tif (ret) {\n-\t\tstd::cout << \"Failed to start camera manager: \"\n-\t\t\t << strerror(-ret) << std::endl;\n+\tif (app.init(argc, argv))\n \t\treturn EXIT_FAILURE;\n-\t}\n-\n-\tloop = new EventLoop(cm->eventDispatcher());\n \n \tstruct sigaction sa = {};\n \tsa.sa_handler = &signalHandler;\n \tsigaction(SIGINT, &sa, nullptr);\n \n-\tif (options.isSet(OptList)) {\n-\t\tstd::cout << \"Available cameras:\" << std::endl;\n-\t\tfor (const std::shared_ptr<Camera> &cam : cm->cameras())\n-\t\t\tstd::cout << \"- \" << cam->name() << std::endl;\n-\t}\n+\tif (app.exec())\n+\t\treturn EXIT_FAILURE;\n \n-\tif (options.isSet(OptCamera)) {\n-\t\tcamera = cm->get(options[OptCamera]);\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\tgoto out;\n-\t\t}\n-\n-\t\tif (camera->acquire()) {\n-\t\t\tstd::cout << \"Failed to acquire camera\" << std::endl;\n-\t\t\tgoto out;\n-\t\t}\n-\n-\t\tstd::cout << \"Using camera \" << camera->name() << std::endl;\n-\t}\n-\n-\tif (options.isSet(OptCapture)) {\n-\t\tCapture capture(camera.get());\n-\t\tret = capture.run(loop, options);\n-\t}\n-\n-\tif (camera) {\n-\t\tcamera->release();\n-\t\tcamera.reset();\n-\t}\n-out:\n-\tdelete loop;\n-\n-\tcm->stop();\n-\n-\treturn ret;\n+\treturn 0;\n }\n", "prefixes": [ "libcamera-devel", "v3", "2/2" ] }