[libcamera-devel] [PATCH v2 04/12] libcamera: device_enumerator: add DeviceMatch class

[Laurent Pinchart]

Hi Niklas,

Thank you for the patch.

On Saturday, 29 December 2018 05:28:47 EET Niklas Söderlund wrote:
> Provide a DeviceMatch class which represents all properties of a media
> device a pipeline hander can specify when searching for a device to use
> in its pipeline.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> ---
> * Changes since v1
> - Remove unneeded std::string(entity) in DeviceMatch::add().
> - Inline matchInfo() and matchEntities() into the only caller,
>   DeviceMatch::match.
> ---
>  src/libcamera/device_enumerator.cpp       | 36 +++++++++++++++++++++++
>  src/libcamera/include/device_enumerator.h | 14 +++++++++
>  2 files changed, 50 insertions(+)
> 
> diff --git a/src/libcamera/device_enumerator.cpp
> b/src/libcamera/device_enumerator.cpp index
> 83dcda9403526010..61b32bb921581f49 100644
> --- a/src/libcamera/device_enumerator.cpp
> +++ b/src/libcamera/device_enumerator.cpp
> @@ -75,4 +75,40 @@ int DeviceInfo::lookup(const std::string &name,
> std::string &devnode) const return 0;
>  }
> 
> +/*
> ---------------------------------------------------------------------------
> -- + * DeviceMatch
> + */
> +
> +DeviceMatch::DeviceMatch(const std::string &driver)
> +	: driver_(driver)
> +{
> +}
> +
> +void DeviceMatch::add(const std::string &entity)
> +{
> +	entities_.push_back(entity);
> +}
> +
> +bool DeviceMatch::match(const DeviceInfo *info) const
> +{
> +	if (driver_ != info->info().driver)
> +		return false;
> +
> +	for (const std::string &name : entities_) {
> +		bool found = false;
> +
> +		for (const std::string &entity : info->entities()) {
> +			if (name == entity) {
> +				found = true;
> +				break;
> +			}
> +		}
> +
> +		if (!found)
> +			return false;
> +	}
> +
> +	return true;
> +}
> +
>  } /* namespace libcamera */
> diff --git a/src/libcamera/include/device_enumerator.h
> b/src/libcamera/include/device_enumerator.h index
> ac40bafc5169c7c7..ed1e986ff45f95f5 100644
> --- a/src/libcamera/include/device_enumerator.h
> +++ b/src/libcamera/include/device_enumerator.h
> @@ -39,6 +39,20 @@ private:
>  	std::map<std::string, std::string> entities_;
>  };
> 
> +class DeviceMatch
> +{
> +public:
> +	DeviceMatch(const std::string &driver);
> +
> +	void add(const std::string &entity);
> +
> +	bool match(const DeviceInfo *info) const;
> +
> +private:
> +	std::string driver_;
> +	std::vector<std::string> entities_;
> +};
> +
>  } /* namespace libcamera */
> 
>  #endif	/* __LIBCAMERA_DEVICE_ENUMERATOR_H__ */


-- 
Regards,

Laurent Pinchart