{"id":1680,"url":"https://patchwork.libcamera.org/api/patches/1680/?format=json","web_url":"https://patchwork.libcamera.org/patch/1680/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20190713145119.11193-1-jacopo@jmondi.org>","date":"2019-07-13T14:51:19","name":"[libcamera-devel] libcamera: qcam: Allow specifying sizes on command line","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"6c994fd0fbe12c301aaed1799745be95961b960c","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1680/mbox/","series":[{"id":429,"url":"https://patchwork.libcamera.org/api/series/429/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=429","date":"2019-07-13T14:51:19","name":"[libcamera-devel] libcamera: qcam: Allow specifying sizes on command line","version":1,"mbox":"https://patchwork.libcamera.org/series/429/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1680/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1680/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9C0846156A\n\tfor ;\n\tSat, 13 Jul 2019 16:50:10 +0200 (CEST)","from uno.localdomain (softbank126209254147.bbtec.net\n\t[126.209.254.147]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 5CC92E0007;\n\tSat, 13 Jul 2019 14:50:07 +0000 (UTC)"],"X-Originating-IP":"126.209.254.147","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 13 Jul 2019 16:51:19 +0200","Message-Id":"<20190713145119.11193-1-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.21.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: qcam: Allow specifying sizes\n\ton command line","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sat, 13 Jul 2019 14:50:10 -0000"},"content":"Add a '-s|--size' option to qcam to allow selecting the stream\nresolution using a command line option.\n\nIf the sizes are not supported by the camera, they get automatically\nadjusted and the user notified via an output message.\n\nSigned-off-by: Jacopo Mondi \n---\n src/qcam/main.cpp | 8 ++++++++\n src/qcam/main_window.cpp | 31 ++++++++++++++++++++++++++++++-\n src/qcam/main_window.h | 1 +\n 3 files changed, 39 insertions(+), 1 deletion(-)","diff":"diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\nindex 106b8a162d9f..da942f3daed6 100644\n--- a/src/qcam/main.cpp\n+++ b/src/qcam/main.cpp\n@@ -25,12 +25,20 @@ void signalHandler(int signal)\n \n OptionsParser::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 \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 \n \tOptionsParser::Options options = parser.parse(argc, argv);\n \tif (options.isSet(OptHelp))\ndiff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex 907d2423ed15..d9a30aa15db0 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -116,13 +116,42 @@ int MainWindow::startCapture()\n \tint ret;\n \n \tconfig_ = camera_->generateConfiguration({ StreamRole::VideoRecording });\n+\n+\tStreamConfiguration &cfg = config_->at(0);\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 (auto const &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+\tCameraConfiguration::Status validation = config_->validate();\n+\tif (validation == CameraConfiguration::Invalid) {\n+\t\tstd::cerr << \"Faild to apply camera configuration\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (validation == CameraConfiguration::Adjusted) {\n+\t\tstd::cout << \"Stream sizes adjusted to \"\n+\t\t\t << cfg.size.width << \"x\" << cfg.size.height\n+\t\t\t << std::endl;\n+\t}\n+\n \tret = camera_->configure(config_.get());\n \tif (ret < 0) {\n \t\tstd::cout << \"Failed to configure camera\" << std::endl;\n \t\treturn ret;\n \t}\n \n-\tconst StreamConfiguration &cfg = config_->at(0);\n \tStream *stream = cfg.stream();\n \tret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width,\n \t\t\t\t cfg.size.height);\ndiff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\nindex f58cb6a65b2b..b45cbca725fa 100644\n--- a/src/qcam/main_window.h\n+++ b/src/qcam/main_window.h\n@@ -27,6 +27,7 @@ class ViewFinder;\n enum {\n \tOptCamera = 'c',\n \tOptHelp = 'h',\n+\tOptSize = 's',\n };\n \n class MainWindow : public QMainWindow\n","prefixes":["libcamera-devel"]}