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 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/qcam/main.cpp') 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)) -- cgit v1.2.1