From 34018d23d751e4818ce407b8bec5bafb158c1bb6 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 3 Jan 2019 04:01:15 +0200 Subject: libcamera: pipeline_handler: Don't index factories by name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pipeline handler factories are register in a map indexed by their name, and the list of names is used to expose the factories and look them up. This is unnecessary cumbersome, we can instead store factories in a vector and expose it directly. The pipeline factory users will still have access to the factory names through the factory name() function. The PipelineHandlerFactory::create() method becomes so simple that it can be inlined in its single caller, removing the unneeded usage of the DeviceEnumerator in the factory. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- src/libcamera/pipeline_handler.cpp | 94 ++++++++++++-------------------------- 1 file changed, 28 insertions(+), 66 deletions(-) (limited to 'src/libcamera/pipeline_handler.cpp') diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 1daada86..d244acbd 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -5,7 +5,6 @@ * pipeline_handler.cpp - Pipeline handler infrastructure */ -#include "device_enumerator.h" #include "log.h" #include "pipeline_handler.h" @@ -40,7 +39,7 @@ namespace libcamera { * system * * This function is the main entry point of the pipeline handler. It is called - * by the device enumerator with the \a enumerator passed as an argument. It + * by the camera manager with the \a enumerator passed as an argument. It * shall acquire from the \a enumerator all the media devices it needs for a * single pipeline and create one or multiple Camera instances. * @@ -88,6 +87,21 @@ namespace libcamera { * static list of factories. */ +/** + * \brief Construct a pipeline handler factory + * \param[in] name Name of the pipeline handler class + * + * Creating an instance of the factory registers is with the global list of + * factories, accessible through the handlers() function. + * + * The factory \a name is used for debug purpose and shall be unique. + */ +PipelineHandlerFactory::PipelineHandlerFactory(const char *name) + : name_(name) +{ + registerType(this); +} + /** * \fn PipelineHandlerFactory::create() * \brief Create an instance of the PipelineHandler corresponding to the factory @@ -98,78 +112,26 @@ namespace libcamera { * subclass corresponding to the factory */ +/** + * \fn PipelineHandlerFactory::name() + * \brief Retrieve the factory name + * \return The factory name + */ + /** * \brief Add a pipeline handler class to the registry - * \param[in] name Name of the pipeline handler class * \param[in] factory Factory to use to construct the pipeline handler * * The caller is responsible to guarantee the uniqueness of the pipeline handler * name. */ -void PipelineHandlerFactory::registerType(const std::string &name, - PipelineHandlerFactory *factory) -{ - std::map &factories = registry(); - - if (factories.count(name)) { - LOG(Error) << "Registering '" << name << "' pipeline twice"; - return; - } - - LOG(Debug) << "Registered pipeline handler \"" << name << "\""; - factories[name] = factory; -} - -/** - * \brief Create an instance of a pipeline handler if it matches media devices - * present in the system - * \param[in] name Name of the pipeline handler to instantiate - * \param[in] enumerator Device enumerator to search for a match for the handler - * - * This function matches the media devices required by pipeline \a name against - * the devices enumerated by \a enumerator. - * - * \return the newly created pipeline handler instance if a match was found, or - * nullptr otherwise - */ -PipelineHandler *PipelineHandlerFactory::create(const std::string &name, - DeviceEnumerator *enumerator) -{ - std::map &factories = registry(); - - auto it = factories.find(name); - if (it == factories.end()) { - LOG(Error) << "Trying to create non-existing pipeline handler " - << name; - return nullptr; - } - - PipelineHandler *pipe = it->second->create(); - - if (pipe->match(enumerator)) { - LOG(Debug) << "Pipeline handler \"" << name << "\" matched"; - return pipe; - } - - delete pipe; - return nullptr; -} - -/** - * \brief Retrieve the names of all pipeline handlers registered with the - * factory - * - * \return a list of all registered pipeline handler names - */ -std::vector PipelineHandlerFactory::handlers() +void PipelineHandlerFactory::registerType(PipelineHandlerFactory *factory) { - std::map &factories = registry(); - std::vector handlers; + std::vector &factories = handlers(); - for (auto const &handler : factories) - handlers.push_back(handler.first); + factories.push_back(factory); - return handlers; + LOG(Debug) << "Registered pipeline handler \"" << factory->name() << "\""; } /** @@ -180,9 +142,9 @@ std::vector PipelineHandlerFactory::handlers() * * \return the list of pipeline handler factories */ -std::map &PipelineHandlerFactory::registry() +std::vector &PipelineHandlerFactory::handlers() { - static std::map factories; + static std::vector factories; return factories; } -- cgit v1.2.1