Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 1275,
    "url": "https://patchwork.libcamera.org/api/patches/1275/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/1275/",
    "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": "<20190523151306.22007-3-niklas.soderlund@ragnatech.se>",
    "date": "2019-05-23T15:13:06",
    "name": "[libcamera-devel,v2,2/2] cam: Add CamApp class",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": false,
    "hash": "fdaff12a05d433d42787a3a39af03ea458fce451",
    "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/1275/mbox/",
    "series": [
        {
            "id": 323,
            "url": "https://patchwork.libcamera.org/api/series/323/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=323",
            "date": "2019-05-23T15:13:04",
            "name": "cam: cleanup code structure",
            "version": 2,
            "mbox": "https://patchwork.libcamera.org/series/323/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/1275/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/1275/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<niklas.soderlund@ragnatech.se>",
        "Received": [
            "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 23B0361865\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 May 2019 17:13:54 +0200 (CEST)",
            "from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 5e52aba0-7d6d-11e9-8d05-005056917f90;\n\tThu, 23 May 2019 17:13:50 +0200 (CEST)"
        ],
        "X-Halon-ID": "5e52aba0-7d6d-11e9-8d05-005056917f90",
        "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": "Thu, 23 May 2019 17:13:06 +0200",
        "Message-Id": "<20190523151306.22007-3-niklas.soderlund@ragnatech.se>",
        "X-Mailer": "git-send-email 2.21.0",
        "In-Reply-To": "<20190523151306.22007-1-niklas.soderlund@ragnatech.se>",
        "References": "<20190523151306.22007-1-niklas.soderlund@ragnatech.se>",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain; charset=UTF-8",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH v2 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": "Thu, 23 May 2019 15:13:54 -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>\n---\n src/cam/main.cpp | 184 ++++++++++++++++++++++++++++++++---------------\n 1 file changed, 125 insertions(+), 59 deletions(-)",
    "diff": "diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex fe7d4f90dbf14ffd..f7fe83aafd81b633 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -18,17 +18,117 @@\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+\n+\tOptionsParser::Options options_;\n+\tCameraManager *cm_;\n+\tstd::shared_ptr<Camera> camera_;\n+\tEventLoop *loop_;\n+};\n+\n+CamApp::CamApp()\n+\t: cm_(nullptr), camera_(nullptr), loop_(nullptr)\n+{\n+}\n+\n+CamApp *CamApp::instance()\n+{\n+\tstatic CamApp app;\n+\treturn &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+\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;\n+\t\treturn capture.run(camera_.get(), loop_, options_);\n+\t}\n+\n+\treturn 0;\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 +158,43 @@ 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+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+\tCamApp *app = CamApp::instance();\n \tint ret;\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+\tret = app->init(argc, argv);\n+\tif (ret)\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+\tret = app->exec();\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+\tapp->cleanup();\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+\tif (ret)\n+\t\treturn EXIT_FAILURE;\n \n-\t\tstd::cout << \"Using camera \" << camera->name() << std::endl;\n-\t}\n-\n-\tif (options.isSet(OptCapture)) {\n-\t\tCapture capture;\n-\t\tret = capture.run(camera.get(), 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",
        "v2",
        "2/2"
    ]
}