From patchwork Sat Dec 22 23:00:38 2018 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: 85 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1EF1C60B34 for ; Sun, 23 Dec 2018 00:02:33 +0100 (CET) X-Halon-ID: 996a0c8f-063d-11e9-9adf-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from wyvern.dyn.berto.se (unknown [217.31.177.236]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 996a0c8f-063d-11e9-9adf-005056917a89; Sun, 23 Dec 2018 00:02:06 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Sun, 23 Dec 2018 00:00:38 +0100 Message-Id: <20181222230041.29999-10-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181222230041.29999-1-niklas.soderlund@ragnatech.se> References: <20181222230041.29999-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 09/12] libcamera: pipelinehandler: add PipelineHandler class X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Dec 2018 23:02:33 -0000 Provide a PipelineHandler which represents a handler for one or more media devices and provider of one or more cameras. Signed-off-by: Niklas Söderlund --- src/libcamera/include/pipelinehandler.h | 71 ++++++++++++++ src/libcamera/meson.build | 2 + src/libcamera/pipelinehandler.cpp | 122 ++++++++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 src/libcamera/include/pipelinehandler.h create mode 100644 src/libcamera/pipelinehandler.cpp diff --git a/src/libcamera/include/pipelinehandler.h b/src/libcamera/include/pipelinehandler.h new file mode 100644 index 0000000000000000..0e2f497a4fda3caa --- /dev/null +++ b/src/libcamera/include/pipelinehandler.h @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2018, Google Inc. + * + * pipelinehandler.h - Pipeline handler infrastructure + */ +#ifndef __LIBCAMERA_PIPELINEHANDLER_H__ +#define __LIBCAMERA_PIPELINEHANDLER_H__ + +#include +#include +#include + +#include + +namespace libcamera { + +class DeviceEnumerator; +class PipelineHandlerFactory; + +class PipelineHandler +{ +public: + virtual ~PipelineHandler() { }; + + virtual bool match(DeviceEnumerator *enumerator) = 0; + + virtual unsigned int count() = 0; + virtual Camera *camera(unsigned int id) = 0; + + static void registerType(const std::string &name, PipelineHandlerFactory *factory); + static PipelineHandler *create(const std::string &name, DeviceEnumerator *enumerator); + static void handlers(std::vector &handlers); + +private: + static std::map ®istry(); +}; + +class PipelineHandlerFactory +{ +public: + + virtual ~PipelineHandlerFactory() { }; + + virtual PipelineHandler *create() = 0; +}; + +/** + * \brief Register a pipeline hander with the global list + * + * \param[in] handler Class name of PipelineHandler subclass to register + * + * Register a specifc pipline handler with the global list and make it + * avaiable to try and match devices for libcamera. + */ +#define REGISTER_PIPELINE(handler) \ + class handler##Factory : public PipelineHandlerFactory { \ + public: \ + handler##Factory() \ + { \ + PipelineHandler::registerType(#handler, this); \ + } \ + virtual PipelineHandler *create() { \ + return new handler(); \ + } \ + }; \ + static handler##Factory global_##handler##Factory; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_PIPELINEHANDLER_H__ */ diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 17cdf06dd2bedfb3..0776643d3064129d 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -3,11 +3,13 @@ libcamera_sources = files([ 'deviceenumerator.cpp', 'log.cpp', 'main.cpp', + 'pipelinehandler.cpp', ]) libcamera_headers = files([ 'include/deviceenumerator.h', 'include/log.h', + 'include/pipelinehandler.h', 'include/utils.h', ]) diff --git a/src/libcamera/pipelinehandler.cpp b/src/libcamera/pipelinehandler.cpp new file mode 100644 index 0000000000000000..3c47f1ceb72eb6f6 --- /dev/null +++ b/src/libcamera/pipelinehandler.cpp @@ -0,0 +1,122 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2018, Google Inc. + * + * pipelinehandler.cpp - Pipeline handler infrastructure + */ + +#include "deviceenumerator.h" +#include "log.h" +#include "pipelinehandler.h" + +/** + * \file pipelinehandler.h + * \brief Create pipelines and cameras from one or more media device + * + * Each pipeline supported by libcamera needs to be backed by a pipeline + * handler implementation which describes the one or many media devices + * needed for a pipeline to function properly. + * + * The pipeline handler is responsible to find all media devices it requires + * to operate and once it retrieves them create all the camera devices + * it is able to support with the that set of devices. + * + * To make it a bit less bit complicated to write pipe line handlers a + * important macro REGISTER_PIPELINE() is provided which allows a pipeline + * hander implementation to register itself with the library with ease. + * + * \todo Figure out how and if the PipelineHandler should be involved in + * controlling cameras with resource dependencies and if the handler + * should provide helpers for cameras to control media graph links. + */ + +namespace libcamera { + + +/** + * \class PipelineHandler + * \brief Find a set of media devices and provide cameras + * + * The responsibility of a PipelineHandler is to describe all media + * devices it would need in order to provide cameras to the system. + */ + +/** + * \brief Add a pipeline hander to the global list + * + * \param[in] name Name of the pipeline handler to add + * \param[in] factory Factory to use to construct the pipeline + * + * The caller is responsible to guarantee the uniqueness of the pipeline name. + */ +void PipelineHandler::registerType(const std::string &name, PipelineHandlerFactory *factory) +{ + std::map &factories = registry(); + + if (factories.count(name)) { + LOG(Error) << "Registering '" << name << "' pipeline twice"; + return; + } + + factories[name] = factory; +} + +/** + * \brief Create a new pipeline hander and try to match it + * + * \param[in] name Name of the pipeline handler to try + * \param[in] enumerator Numerator to to search for a match for the handler + * + * Search \a enumerator for a match for a pipeline handler named \a name. + * + * \return Pipeline handler if a match was found else NULL + */ +PipelineHandler *PipelineHandler::create(const std::string &name, DeviceEnumerator *enumerator) +{ + std::map &factories = registry(); + + if (!factories.count(name)) { + LOG(Error) << "Trying to create non-existing pipeline handler " << name; + return NULL; + } + + PipelineHandler *pipe; + + pipe = factories[name]->create(); + + if (pipe->match(enumerator)) + return pipe; + + delete pipe; + return NULL; +} + +/** + * \brief List all names of handlers from the global list + * + * \param[out] handlers Names of all handlers registered with the global list + */ +void PipelineHandler::handlers(std::vector &handlers) +{ + std::map &factories = registry(); + + for (auto const &handler : factories) + handlers.push_back(handler.first); +} + +/** + * \brief Static global list of pipeline handlers + * + * It might seem odd to hide the static map inside a function. + * This is needed to make sure the list is created before anyone + * tries to access it and creating problems at link time. + * + * \return Global list of pipeline handlers + */ +std::map &PipelineHandler::registry() +{ + static std::map factories; + return factories; +} + +} /* namespace libcamera */