[RFC,v1,10/20] libcamera: camera_manager: Extract the pipeline handler factory list
diff mbox series

Message ID 20260918080734.1228227-11-naush@raspberrypi.com
State New
Headers show
Series
  • libcamera: New enumeration API
Related show

Commit Message

Naushir Patuck Sept. 18, 2026, 7:59 a.m. UTC 
Split the selection of the pipeline handler factories to consider out of
createPipelineHandlers() into a pipelineFactories() helper returning them
in match order.

This is done to avoid code duplication as the camera enumeration (added
in a future commit) needs the same list.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
---
 include/libcamera/internal/camera_manager.h |  1 +
 src/libcamera/camera_manager.cpp            | 37 ++++++++++++++-------
 2 files changed, 26 insertions(+), 12 deletions(-)

Patch
diff mbox series 

diff --git a/include/libcamera/internal/camera_manager.h b/include/libcamera/internal/camera_manager.h
index 89c8e4eda766..e6df676bb655 100644
--- a/include/libcamera/internal/camera_manager.h
+++ b/include/libcamera/internal/camera_manager.h
@@ -53,6 +53,7 @@  protected:
 
 private:
 	int init();
+	std::vector<const PipelineHandlerFactoryBase *> pipelineFactories() const;
 	void createPipelineHandlers();
 	void pipelineFactoryMatch(const PipelineHandlerFactoryBase *factory);
 	std::shared_ptr<PipelineHandler> findMatchingHandler(const MediaDevice *media);
diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index bd9cc155b961..55cf650b8e66 100644
--- a/src/libcamera/camera_manager.cpp
+++ b/src/libcamera/camera_manager.cpp
@@ -120,8 +120,15 @@  int CameraManager::Private::init()
 	return 0;
 }
 
-void CameraManager::Private::createPipelineHandlers()
+/*
+ * Retrieve the pipeline handler factories to consider, in match order. When a
+ * list of preferred pipelines is defined in the configuration, the ordered list
+ * is exclusive. Otherwise all factories are returned in registration order.
+ */
+std::vector<const PipelineHandlerFactoryBase *> CameraManager::Private::pipelineFactories() const
 {
+	std::vector<const PipelineHandlerFactoryBase *> selected;
+
 	/*
 	 * \todo Try to read handlers and order from configuration
 	 * file and only fallback on environment variable or all handlers, if
@@ -129,11 +136,9 @@  void CameraManager::Private::createPipelineHandlers()
 	 */
 	const auto pipesList =
 		configuration().listOption({ "pipelines_match_list" });
+
+	/* The configured list is exclusive, skip all other factories. */
 	if (pipesList.has_value()) {
-		/*
-		 * When a list of preferred pipelines is defined, iterate
-		 * through the ordered list to match the enumerated devices.
-		 */
 		for (const auto &pipeName : pipesList.value()) {
 			const PipelineHandlerFactoryBase *factory;
 			factory = PipelineHandlerFactoryBase::getFactoryByName(pipeName);
@@ -143,10 +148,10 @@  void CameraManager::Private::createPipelineHandlers()
 			LOG(Camera, Debug)
 				<< "Found listed pipeline handler '"
 				<< pipeName << "'";
-			pipelineFactoryMatch(factory);
+			selected.push_back(factory);
 		}
 
-		return;
+		return selected;
 	}
 
 	const std::vector<PipelineHandlerFactoryBase *> &factories =
@@ -157,12 +162,20 @@  void CameraManager::Private::createPipelineHandlers()
 		LOG(Camera, Debug)
 			<< "Found registered pipeline handler '"
 			<< factory->name() << "'";
-		/*
-		 * Try each pipeline handler until it exhaust
-		 * all pipelines it can provide.
-		 */
-		pipelineFactoryMatch(factory);
+		selected.push_back(factory);
 	}
+
+	return selected;
+}
+
+void CameraManager::Private::createPipelineHandlers()
+{
+	/*
+	 * Try each pipeline handler until it exhausts
+	 * all pipelines it can provide.
+	 */
+	for (const PipelineHandlerFactoryBase *factory : pipelineFactories())
+		pipelineFactoryMatch(factory);
 }
 
 void CameraManager::Private::pipelineFactoryMatch(const PipelineHandlerFactoryBase *factory)