From patchwork Fri May 1 02:34:29 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: 3645 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 277FA6148D for ; Fri, 1 May 2020 04:34:44 +0200 (CEST) X-Halon-ID: 4f9a3cbd-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 4f9a3cbd-8b54-11ea-89d0-0050569116f7; Fri, 01 May 2020 04:34:41 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Fri, 1 May 2020 04:34:29 +0200 Message-Id: <20200501023432.90032-4-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 3/6] cam: Add helper class to parse stream configuration 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:44 -0000 Create a new helper class StreamKeyValueParser to parse command line options describing stream configurations. The goal is to share this new class between cam and qcam. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- * Changes since v2 - Return bool from parseRole() - s/TODO/\\todo/ - s/!streamParameters.size()/streamParameters.empty()/ - Rework logic in parseRole() --- src/cam/meson.build | 1 + src/cam/stream_options.cpp | 129 +++++++++++++++++++++++++++++++++++++ src/cam/stream_options.h | 32 +++++++++ 3 files changed, 162 insertions(+) create mode 100644 src/cam/stream_options.cpp create mode 100644 src/cam/stream_options.h diff --git a/src/cam/meson.build b/src/cam/meson.build index 2419d648bc17e02b..162d6333f94e4851 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -4,6 +4,7 @@ cam_sources = files([ 'event_loop.cpp', 'main.cpp', 'options.cpp', + 'stream_options.cpp', ]) cam = executable('cam', cam_sources, diff --git a/src/cam/stream_options.cpp b/src/cam/stream_options.cpp new file mode 100644 index 0000000000000000..bd12c8fdb48e7135 --- /dev/null +++ b/src/cam/stream_options.cpp @@ -0,0 +1,129 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2020, Raspberry Pi (Trading) Ltd. + * + * stream_options.cpp - Helper to parse options for streams + */ +#include "stream_options.h" + +#include + +using namespace libcamera; + +StreamKeyValueParser::StreamKeyValueParser() +{ + addOption("role", OptionString, + "Role for the stream (viewfinder, video, still, stillraw)", + ArgumentRequired); + addOption("width", OptionInteger, "Width in pixels", + ArgumentRequired); + addOption("height", OptionInteger, "Height in pixels", + ArgumentRequired); + addOption("pixelformat", OptionInteger, "Pixel format", + ArgumentRequired); +} + +KeyValueParser::Options StreamKeyValueParser::parse(const char *arguments) +{ + KeyValueParser::Options options = KeyValueParser::parse(arguments); + StreamRole role; + + if (options.valid() && options.isSet("role") && + !parseRole(&role, options)) { + std::cerr << "Unknown stream role " + << options["role"].toString() << std::endl; + options.invalidate(); + } + + return options; +} + +StreamRoles StreamKeyValueParser::roles(const OptionValue &values) +{ + const std::vector &streamParameters = values.toArray(); + + /* If no configuration values to examine default to viewfinder. */ + if (streamParameters.empty()) + return { StreamRole::Viewfinder }; + + StreamRoles roles; + for (auto const &value : streamParameters) { + KeyValueParser::Options opts = value.toKeyValues(); + StreamRole role; + + /* If role is invalid or not set default to viewfinder. */ + if (!parseRole(&role, value)) + role = StreamRole::Viewfinder; + + roles.push_back(role); + } + + return roles; +} + +int StreamKeyValueParser::updateConfiguration(CameraConfiguration *config, + const OptionValue &values) +{ + const std::vector &streamParameters = values.toArray(); + + if (!config) { + std::cerr << "No configuration provided" << std::endl; + return -EINVAL; + } + + /* If no configuration values nothing to do. */ + if (!streamParameters.size()) + return 0; + + if (config->size() != streamParameters.size()) { + std::cerr + << "Number of streams in configuration " + << config->size() + << " does not match number of streams parsed " + << streamParameters.size() + << std::endl; + return -EINVAL; + } + + unsigned int i = 0; + for (auto const &value : streamParameters) { + KeyValueParser::Options opts = value.toKeyValues(); + StreamConfiguration &cfg = config->at(i++); + + if (opts.isSet("width") && opts.isSet("height")) { + cfg.size.width = opts["width"]; + cfg.size.height = opts["height"]; + } + + /* \todo Translate 4CC string to pixelformat with modifier. */ + if (opts.isSet("pixelformat")) + cfg.pixelFormat = PixelFormat(opts["pixelformat"]); + } + + return 0; +} + +bool StreamKeyValueParser::parseRole(StreamRole *role, + const KeyValueParser::Options &options) +{ + if (!options.isSet("role")) + return false; + + std::string name = options["role"].toString(); + + if (name == "viewfinder") { + *role = StreamRole::Viewfinder; + return true; + } else if (name == "video") { + *role = StreamRole::VideoRecording; + return true; + } else if (name == "still") { + *role = StreamRole::StillCapture; + return true; + } else if (name == "stillraw") { + *role = StreamRole::StillCaptureRaw; + return true; + } + + return false; +} diff --git a/src/cam/stream_options.h b/src/cam/stream_options.h new file mode 100644 index 0000000000000000..577391f05570e85c --- /dev/null +++ b/src/cam/stream_options.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2020, Raspberry Pi (Trading) Ltd. + * + * stream_options.h - Helper to parse options for streams + */ +#ifndef __CAM_STREAM_OPTIONS_H__ +#define __CAM_STREAM_OPTIONS_H__ + +#include + +#include "options.h" + +using namespace libcamera; + +class StreamKeyValueParser : public KeyValueParser +{ +public: + StreamKeyValueParser(); + + KeyValueParser::Options parse(const char *arguments) override; + + static StreamRoles roles(const OptionValue &values); + static int updateConfiguration(CameraConfiguration *config, + const OptionValue &values); + +private: + static bool parseRole(StreamRole *role, + const KeyValueParser::Options &options); +}; + +#endif /* __CAM_STREAM_OPTIONS_H__ */