[libcamera-devel,v6,2/8] libcamera: Allow access to v4l2_query_ext_ctrl structure for a V4L2 control
diff mbox series

Message ID 20200902104410.7569-3-david.plowman@raspberrypi.com
State Accepted
Headers show
Series
  • 2D transforms
Related show

Commit Message

David Plowman Sept. 2, 2020, 10:44 a.m. UTC 
The V4L2Device::controInfo method simply returns a pointer to the
v4l2_query_ext_ctrl structure for the given control, which has already
been retrieved and stored.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/internal/v4l2_device.h |  2 ++
 src/libcamera/v4l2_device.cpp            | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

Comments

Kieran Bingham Sept. 2, 2020, 11:32 a.m. UTC | #1 
Hi David,

On 02/09/2020 11:44, David Plowman wrote:
> The V4L2Device::controInfo method simply returns a pointer to the
> v4l2_query_ext_ctrl structure for the given control, which has already
> been retrieved and stored.
> 
> Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  include/libcamera/internal/v4l2_device.h |  2 ++
>  src/libcamera/v4l2_device.cpp            | 15 +++++++++++++++
>  2 files changed, 17 insertions(+)
> 
> diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h
> index 3b605aa..722fb72 100644
> --- a/include/libcamera/internal/v4l2_device.h
> +++ b/include/libcamera/internal/v4l2_device.h
> @@ -29,6 +29,8 @@ public:
>  	ControlList getControls(const std::vector<uint32_t> &ids);
>  	int setControls(ControlList *ctrls);
>  
> +	const struct v4l2_query_ext_ctrl *controlInfo(uint32_t id) const;
> +
>  	const std::string &deviceNode() const { return deviceNode_; }
>  	std::string devicePath() const;
>  
> diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp
> index 65830d4..e8399c4 100644
> --- a/src/libcamera/v4l2_device.cpp
> +++ b/src/libcamera/v4l2_device.cpp
> @@ -353,6 +353,21 @@ int V4L2Device::setControls(ControlList *ctrls)
>  	return ret;
>  }
>  
> +/**
> + * \brief Return the v4l2_query_ext_ctrl information for the given control.
> + * \param[in] id The V4L2 control id
> + * \return A pointer to the v4l2_query_ext_ctrl structure for the given
> + * control, or a null pointer if not found
> + */
> +const struct v4l2_query_ext_ctrl *V4L2Device::controlInfo(uint32_t id) const
> +{
> +	const auto it = controlInfo_.find(id);
> +	if (it == controlInfo_.end())
> +		return nullptr;
> +
> +	return &it->second;
> +}
> +
>  /**
>   * \brief Retrieve the device path in sysfs
>   *
>

Patch
diff mbox series 

diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h
index 3b605aa..722fb72 100644
--- a/include/libcamera/internal/v4l2_device.h
+++ b/include/libcamera/internal/v4l2_device.h
@@ -29,6 +29,8 @@  public:
 	ControlList getControls(const std::vector<uint32_t> &ids);
 	int setControls(ControlList *ctrls);
 
+	const struct v4l2_query_ext_ctrl *controlInfo(uint32_t id) const;
+
 	const std::string &deviceNode() const { return deviceNode_; }
 	std::string devicePath() const;
 
diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp
index 65830d4..e8399c4 100644
--- a/src/libcamera/v4l2_device.cpp
+++ b/src/libcamera/v4l2_device.cpp
@@ -353,6 +353,21 @@  int V4L2Device::setControls(ControlList *ctrls)
 	return ret;
 }
 
+/**
+ * \brief Return the v4l2_query_ext_ctrl information for the given control.
+ * \param[in] id The V4L2 control id
+ * \return A pointer to the v4l2_query_ext_ctrl structure for the given
+ * control, or a null pointer if not found
+ */
+const struct v4l2_query_ext_ctrl *V4L2Device::controlInfo(uint32_t id) const
+{
+	const auto it = controlInfo_.find(id);
+	if (it == controlInfo_.end())
+		return nullptr;
+
+	return &it->second;
+}
+
 /**
  * \brief Retrieve the device path in sysfs
  *