3 files changed, 39 insertions, 10 deletions

diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h
index 7713aea0..8aafd82e 100644
--- a/include/libcamera/internal/camera_sensor.h
+++ b/include/libcamera/internal/camera_sensor.h
@@ -78,12 +78,13 @@ public:
 class CameraSensorFactoryBase
 {
 public:
-	CameraSensorFactoryBase(const char *name);
+	CameraSensorFactoryBase(const char *name, int priority);
 	virtual ~CameraSensorFactoryBase() = default;
 
 	static std::unique_ptr<CameraSensor> create(MediaEntity *entity);
 
 	const std::string &name() const { return name_; }
+	int priority() const { return priority_; }
 
 private:
 	LIBCAMERA_DISABLE_COPY_AND_MOVE(CameraSensorFactoryBase)
@@ -96,14 +97,15 @@ private:
 	match(MediaEntity *entity) const = 0;
 
 	std::string name_;
+	int priority_;
 };
 
 template<typename _CameraSensor>
 class CameraSensorFactory final : public CameraSensorFactoryBase
 {
 public:
-	CameraSensorFactory(const char *name)
-		: CameraSensorFactoryBase(name)
+	CameraSensorFactory(const char *name, int priority)
+		: CameraSensorFactoryBase(name, priority)
 	{
 	}
 
@@ -115,7 +117,7 @@ private:
 	}
 };
 
-#define REGISTER_CAMERA_SENSOR(sensor) \
-static CameraSensorFactory<sensor> global_##sensor##Factory{ #sensor };
+#define REGISTER_CAMERA_SENSOR(sensor, priority) \
+static CameraSensorFactory<sensor> global_##sensor##Factory{ #sensor, priority };
 
 } /* namespace libcamera */
diff --git a/src/libcamera/sensor/camera_sensor.cpp b/src/libcamera/sensor/camera_sensor.cpp
index 951ebd2c..54cf98b2 100644
--- a/src/libcamera/sensor/camera_sensor.cpp
+++ b/src/libcamera/sensor/camera_sensor.cpp
@@ -349,12 +349,13 @@ CameraSensor::~CameraSensor() = default;
 /**
  * \brief Construct a camera sensor factory base
  * \param[in] name The camera sensor factory name
+ * \param[in] priority Priority order for factory selection
  *
  * Creating an instance of the factory base registers it with the global list of
  * factories, accessible through the factories() function.
  */
-CameraSensorFactoryBase::CameraSensorFactoryBase(const char *name)
-	: name_(name)
+CameraSensorFactoryBase::CameraSensorFactoryBase(const char *name, int priority)
+	: name_(name), priority_(priority)
 {
 	registerFactory(this);
 }
@@ -363,6 +364,12 @@ CameraSensorFactoryBase::CameraSensorFactoryBase(const char *name)
  * \brief Create an instance of the CameraSensor corresponding to a media entity
  * \param[in] entity The media entity on the source end of the sensor
  *
+ * When multiple factories match the same \a entity, this function selects the
+ * matching factory with the highest priority as specified to the
+ * REGISTER_CAMERA_SENSOR() macro at factory registration time. If multiple
+ * matching factories have the same highest priority value, which factory gets
+ * selected is undefined and may vary between runs.
+ *
  * \return A unique pointer to a new instance of the CameraSensor subclass
  * matching the entity, or a null pointer if no such factory exists
  */
@@ -400,7 +407,16 @@ std::unique_ptr<CameraSensor> CameraSensorFactoryBase::create(MediaEntity *entit
  */
 
 /**
+ * \fn CameraSensorFactoryBase::priority()
+ * \brief Retrieve the priority value for the factory
+ * \return The priority value for the factory
+ */
+
+/**
  * \brief Retrieve the list of all camera sensor factories
+ *
+ * The factories are sorted in decreasing priority order.
+ *
  * \return The list of camera sensor factories
  */
 std::vector<CameraSensorFactoryBase *> &CameraSensorFactoryBase::factories()
@@ -423,7 +439,12 @@ void CameraSensorFactoryBase::registerFactory(CameraSensorFactoryBase *factory)
 	std::vector<CameraSensorFactoryBase *> &factories =
 		CameraSensorFactoryBase::factories();
 
-	factories.push_back(factory);
+	auto pos = std::upper_bound(factories.begin(), factories.end(), factory,
+				    [](const CameraSensorFactoryBase *value,
+				       const CameraSensorFactoryBase *elem) {
+					    return value->priority() > elem->priority();
+				    });
+	factories.insert(pos, factory);
 }
 
 /**
@@ -449,9 +470,10 @@ void CameraSensorFactoryBase::registerFactory(CameraSensorFactoryBase *factory)
  */
 
 /**
- * \def REGISTER_CAMERA_SENSOR(sensor)
+ * \def REGISTER_CAMERA_SENSOR(sensor, priority)
  * \brief Register a camera sensor type to the sensor factory
  * \param[in] sensor Class name of the CameraSensor derived class to register
+ * \param[in] priority Priority order for factory selection
  *
  * Register a CameraSensor subclass with the factory and make it available to
  * try and match sensors. The subclass needs to implement a static match
@@ -469,6 +491,11 @@ void CameraSensorFactoryBase::registerFactory(CameraSensorFactoryBase *factory)
  *   creation succeeded ;
  * - A non-zero error code if the entity matched and the creation failed ; or
  * - A zero error code if the entity didn't match.
+ *
+ * When multiple factories can support the same MediaEntity (as in the match()
+ * function of multiple factories returning true for the same entity), the \a
+ * priority argument selects which factory will be used. See
+ * CameraSensorFactoryBase::create() for more information.
  */
 
 } /* namespace libcamera */
diff --git a/src/libcamera/sensor/camera_sensor_legacy.cpp b/src/libcamera/sensor/camera_sensor_legacy.cpp
index 68c94533..a9b15c03 100644
--- a/src/libcamera/sensor/camera_sensor_legacy.cpp
+++ b/src/libcamera/sensor/camera_sensor_legacy.cpp
@@ -1010,6 +1010,6 @@ std::string CameraSensorLegacy::logPrefix() const
 	return "'" + entity_->name() + "'";
 }
 
-REGISTER_CAMERA_SENSOR(CameraSensorLegacy)
+REGISTER_CAMERA_SENSOR(CameraSensorLegacy, -100)
 
 } /* namespace libcamera */