[v3,3/4] libcamera: media_device: Get entity by regexp
diff mbox series

Message ID 20251203-rzv2h-pre-v3-3-1493e0638626@ideasonboard.com
State New
Headers show
Series
  • Use regular expressions for entity name matching
Related show

Commit Message

Jacopo Mondi Dec. 3, 2025, 9:14 a.m. UTC 
From: Daniel Scally <dan.scally@ideasonboard.com>

Some kernel drivers give their entities names that will differ from
implementation to implementation; for example the drivers for the
Camera Receiver Unit and CSI-2 receiver in the RZ/V2H(P) SoC give their
entities names that include their memory address, in the format
"csi-16000400.csi2". Passing that entity name to
MediaDevice::getEntityByName() is too inflexible given it would only
then work if that specific CSI-2 receiver were the one being used.

Add an overload for MediaDevice::getEntityByName() that accepts a
std::basic_regex instead of a string, and use std::regex_search()
instead of a direct string comparison to find a matching entity. This
allows us to search for entites using regex patterns like
"csi-[0-9a-f]{8}.csi2".

Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>

---
Changes in v3:
- Exit early when searching regexp

	for (MediaEntity *e : entities_) {
	      	if (!std::regex_search(e->name(), name))
			continue;

		if (entity) {

		}
	}

  compared to

	for (MediaEntity *e : entities_) {
	      	if (std::regex_search(e->name(), name)) {
			if (entity) {

			}
		}
	}

Changes in v2:

- Add an overload for ::getEntityByName() instead of replacing the
  existing functionality. The new overload takes a regex, but will
  return a nullptr in the event that the given regex matches multiple
  entities.
---
 include/libcamera/internal/media_device.h |  2 ++
 src/libcamera/media_device.cpp            | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

Patch
diff mbox series 

diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h
index 2eb3ad988b09fca304b71eb726cc724d301e7891..5c1f14b63823f31bcf70eeb3abb6efe9bc891f29 100644
--- a/include/libcamera/internal/media_device.h
+++ b/include/libcamera/internal/media_device.h
@@ -15,6 +15,7 @@ 
 #include <linux/media.h>
 
 #include <libcamera/base/log.h>
+#include <libcamera/base/regex.h>
 #include <libcamera/base/signal.h>
 #include <libcamera/base/unique_fd.h>
 
@@ -47,6 +48,7 @@  public:
 
 	const std::vector<MediaEntity *> &entities() const { return entities_; }
 	MediaEntity *getEntityByName(const std::string &name) const;
+	MediaEntity *getEntityByName(const std::regex &name) const;
 
 	MediaLink *link(const std::string &sourceName, unsigned int sourceIdx,
 			const std::string &sinkName, unsigned int sinkIdx);
diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp
index 2a848ebed99894fff3e44fad63e1f17d0ba9d647..8c82a2b1488b4d72eb3e0930f04ff604395e9f92 100644
--- a/src/libcamera/media_device.cpp
+++ b/src/libcamera/media_device.cpp
@@ -342,6 +342,32 @@  MediaEntity *MediaDevice::getEntityByName(const std::string &name) const
 	return nullptr;
 }
 
+/**
+ * \brief Return the MediaEntity with name matching the regex \a name
+ * \param[in] name A regex to match the entity name
+ * \return The entity matching the regex \a name, or nullptr if no such entity
+ * is found or multiple entities match on \a name
+ */
+MediaEntity *MediaDevice::getEntityByName(const std::regex &name) const
+{
+	MediaEntity *entity = nullptr;
+
+	for (MediaEntity *e : entities_) {
+		if (!std::regex_search(e->name(), name))
+			continue;
+
+		if (entity) {
+			LOG(MediaDevice, Error)
+				<< "Multiple entities match given regex";
+			return nullptr;
+		}
+
+		entity = e;
+	}
+
+	return entity;
+}
+
 /**
  * \brief Retrieve the MediaLink connecting two pads, identified by entity
  * names and pad indexes