{"id":3511,"url":"https://patchwork.libcamera.org/api/1.1/patches/3511/?format=json","web_url":"https://patchwork.libcamera.org/patch/3511/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200424011656.2889720-4-niklas.soderlund@ragnatech.se>","date":"2020-04-24T01:16:56","name":"[libcamera-devel,3/3] qcam: Make use of StreamOptionsParser","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"333791b6e94842fae58bc800be8ac5b4ebd51886","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3511/mbox/","series":[{"id":820,"url":"https://patchwork.libcamera.org/api/1.1/series/820/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=820","date":"2020-04-24T01:16:53","name":"{cam, qcam}: Unify stream option parsing","version":1,"mbox":"https://patchwork.libcamera.org/series/820/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3511/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3511/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 48CD062E5D\n\tfor ;\n\tFri, 24 Apr 2020 03:17:07 +0200 (CEST)","from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de\n\t[79.202.35.146]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 49b29452-85c9-11ea-aeed-005056917f90;\n\tFri, 24 Apr 2020 03:16:56 +0200 (CEST)"],"X-Halon-ID":"49b29452-85c9-11ea-aeed-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 24 Apr 2020 03:16:56 +0200","Message-Id":"<20200424011656.2889720-4-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.26.0","In-Reply-To":"<20200424011656.2889720-1-niklas.soderlund@ragnatech.se>","References":"<20200424011656.2889720-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 3/3] qcam: Make use of StreamOptionsParser","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 24 Apr 2020 01:17:07 -0000"},"content":"Use the StreamOptionsParser helper to parse stream configuration from\nthe command line. This extends qcam to accept role hints and pixel\nformat in addition to a size.\n\nCurrently only one viewfinder stream is supported, add a check to keep\nthis behavior. Going forward this restriction will be lifted to support\nmore then one stream.\n\nSigned-off-by: Niklas Söderlund \n---\n src/qcam/main.cpp | 19 ++++++-------------\n src/qcam/main_window.cpp | 34 ++++++++++++++++------------------\n src/qcam/main_window.h | 8 ++++----\n src/qcam/meson.build | 1 +\n 4 files changed, 27 insertions(+), 35 deletions(-)","diff":"diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\nindex 862d714f467c04f9..734423572aae253c 100644\n--- a/src/qcam/main.cpp\n+++ b/src/qcam/main.cpp\n@@ -13,8 +13,8 @@\n \n #include \n \n+#include \"../cam/stream_options.h\"\n #include \"main_window.h\"\n-#include \"../cam/options.h\"\n \n void signalHandler(int signal)\n {\n@@ -22,24 +22,17 @@ void signalHandler(int signal)\n \tqApp->quit();\n }\n \n-OptionsParser::Options parseOptions(int argc, char *argv[])\n+StreamOptionsParser::Options parseOptions(int argc, char *argv[])\n {\n-\tKeyValueParser sizeParser;\n-\tsizeParser.addOption(\"width\", OptionInteger, \"Width in pixels\",\n-\t\t\t ArgumentRequired);\n-\tsizeParser.addOption(\"height\", OptionInteger, \"Height in pixels\",\n-\t\t\t ArgumentRequired);\n-\n-\tOptionsParser parser;\n+\tStreamOptionsParser parser;\n \tparser.addOption(OptCamera, OptionString,\n \t\t\t \"Specify which camera to operate on\", \"camera\",\n \t\t\t ArgumentRequired, \"camera\");\n \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n \t\t\t \"help\");\n-\tparser.addOption(OptSize, &sizeParser, \"Set the stream size\",\n-\t\t\t \"size\", true);\n+\tparser.addStreamOptions(OptStream, \"stream\");\n \n-\tOptionsParser::Options options = parser.parse(argc, argv);\n+\tStreamOptionsParser::Options options = parser.parse(argc, argv);\n \tif (options.isSet(OptHelp))\n \t\tparser.usage();\n \n@@ -51,7 +44,7 @@ int main(int argc, char **argv)\n \tQApplication app(argc, argv);\n \tint ret;\n \n-\tOptionsParser::Options options = parseOptions(argc, argv);\n+\tStreamOptionsParser::Options options = parseOptions(argc, argv);\n \tif (!options.valid())\n \t\treturn EXIT_FAILURE;\n \tif (options.isSet(OptHelp))\ndiff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex cf39ed7aceca05b8..dad1b001de770bdc 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -47,7 +47,7 @@ public:\n \t}\n };\n \n-MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)\n+MainWindow::MainWindow(CameraManager *cm, const StreamOptionsParser::Options &options)\n \t: options_(options), cm_(cm), allocator_(nullptr), isCapturing_(false)\n {\n \tint ret;\n@@ -277,27 +277,22 @@ int MainWindow::startCapture()\n {\n \tint ret;\n \n+\t/* Verify roles are supported. */\n+\tif (options_.roles().size() != 1) {\n+\t\tqWarning() << \"Only one stream supported\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (options_.roles()[0] != StreamRole::Viewfinder) {\n+\t\tqWarning() << \"Only viewfinder supported\";\n+\t\treturn -EINVAL;\n+\t}\n+\n \t/* Configure the camera. */\n-\tconfig_ = camera_->generateConfiguration({ StreamRole::Viewfinder });\n+\tconfig_ = camera_->generateConfiguration(options_.roles());\n \n \tStreamConfiguration &cfg = config_->at(0);\n \n-\tif (options_.isSet(OptSize)) {\n-\t\tconst std::vector &sizeOptions =\n-\t\t\toptions_[OptSize].toArray();\n-\n-\t\t/* Set desired stream size if requested. */\n-\t\tfor (const auto &value : sizeOptions) {\n-\t\t\tKeyValueParser::Options opt = value.toKeyValues();\n-\n-\t\t\tif (opt.isSet(\"width\"))\n-\t\t\t\tcfg.size.width = opt[\"width\"];\n-\n-\t\t\tif (opt.isSet(\"height\"))\n-\t\t\t\tcfg.size.height = opt[\"height\"];\n-\t\t}\n-\t}\n-\n \t/* Use a format supported by the viewfinder if available. */\n \tstd::vector formats = cfg.formats().pixelformats();\n \tfor (const PixelFormat &format : viewfinder_->nativeFormats()) {\n@@ -311,6 +306,9 @@ int MainWindow::startCapture()\n \t\t}\n \t}\n \n+\t/* Allow user to override configuration. */\n+\toptions_.applyCameraParameters(config_.get());\n+\n \tCameraConfiguration::Status validation = config_->validate();\n \tif (validation == CameraConfiguration::Invalid) {\n \t\tqWarning() << \"Failed to create valid camera configuration\";\ndiff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\nindex 5d6251c830707a79..f28eff6591169b9f 100644\n--- a/src/qcam/main_window.h\n+++ b/src/qcam/main_window.h\n@@ -23,7 +23,7 @@\n #include \n #include \n \n-#include \"../cam/options.h\"\n+#include \"../cam/stream_options.h\"\n #include \"viewfinder.h\"\n \n using namespace libcamera;\n@@ -33,7 +33,7 @@ class QAction;\n enum {\n \tOptCamera = 'c',\n \tOptHelp = 'h',\n-\tOptSize = 's',\n+\tOptStream = 's',\n };\n \n class MainWindow : public QMainWindow\n@@ -41,7 +41,7 @@ class MainWindow : public QMainWindow\n \tQ_OBJECT\n \n public:\n-\tMainWindow(CameraManager *cm, const OptionsParser::Options &options);\n+\tMainWindow(CameraManager *cm, const StreamOptionsParser::Options &options);\n \t~MainWindow();\n \n \tbool event(QEvent *e) override;\n@@ -81,7 +81,7 @@ private:\n \tQTimer titleTimer_;\n \n \t/* Options */\n-\tconst OptionsParser::Options &options_;\n+\tconst StreamOptionsParser::Options &options_;\n \n \t/* Camera manager, camera, configuration and buffers */\n \tCameraManager *cm_;\ndiff --git a/src/qcam/meson.build b/src/qcam/meson.build\nindex c256d06f8ccfc0ae..895264be4a3388f4 100644\n--- a/src/qcam/meson.build\n+++ b/src/qcam/meson.build\n@@ -3,6 +3,7 @@ qcam_sources = files([\n 'main.cpp',\n 'main_window.cpp',\n '../cam/options.cpp',\n+ '../cam/stream_options.cpp',\n 'viewfinder.cpp',\n ])\n \n","prefixes":["libcamera-devel","3/3"]}