3 files changed, 55 insertions, 90 deletions

diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index be327f5d..91ef6753 100644
--- a/src/libcamera/camera_manager.cpp
+++ b/src/libcamera/camera_manager.cpp
@@ -74,20 +74,24 @@ int CameraManager::start()
 	 * file and only fallback on all handlers if there is no
 	 * configuration file.
 	 */
-	std::vector<std::string> handlers = PipelineHandlerFactory::handlers();
-
-	for (std::string const &handler : handlers) {
-		PipelineHandler *pipe;
+	std::vector<PipelineHandlerFactory *> &handlers = PipelineHandlerFactory::handlers();
 
+	for (PipelineHandlerFactory *factory : handlers) {
 		/*
 		 * Try each pipeline handler until it exhaust
 		 * all pipelines it can provide.
 		 */
-		do {
-			pipe = PipelineHandlerFactory::create(handler, enumerator_);
-			if (pipe)
-				pipes_.push_back(pipe);
-		} while (pipe);
+		while (1) {
+			PipelineHandler *pipe = factory->create();
+			if (!pipe->match(enumerator_)) {
+				delete pipe;
+				break;
+			}
+
+			LOG(Debug) << "Pipeline handler \"" << factory->name()
+				   << "\" matched";
+			pipes_.push_back(pipe);
+		}
 	}
 
 	/* TODO: register hot-plug callback here */
diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
index fdf8b8db..764dde9c 100644
--- a/src/libcamera/include/pipeline_handler.h
+++ b/src/libcamera/include/pipeline_handler.h
@@ -31,29 +31,28 @@ public:
 class PipelineHandlerFactory
 {
 public:
+	PipelineHandlerFactory(const char *name);
 	virtual ~PipelineHandlerFactory() { };
 
 	virtual PipelineHandler *create() = 0;
 
-	static void registerType(const std::string &name, PipelineHandlerFactory *factory);
-	static PipelineHandler *create(const std::string &name, DeviceEnumerator *enumerator);
-	static std::vector<std::string> handlers();
+	const std::string &name() const { return name_; }
+
+	static void registerType(PipelineHandlerFactory *factory);
+	static std::vector<PipelineHandlerFactory *> &handlers();
 
 private:
-	static std::map<std::string, PipelineHandlerFactory *> &registry();
+	std::string name_;
 };
 
-#define REGISTER_PIPELINE_HANDLER(handler) \
-class handler##Factory : public PipelineHandlerFactory { \
-public: \
-	handler##Factory() \
-	{ \
-		PipelineHandlerFactory::registerType(#handler, this); \
-	} \
-	virtual PipelineHandler *create() { \
-		return new handler(); \
-	} \
-}; \
+#define REGISTER_PIPELINE_HANDLER(handler)				\
+class handler##Factory : public PipelineHandlerFactory {		\
+public:									\
+	handler##Factory() : PipelineHandlerFactory(#handler) { }	\
+	PipelineHandler *create() final {				\
+		return new handler();					\
+	}								\
+};									\
 static handler##Factory global_##handler##Factory;
 
 } /* namespace libcamera */
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.
  *
@@ -89,6 +88,21 @@ namespace libcamera {
  */
 
 /**
+ * \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
  *
@@ -99,77 +113,25 @@ namespace libcamera {
  */
 
 /**
+ * \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<std::string, PipelineHandlerFactory *> &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<std::string, PipelineHandlerFactory *> &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<std::string> PipelineHandlerFactory::handlers()
+void PipelineHandlerFactory::registerType(PipelineHandlerFactory *factory)
 {
-	std::map<std::string, PipelineHandlerFactory *> &factories = registry();
-	std::vector<std::string> handlers;
+	std::vector<PipelineHandlerFactory *> &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<std::string> PipelineHandlerFactory::handlers()
  *
  * \return the list of pipeline handler factories
  */
-std::map<std::string, PipelineHandlerFactory *> &PipelineHandlerFactory::registry()
+std::vector<PipelineHandlerFactory *> &PipelineHandlerFactory::handlers()
 {
-	static std::map<std::string, PipelineHandlerFactory *> factories;
+	static std::vector<PipelineHandlerFactory *> factories;
 	return factories;
 }