diff mbox series

[v4,6/8] media-ctl: Check for Streams API support

Message ID 20230421124428.393261-7-tomi.valkeinen@ideasonboard.com (mailing list archive)
State New, archived
Headers show
Series [v4,1/8] v4l2-ctl: Add routing and streams support | expand

Commit Message

Tomi Valkeinen April 21, 2023, 12:44 p.m. UTC 
Do two things:

- Inform the kernel that we support streams with a call to
  VIDIOC_SUBDEV_S_CLIENT_CAP

- Use the returns from VIDIOC_SUBDEV_S_CLIENT_CAP and
  VIDIOC_SUBDEV_QUERYCAP to decide if streams are supported. If not,
  fail in case the user tries to use streams.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 utils/media-ctl/libv4l2subdev.c | 54 +++++++++++++++++++++++++++++++++
 utils/media-ctl/mediactl-priv.h |  1 +
 2 files changed, 55 insertions(+)

Comments

Laurent Pinchart April 24, 2023, 7:54 a.m. UTC | #1 
Hi Tomi,

Thank you for the patch.

On Fri, Apr 21, 2023 at 03:44:26PM +0300, Tomi Valkeinen wrote:
> Do two things:

That usually calls for two patches ;-) Or an explanation in the commit
message about why the two are combined.

