From patchwork Fri May 1 02:34:30 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: 3646 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 AA816614C9 for ; Fri, 1 May 2020 04:34:44 +0200 (CEST) X-Halon-ID: 50003b78-8b54-11ea-89d0-0050569116f7 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de [79.202.35.146]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 50003b78-8b54-11ea-89d0-0050569116f7; Fri, 01 May 2020 04:34:42 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Fri, 1 May 2020 04:34:30 +0200 Message-Id: <20200501023432.90032-5-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501023432.90032-1-niklas.soderlund@ragnatech.se> References: <20200501023432.90032-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 4/6] cam: Make use of StreamKeyValueParser 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, 01 May 2020 02:34:46 -0000 Use the StreamOptionsParser helper to parse stream configuration from the command line. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- * Changes since v2 - Add log message --- src/cam/main.cpp | 68 +++++------------------------------------------- 1 file changed, 7 insertions(+), 61 deletions(-) diff --git a/src/cam/main.cpp b/src/cam/main.cpp index ced4f567b8f38e00..2512fe9da782165b 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -17,6 +17,7 @@ #include "event_loop.h" #include "main.h" #include "options.h" +#include "stream_options.h" using namespace libcamera; @@ -154,16 +155,7 @@ void CamApp::quit() int CamApp::parseOptions(int argc, char *argv[]) { - KeyValueParser streamKeyValue; - streamKeyValue.addOption("role", OptionString, - "Role for the stream (viewfinder, video, still, stillraw)", - ArgumentRequired); - streamKeyValue.addOption("width", OptionInteger, "Width in pixels", - ArgumentRequired); - streamKeyValue.addOption("height", OptionInteger, "Height in pixels", - ArgumentRequired); - streamKeyValue.addOption("pixelformat", OptionInteger, "Pixel format", - ArgumentRequired); + StreamKeyValueParser streamKeyValue; OptionsParser parser; parser.addOption(OptCamera, OptionString, @@ -202,38 +194,7 @@ int CamApp::parseOptions(int argc, char *argv[]) int CamApp::prepareConfig() { - StreamRoles roles; - - if (options_.isSet(OptStream)) { - const std::vector &streamOptions = - options_[OptStream].toArray(); - - /* Use roles and get a default configuration. */ - for (auto const &value : streamOptions) { - KeyValueParser::Options opt = value.toKeyValues(); - - std::string role = opt.isSet("role") - ? opt["role"].toString() - : "viewfinder"; - - if (role == "viewfinder") { - roles.push_back(StreamRole::Viewfinder); - } else if (role == "video") { - roles.push_back(StreamRole::VideoRecording); - } else if (role == "still") { - roles.push_back(StreamRole::StillCapture); - } else if (role == "stillraw") { - roles.push_back(StreamRole::StillCaptureRaw); - } else { - std::cerr << "Unknown stream role " - << role << std::endl; - return -EINVAL; - } - } - } else { - /* If no configuration is provided assume a single video stream. */ - roles.push_back(StreamRole::VideoRecording); - } + StreamRoles roles = StreamKeyValueParser::roles(options_[OptStream]); config_ = camera_->generateConfiguration(roles); if (!config_ || config_->size() != roles.size()) { @@ -243,25 +204,10 @@ int CamApp::prepareConfig() } /* Apply configuration if explicitly requested. */ - if (options_.isSet(OptStream)) { - const std::vector &streamOptions = - options_[OptStream].toArray(); - - unsigned int i = 0; - for (auto const &value : streamOptions) { - KeyValueParser::Options opt = value.toKeyValues(); - StreamConfiguration &cfg = config_->at(i++); - - if (opt.isSet("width")) - cfg.size.width = opt["width"]; - - if (opt.isSet("height")) - cfg.size.height = opt["height"]; - - /* TODO: Translate 4CC string to ID. */ - if (opt.isSet("pixelformat")) - cfg.pixelFormat = PixelFormat(opt["pixelformat"]); - } + if (StreamKeyValueParser::updateConfiguration(config_.get(), + options_[OptStream])) { + std::cerr << "Failed to update configuration" << std::endl; + return -EINVAL; } switch (config_->validate()) {