From patchwork Fri Apr 24 01:16:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 3511 Return-Path: Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 48CD062E5D for ; Fri, 24 Apr 2020 03:17:07 +0200 (CEST) X-Halon-ID: 49b29452-85c9-11ea-aeed-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de [79.202.35.146]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 49b29452-85c9-11ea-aeed-005056917f90; Fri, 24 Apr 2020 03:16:56 +0200 (CEST) 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 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: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2020 01:17:07 -0000 Use the StreamOptionsParser 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 --- src/qcam/main.cpp | 19 ++++++------------- src/qcam/main_window.cpp | 34 ++++++++++++++++------------------ src/qcam/main_window.h | 8 ++++---- src/qcam/meson.build | 1 + 4 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp index 862d714f467c04f9..734423572aae253c 100644 --- a/src/qcam/main.cpp +++ b/src/qcam/main.cpp @@ -13,8 +13,8 @@ #include +#include "../cam/stream_options.h" #include "main_window.h" -#include "../cam/options.h" void signalHandler(int signal) { @@ -22,24 +22,17 @@ void signalHandler(int signal) qApp->quit(); } -OptionsParser::Options parseOptions(int argc, char *argv[]) +StreamOptionsParser::Options parseOptions(int argc, char *argv[]) { - KeyValueParser sizeParser; - sizeParser.addOption("width", OptionInteger, "Width in pixels", - ArgumentRequired); - sizeParser.addOption("height", OptionInteger, "Height in pixels", - ArgumentRequired); - - OptionsParser parser; + StreamOptionsParser parser; parser.addOption(OptCamera, OptionString, "Specify which camera to operate on", "camera", ArgumentRequired, "camera"); parser.addOption(OptHelp, OptionNone, "Display this help message", "help"); - parser.addOption(OptSize, &sizeParser, "Set the stream size", - "size", true); + parser.addStreamOptions(OptStream, "stream"); - OptionsParser::Options options = parser.parse(argc, argv); + StreamOptionsParser::Options options = parser.parse(argc, argv); if (options.isSet(OptHelp)) parser.usage(); @@ -51,7 +44,7 @@ int main(int argc, char **argv) QApplication app(argc, argv); int ret; - OptionsParser::Options options = parseOptions(argc, argv); + StreamOptionsParser::Options options = parseOptions(argc, argv); if (!options.valid()) return EXIT_FAILURE; if (options.isSet(OptHelp)) diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index cf39ed7aceca05b8..dad1b001de770bdc 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -47,7 +47,7 @@ public: } }; -MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options) +MainWindow::MainWindow(CameraManager *cm, const StreamOptionsParser::Options &options) : options_(options), cm_(cm), allocator_(nullptr), isCapturing_(false) { int ret; @@ -277,27 +277,22 @@ int MainWindow::startCapture() { int ret; + /* Verify roles are supported. */ + if (options_.roles().size() != 1) { + qWarning() << "Only one stream supported"; + return -EINVAL; + } + + if (options_.roles()[0] != StreamRole::Viewfinder) { + qWarning() << "Only viewfinder supported"; + return -EINVAL; + } + /* Configure the camera. */ - config_ = camera_->generateConfiguration({ StreamRole::Viewfinder }); + config_ = camera_->generateConfiguration(options_.roles()); StreamConfiguration &cfg = config_->at(0); - if (options_.isSet(OptSize)) { - const std::vector &sizeOptions = - options_[OptSize].toArray(); - - /* Set desired stream size if requested. */ - for (const auto &value : sizeOptions) { - KeyValueParser::Options opt = value.toKeyValues(); - - if (opt.isSet("width")) - cfg.size.width = opt["width"]; - - if (opt.isSet("height")) - cfg.size.height = opt["height"]; - } - } - /* Use a format supported by the viewfinder if available. */ std::vector formats = cfg.formats().pixelformats(); for (const PixelFormat &format : viewfinder_->nativeFormats()) { @@ -311,6 +306,9 @@ int MainWindow::startCapture() } } + /* Allow user to override configuration. */ + options_.applyCameraParameters(config_.get()); + 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 5d6251c830707a79..f28eff6591169b9f 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; @@ -33,7 +33,7 @@ class QAction; enum { OptCamera = 'c', OptHelp = 'h', - OptSize = 's', + OptStream = 's', }; class MainWindow : public QMainWindow @@ -41,7 +41,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(CameraManager *cm, const OptionsParser::Options &options); + MainWindow(CameraManager *cm, const StreamOptionsParser::Options &options); ~MainWindow(); bool event(QEvent *e) override; @@ -81,7 +81,7 @@ private: QTimer titleTimer_; /* Options */ - const OptionsParser::Options &options_; + const StreamOptionsParser::Options &options_; /* Camera manager, camera, configuration and buffers */ CameraManager *cm_; diff --git a/src/qcam/meson.build b/src/qcam/meson.build index c256d06f8ccfc0ae..895264be4a3388f4 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', ])