> - Inform the kernel that we support streams with a call to
>   VIDIOC_SUBDEV_S_CLIENT_CAP
> 
> - Use the returns from VIDIOC_SUBDEV_S_CLIENT_CAP and
>   VIDIOC_SUBDEV_QUERYCAP to decide if streams are supported. If not,
>   fail in case the user tries to use streams.
> 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> ---
>  utils/media-ctl/libv4l2subdev.c | 54 +++++++++++++++++++++++++++++++++
>  utils/media-ctl/mediactl-priv.h |  1 +
>  2 files changed, 55 insertions(+)
> 
> diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c
> index 9205cfa4..186708ff 100644
> --- a/utils/media-ctl/libv4l2subdev.c
> +++ b/utils/media-ctl/libv4l2subdev.c
> @@ -42,6 +42,12 @@
>  
>  int v4l2_subdev_open(struct media_entity *entity)
>  {
> +	struct v4l2_subdev_client_capability clientcap = {};
> +	struct v4l2_subdev_capability subdevcap = {};
> +	bool subdev_streams;
> +	bool client_streams;
> +	int ret;
> +
>  	if (entity->fd != -1)
>  		return 0;
>  
> @@ -54,6 +60,16 @@ int v4l2_subdev_open(struct media_entity *entity)
>  		return ret;
>  	}
>  
> +	ret = ioctl(entity->fd, VIDIOC_SUBDEV_QUERYCAP, &subdevcap);
> +	subdev_streams = !ret && (subdevcap.capabilities & V4L2_SUBDEV_CAP_STREAMS);
> +
> +	clientcap.capabilities = V4L2_SUBDEV_CLIENT_CAP_STREAMS;
> +
> +	ret = ioctl(entity->fd, VIDIOC_SUBDEV_S_CLIENT_CAP, &clientcap);
> +	client_streams = !ret && (clientcap.capabilities & V4L2_SUBDEV_CLIENT_CAP_STREAMS);
> +
> +	entity->supports_streams = subdev_streams && client_streams;
> +
>  	return 0;
>  }
>  
> @@ -74,6 +90,11 @@ int v4l2_subdev_get_format(struct media_entity *entity,
>  	if (ret < 0)
>  		return ret;
>  
> +	if (!entity->supports_streams && stream) {
> +		media_dbg(entity->media, "Streams API not supported\n");
> +		return -ENOTSUP;
> +	}
> +
>  	memset(&fmt, 0, sizeof(fmt));
>  	fmt.pad = pad;
>  	fmt.stream = stream;
> @@ -99,6 +120,11 @@ int v4l2_subdev_set_format(struct media_entity *entity,
>  	if (ret < 0)
>  		return ret;
>  
> +	if (!entity->supports_streams && stream) {
> +		media_dbg(entity->media, "Streams API not supported\n");
> +		return -ENOTSUP;
> +	}
> +
>  	memset(&fmt, 0, sizeof(fmt));
>  	fmt.pad = pad;
>  	fmt.stream = stream;
> @@ -127,6 +153,11 @@ int v4l2_subdev_get_selection(struct media_entity *entity,
>  	if (ret < 0)
>  		return ret;
>  
> +	if (!entity->supports_streams && stream) {
> +		media_dbg(entity->media, "Streams API not supported\n");
> +		return -ENOTSUP;
> +	}
> +
>  	memset(&u.sel, 0, sizeof(u.sel));
>  	u.sel.pad = pad;
>  	u.sel.target = target;
> @@ -166,6 +197,11 @@ int v4l2_subdev_set_selection(struct media_entity *entity,
>  	if (ret < 0)
>  		return ret;
>  
> +	if (!entity->supports_streams && stream) {
> +		media_dbg(entity->media, "Streams API not supported\n");
> +		return -ENOTSUP;
> +	}
> +
>  	memset(&u.sel, 0, sizeof(u.sel));
>  	u.sel.pad = pad;
>  	u.sel.stream = stream;
> @@ -210,6 +246,11 @@ int v4l2_subdev_set_routing(struct media_entity *entity,
>  	if (ret < 0)
>  		return ret;
>  
> +	if (!entity->supports_streams) {
> +		media_dbg(entity->media, "Streams API not supported\n");
> +		return -ENOTSUP;
> +	}
> +
>  	ret = ioctl(entity->fd, VIDIOC_SUBDEV_S_ROUTING, &routing);
>  	if (ret == -1)
>  		return -errno;
> @@ -231,6 +272,9 @@ int v4l2_subdev_get_routing(struct media_entity *entity,
>  	if (ret < 0)
>  		return ret;
>  
> +	if (!entity->supports_streams)

No need for a debug message here ?

Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

> +		return -ENOTSUP;
> +
>  	ret = ioctl(entity->fd, VIDIOC_SUBDEV_G_ROUTING, &routing);
>  	if (ret == -1 && errno != ENOSPC)
>  		return -errno;
> @@ -341,6 +385,11 @@ int v4l2_subdev_get_frame_interval(struct media_entity *entity,
>  	if (ret < 0)
>  		return ret;
>  
> +	if (!entity->supports_streams && stream) {
> +		media_dbg(entity->media, "Streams API not supported\n");
> +		return -ENOTSUP;
> +	}
> +
>  	memset(&ival, 0, sizeof(ival));
>  	ival.pad = pad;
>  	ival.stream = stream;
> @@ -364,6 +413,11 @@ int v4l2_subdev_set_frame_interval(struct media_entity *entity,
>  	if (ret < 0)
>  		return ret;
>  
> +	if (!entity->supports_streams && stream) {
> +		media_dbg(entity->media, "Streams API not supported\n");
> +		return -ENOTSUP;
> +	}
> +
>  	memset(&ival, 0, sizeof(ival));
>  	ival.pad = pad;
>  	ival.stream = stream;
> diff --git a/utils/media-ctl/mediactl-priv.h b/utils/media-ctl/mediactl-priv.h
> index a0d3a55a..eb55e07e 100644
> --- a/utils/media-ctl/mediactl-priv.h
> +++ b/utils/media-ctl/mediactl-priv.h
> @@ -33,6 +33,7 @@ struct media_entity {
>  	struct media_link *links;
>  	unsigned int max_links;
>  	unsigned int num_links;
> +	bool supports_streams;
>  
>  	char devname[32];
>  	int fd;
diff mbox series

Patch

diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c
index 9205cfa4..186708ff 100644
--- a/utils/media-ctl/libv4l2subdev.c
+++ b/utils/media-ctl/libv4l2subdev.c
@@ -42,6 +42,12 @@ 
 
 int v4l2_subdev_open(struct media_entity *entity)
 {
+	struct v4l2_subdev_client_capability clientcap = {};
+	struct v4l2_subdev_capability subdevcap = {};
+	bool subdev_streams;
+	bool client_streams;
+	int ret;
+
 	if (entity->fd != -1)
 		return 0;
 
@@ -54,6 +60,16 @@  int v4l2_subdev_open(struct media_entity *entity)
 		return ret;
 	}
 
+	ret = ioctl(entity->fd, VIDIOC_SUBDEV_QUERYCAP, &subdevcap);
+	subdev_streams = !ret && (subdevcap.capabilities & V4L2_SUBDEV_CAP_STREAMS);
+
+	clientcap.capabilities = V4L2_SUBDEV_CLIENT_CAP_STREAMS;
+
+	ret = ioctl(entity->fd, VIDIOC_SUBDEV_S_CLIENT_CAP, &clientcap);
+	client_streams = !ret && (clientcap.capabilities & V4L2_SUBDEV_CLIENT_CAP_STREAMS);
+
+	entity->supports_streams = subdev_streams && client_streams;
+
 	return 0;
 }
 
@@ -74,6 +90,11 @@  int v4l2_subdev_get_format(struct media_entity *entity,
 	if (ret < 0)
 		return ret;
 
+	if (!entity->supports_streams && stream) {
+		media_dbg(entity->media, "Streams API not supported\n");
+		return -ENOTSUP;
+	}
+
 	memset(&fmt, 0, sizeof(fmt));
 	fmt.pad = pad;
 	fmt.stream = stream;
@@ -99,6 +120,11 @@  int v4l2_subdev_set_format(struct media_entity *entity,
 	if (ret < 0)
 		return ret;
 
+	if (!entity->supports_streams && stream) {
+		media_dbg(entity->media, "Streams API not supported\n");
+		return -ENOTSUP;
+	}
+
 	memset(&fmt, 0, sizeof(fmt));
 	fmt.pad = pad;
 	fmt.stream = stream;
@@ -127,6 +153,11 @@  int v4l2_subdev_get_selection(struct media_entity *entity,
 	if (ret < 0)
 		return ret;
 
+	if (!entity->supports_streams && stream) {
+		media_dbg(entity->media, "Streams API not supported\n");
+		return -ENOTSUP;
+	}
+
 	memset(&u.sel, 0, sizeof(u.sel));
 	u.sel.pad = pad;
 	u.sel.target = target;
@@ -166,6 +197,11 @@  int v4l2_subdev_set_selection(struct media_entity *entity,
 	if (ret < 0)
 		return ret;
 
+	if (!entity->supports_streams && stream) {
+		media_dbg(entity->media, "Streams API not supported\n");
+		return -ENOTSUP;
+	}
+
 	memset(&u.sel, 0, sizeof(u.sel));
 	u.sel.pad = pad;
 	u.sel.stream = stream;
@@ -210,6 +246,11 @@  int v4l2_subdev_set_routing(struct media_entity *entity,
 	if (ret < 0)
 		return ret;
 
+	if (!entity->supports_streams) {
+		media_dbg(entity->media, "Streams API not supported\n");
+		return -ENOTSUP;
+	}
+
 	ret = ioctl(entity->fd, VIDIOC_SUBDEV_S_ROUTING, &routing);
 	if (ret == -1)
 		return -errno;
@@ -231,6 +272,9 @@  int v4l2_subdev_get_routing(struct media_entity *entity,
 	if (ret < 0)
 		return ret;
 
+	if (!entity->supports_streams)
+		return -ENOTSUP;
+
 	ret = ioctl(entity->fd, VIDIOC_SUBDEV_G_ROUTING, &routing);
 	if (ret == -1 && errno != ENOSPC)
 		return -errno;
@@ -341,6 +385,11 @@  int v4l2_subdev_get_frame_interval(struct media_entity *entity,
 	if (ret < 0)
 		return ret;
 
+	if (!entity->supports_streams && stream) {
+		media_dbg(entity->media, "Streams API not supported\n");
+		return -ENOTSUP;
+	}
+
 	memset(&ival, 0, sizeof(ival));
 	ival.pad = pad;
 	ival.stream = stream;
@@ -364,6 +413,11 @@  int v4l2_subdev_set_frame_interval(struct media_entity *entity,
 	if (ret < 0)
 		return ret;
 
+	if (!entity->supports_streams && stream) {
+		media_dbg(entity->media, "Streams API not supported\n");
+		return -ENOTSUP;
+	}
+
 	memset(&ival, 0, sizeof(ival));
 	ival.pad = pad;
 	ival.stream = stream;
diff --git a/utils/media-ctl/mediactl-priv.h b/utils/media-ctl/mediactl-priv.h
index a0d3a55a..eb55e07e 100644
--- a/utils/media-ctl/mediactl-priv.h
+++ b/utils/media-ctl/mediactl-priv.h
@@ -33,6 +33,7 @@  struct media_entity {
 	struct media_link *links;
 	unsigned int max_links;
 	unsigned int num_links;
+	bool supports_streams;
 
 	char devname[32];
 	int fd;