libcamera: device_enumerator: Support regex to match entity names

Some entities in a media graph have names that might differ from
implementation to implementation; for example the Camera Receiver
Unit and CSI-2 receiver on the RZ/V2H(P) SoC have entities with names
that include their address, in the form "csi-16000400.csi2". Passing
that entity name to DeviceMatch is too inflexible given it would only
work if that specific CSI-2 receiver were the one being used.

Add an overload for DeviceMatch::add() such that users can pass in a
std::regex instead of a string. Update DeviceMatch::match() to check
for entities that are matched by the regular expressions added with
the new overload after checking for any exact matches from the vector
of strings. This allows us to use regex to match on patterns like
"csi-[0-9a-f]{8}.csi2".

Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
This commit is contained in:
Daniel Scally
2025-06-25 12:54:54 +01:00
committed by Jacopo Mondi
parent 1039a0f2ee
commit 8d068b7470
2 changed files with 41 additions and 1 deletions
@@ -11,6 +11,7 @@
#include <string>
#include <vector>
#include <libcamera/base/regex.h>
#include <libcamera/base/signal.h>
namespace libcamera {
@@ -23,12 +24,14 @@ public:
DeviceMatch(const std::string &driver);
void add(const std::string &entity);
void add(std::regex entity);
bool match(const MediaDevice *device) const;
private:
std::string driver_;
std::vector<std::string> entities_;
std::vector<std::regex> entityRegexs_;
};
class DeviceEnumerator