From 5cb45181d7a6379d7eb3717f2ca8f0ab799baa1f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 23 Feb 2024 14:03:32 +0200 Subject: libcamera: camera_sensor: Sort factories by priority In order to support a default implementation for camera sensors when no better implementation matches, libcamera needs to try "specialized" implementations first and pick the default last. Make this possible by adding a priority value for factories. Newly registered factories are inserted in the factories list sorted by descending priority, and the default factory uses a negative priority to be inserted as the last element. This mechanism may be a bit overkill in the sense that there is no expected use cases for priorities other than trying the default last, but the implementation is simple and easy to understand. Signed-off-by: Laurent Pinchart Reviewed-by: Stefan Klug Reviewed-by: Jacopo Mondi Signed-off-by: Jacopo Mondi --- include/libcamera/internal/camera_sensor.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'include') 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 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 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 global_##sensor##Factory{ #sensor }; +#define REGISTER_CAMERA_SENSOR(sensor, priority) \ +static CameraSensorFactory global_##sensor##Factory{ #sensor, priority }; } /* namespace libcamera */ -- cgit v1.2.1