From d29c32135709b18f430b75b8f9fc2592a5915149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Mon, 27 Apr 2020 23:51:44 +0200 Subject: qcam: Make use of StreamKeyValueParser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the StreamKeyValueParser helper to parse stream configuration from the command line. This extends qcam to accept role hints and pixel format in addition to a size. Currently only one viewfinder stream is supported, add a check to keep this behavior. Going forward this restriction will be lifted to support more then one stream. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/qcam/main.cpp | 13 +++++-------- src/qcam/main_window.cpp | 37 ++++++++++++++++++++----------------- src/qcam/main_window.h | 4 ++-- src/qcam/meson.build | 1 + 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp index 862d714f..b3468cbf 100644 --- a/src/qcam/main.cpp +++ b/src/qcam/main.cpp @@ -13,8 +13,9 @@ #include -#include "main_window.h" #include "../cam/options.h" +#include "../cam/stream_options.h" +#include "main_window.h" void signalHandler(int signal) { @@ -24,11 +25,7 @@ void signalHandler(int signal) OptionsParser::Options parseOptions(int argc, char *argv[]) { - KeyValueParser sizeParser; - sizeParser.addOption("width", OptionInteger, "Width in pixels", - ArgumentRequired); - sizeParser.addOption("height", OptionInteger, "Height in pixels", - ArgumentRequired); + StreamKeyValueParser streamKeyValue; OptionsParser parser; parser.addOption(OptCamera, OptionString, @@ -36,8 +33,8 @@ OptionsParser::Options parseOptions(int argc, char *argv[]) ArgumentRequired, "camera"); parser.addOption(OptHelp, OptionNone, "Display this help message", "help"); - parser.addOption(OptSize, &sizeParser, "Set the stream size", - "size", true); + parser.addOption(OptStream, &streamKeyValue, + "Set configuration of a camera stream", "stream", true); OptionsParser::Options options = parser.parse(argc, argv); if (options.isSet(OptHelp)) diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 5a2ac699..74427592 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -280,28 +280,24 @@ void MainWindow::toggleCapture(bool start) */ int MainWindow::startCapture() { + StreamRoles roles = StreamKeyValueParser::roles(options_[OptStream]); int ret; - /* Configure the camera. */ - config_ = camera_->generateConfiguration({ StreamRole::Viewfinder }); - - StreamConfiguration &cfg = config_->at(0); - - if (options_.isSet(OptSize)) { - const std::vector &sizeOptions = - options_[OptSize].toArray(); + /* Verify roles are supported. */ + if (roles.size() != 1) { + qCritical() << "Only one stream supported"; + return -EINVAL; + } - /* Set desired stream size if requested. */ - for (const auto &value : sizeOptions) { - KeyValueParser::Options opt = value.toKeyValues(); + if (roles[0] != StreamRole::Viewfinder) { + qCritical() << "Only viewfinder supported"; + return -EINVAL; + } - if (opt.isSet("width")) - cfg.size.width = opt["width"]; + /* Configure the camera. */ + config_ = camera_->generateConfiguration(roles); - if (opt.isSet("height")) - cfg.size.height = opt["height"]; - } - } + StreamConfiguration &cfg = config_->at(0); /* Use a format supported by the viewfinder if available. */ std::vector formats = cfg.formats().pixelformats(); @@ -316,6 +312,13 @@ int MainWindow::startCapture() } } + /* Allow user to override configuration. */ + if (StreamKeyValueParser::updateConfiguration(config_.get(), + options_[OptStream])) { + qWarning() << "Failed to update configuration"; + return -EINVAL; + } + CameraConfiguration::Status validation = config_->validate(); if (validation == CameraConfiguration::Invalid) { qWarning() << "Failed to create valid camera configuration"; diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 4ec37d40..aea1f1de 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -23,7 +23,7 @@ #include #include -#include "../cam/options.h" +#include "../cam/stream_options.h" #include "viewfinder.h" using namespace libcamera; @@ -34,7 +34,7 @@ class QComboBox; enum { OptCamera = 'c', OptHelp = 'h', - OptSize = 's', + OptStream = 's', }; class MainWindow : public QMainWindow diff --git a/src/qcam/meson.build b/src/qcam/meson.build index c256d06f..895264be 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -3,6 +3,7 @@ qcam_sources = files([ 'main.cpp', 'main_window.cpp', '../cam/options.cpp', + '../cam/stream_options.cpp', 'viewfinder.cpp', ]) -- cgit v1.2.1