[v2] Add support to reset device controls
diff mbox series

Message ID 20181210111808.10890-1-kieran.bingham@ideasonboard.com
State New
Delegated to: Kieran Bingham
Headers show
Series
  • [v2] Add support to reset device controls
Related show

Commit Message

Kieran Bingham Dec. 10, 2018, 11:18 a.m. UTC
Provide a new option '--reset-controls' which will enumerate the
available controls on a device or sub-device, and re-initialise them to
defaults.

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

---

v2:
 - Rebase and rework to sit on top of the compound control changes

With this patch, and the updated VSP-Tests series, the M3-N now
successfully passes all of the tests using the VSP1.

This patch is available on the 'vsp' branch at:
  https://github.com/kbingham/yavta.git


 yavta.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

Comments

Laurent Pinchart Dec. 10, 2018, 12:31 p.m. UTC | #1
Hi Kieran,

Thank you for the patch.

On Monday, 10 December 2018 13:18:08 EET Kieran Bingham wrote:
> Provide a new option '--reset-controls' which will enumerate the
> available controls on a device or sub-device, and re-initialise them to
> defaults.
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> 
> ---
> 
> v2:
>  - Rebase and rework to sit on top of the compound control changes
> 
> With this patch, and the updated VSP-Tests series, the M3-N now
> successfully passes all of the tests using the VSP1.
> 
> This patch is available on the 'vsp' branch at:
>   https://github.com/kbingham/yavta.git
> 
> 
>  yavta.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
>  1 file changed, 54 insertions(+), 2 deletions(-)
> 
> diff --git a/yavta.c b/yavta.c
> index 625a93ba879d..656ead0f0a37 100644
> --- a/yavta.c
> +++ b/yavta.c
> @@ -1547,7 +1547,43 @@ static void video_set_control(struct device *dev,
> unsigned int id, free(ctrl.ptr);
>  }
> 
> -static void video_list_controls(struct device *dev)
> +static int video_reset_control(struct device *dev, unsigned int id)
> +{
> +	struct v4l2_query_ext_ctrl query;
> +	struct v4l2_ext_control ctrl;
> +	int ret;
> +
> +	ret = query_control(dev, id, &query);
> +	if (ret < 0)
> +		return ret;
> +
> +	if (query.type == V4L2_CTRL_TYPE_CTRL_CLASS)
> +		return query.id;
> +
> +	/* Skip controls that we cannot (or should not) update. */
> +	if (query.flags & (V4L2_CTRL_FLAG_DISABLED
> +			|  V4L2_CTRL_FLAG_VOLATILE
> +			|  V4L2_CTRL_FLAG_READ_ONLY))
> +		return query.id;
> +
> +	ctrl.id = query.id;
> +	ctrl.value = query.default_value;
> +
> +	ret = set_control(dev, &query, &ctrl);
> +	if (ret < 0) {
> +		printf("unable to reset control 0x%8.8x: %s (%d).\n",
> +			id, strerror(errno), errno);
> +	} else {
> +		printf("control 0x%08x reset to ", id);
> +
> +		video_print_control_value(&query, &ctrl);
> +		printf("\n");
> +	}
> +
> +	return query.id;
> +}
> +
> +static void video_list_controls(struct device *dev, bool reset)
>  {
>  	unsigned int nctrls = 0;
>  	unsigned int id;
> @@ -1568,6 +1604,12 @@ static void video_list_controls(struct device *dev)
>  		if (ret < 0)
>  			break;
> 
> +		if (reset) {
> +			ret = video_reset_control(dev, id);
> +			if (ret < 0)
> +				break;
> +		}
> +

How about resetting all controls in one go using the VIDIOC_S_EXT_CTRLS API ? 
You can query the default values of all controls in one go as well with 
VIDIOC_G_EXT_CTRLS, so that would be two ioctl calls only.

>  		id = ret;
>  		nctrls++;
>  	}
> @@ -2206,6 +2248,7 @@ static void usage(const char *argv0)
>  	printf("    --offset			User pointer buffer offset from page start\n");
>  	printf("    --premultiplied		Color components are premultiplied by alpha
> value\n"); printf("    --queue-late		Queue buffers after streamon, not
> before\n"); +	printf("    --reset-controls		Enumerate available 
controls
> and reset to defaults\n"); printf("    --requeue-last		Requeue the last
> buffers before streamoff\n"); printf("    --timestamp-source		Set 
timestamp
> source on output buffers [eof, soe]\n"); printf("    --skip n			Skip 
the
> first n frames\n");
> @@ -2229,6 +2272,7 @@ static void usage(const char *argv0)
>  #define OPT_PREMULTIPLIED	269
>  #define OPT_QUEUE_LATE		270
>  #define OPT_DATA_PREFIX		271
> +#define OPT_RESET_CONTROLS	272
> 
>  static struct option opts[] = {
>  	{"buffer-size", 1, 0, OPT_BUFFER_SIZE},
> @@ -2257,6 +2301,7 @@ static struct option opts[] = {
>  	{"queue-late", 0, 0, OPT_QUEUE_LATE},
>  	{"get-control", 1, 0, 'r'},
>  	{"requeue-last", 0, 0, OPT_REQUEUE_LAST},
> +	{"reset-controls", 0, 0, OPT_RESET_CONTROLS},
>  	{"realtime", 2, 0, 'R'},
>  	{"size", 1, 0, 's'},
>  	{"set-control", 1, 0, 'w'},
> @@ -2284,6 +2329,7 @@ int main(int argc, char *argv[])
>  	int do_enum_formats = 0, do_set_format = 0;
>  	int do_enum_inputs = 0, do_set_input = 0;
>  	int do_list_controls = 0, do_get_control = 0, do_set_control = 0;
> +	int do_reset_controls = 0;
>  	int do_sleep_forever = 0, do_requeue_last = 0;
>  	int do_rt = 0, do_log_status = 0;
>  	int no_query = 0, do_queue_late = 0;
> @@ -2476,6 +2522,9 @@ int main(int argc, char *argv[])
>  		case OPT_QUEUE_LATE:
>  			do_queue_late = 1;
>  			break;
> +		case OPT_RESET_CONTROLS:
> +			do_reset_controls = 1;
> +			break;
>  		case OPT_REQUEUE_LAST:
>  			do_requeue_last = 1;
>  			break;
> @@ -2560,7 +2609,10 @@ int main(int argc, char *argv[])
>  		video_set_control(&dev, ctrl_name, ctrl_value);
> 
>  	if (do_list_controls)
> -		video_list_controls(&dev);
> +		video_list_controls(&dev, false);
> +
> +	if (do_reset_controls)
> +		video_list_controls(&dev, true);
> 
>  	if (do_enum_formats) {
>  		printf("- Available formats:\n");

Patch
diff mbox series

diff --git a/yavta.c b/yavta.c
index 625a93ba879d..656ead0f0a37 100644
--- a/yavta.c
+++ b/yavta.c
@@ -1547,7 +1547,43 @@  static void video_set_control(struct device *dev, unsigned int id,
 		free(ctrl.ptr);
 }
 
-static void video_list_controls(struct device *dev)
+static int video_reset_control(struct device *dev, unsigned int id)
+{
+	struct v4l2_query_ext_ctrl query;
+	struct v4l2_ext_control ctrl;
+	int ret;
+
+	ret = query_control(dev, id, &query);
+	if (ret < 0)
+		return ret;
+
+	if (query.type == V4L2_CTRL_TYPE_CTRL_CLASS)
+		return query.id;
+
+	/* Skip controls that we cannot (or should not) update. */
+	if (query.flags & (V4L2_CTRL_FLAG_DISABLED
+			|  V4L2_CTRL_FLAG_VOLATILE
+			|  V4L2_CTRL_FLAG_READ_ONLY))
+		return query.id;
+
+	ctrl.id = query.id;
+	ctrl.value = query.default_value;
+
+	ret = set_control(dev, &query, &ctrl);
+	if (ret < 0) {
+		printf("unable to reset control 0x%8.8x: %s (%d).\n",
+			id, strerror(errno), errno);
+	} else {
+		printf("control 0x%08x reset to ", id);
+
+		video_print_control_value(&query, &ctrl);
+		printf("\n");
+	}
+
+	return query.id;
+}
+
+static void video_list_controls(struct device *dev, bool reset)
 {
 	unsigned int nctrls = 0;
 	unsigned int id;
@@ -1568,6 +1604,12 @@  static void video_list_controls(struct device *dev)
 		if (ret < 0)
 			break;
 
+		if (reset) {
+			ret = video_reset_control(dev, id);
+			if (ret < 0)
+				break;
+		}
+
 		id = ret;
 		nctrls++;
 	}
@@ -2206,6 +2248,7 @@  static void usage(const char *argv0)
 	printf("    --offset			User pointer buffer offset from page start\n");
 	printf("    --premultiplied		Color components are premultiplied by alpha value\n");
 	printf("    --queue-late		Queue buffers after streamon, not before\n");
+	printf("    --reset-controls		Enumerate available controls and reset to defaults\n");
 	printf("    --requeue-last		Requeue the last buffers before streamoff\n");
 	printf("    --timestamp-source		Set timestamp source on output buffers [eof, soe]\n");
 	printf("    --skip n			Skip the first n frames\n");
@@ -2229,6 +2272,7 @@  static void usage(const char *argv0)
 #define OPT_PREMULTIPLIED	269
 #define OPT_QUEUE_LATE		270
 #define OPT_DATA_PREFIX		271
+#define OPT_RESET_CONTROLS	272
 
 static struct option opts[] = {
 	{"buffer-size", 1, 0, OPT_BUFFER_SIZE},
@@ -2257,6 +2301,7 @@  static struct option opts[] = {
 	{"queue-late", 0, 0, OPT_QUEUE_LATE},
 	{"get-control", 1, 0, 'r'},
 	{"requeue-last", 0, 0, OPT_REQUEUE_LAST},
+	{"reset-controls", 0, 0, OPT_RESET_CONTROLS},
 	{"realtime", 2, 0, 'R'},
 	{"size", 1, 0, 's'},
 	{"set-control", 1, 0, 'w'},
@@ -2284,6 +2329,7 @@  int main(int argc, char *argv[])
 	int do_enum_formats = 0, do_set_format = 0;
 	int do_enum_inputs = 0, do_set_input = 0;
 	int do_list_controls = 0, do_get_control = 0, do_set_control = 0;
+	int do_reset_controls = 0;
 	int do_sleep_forever = 0, do_requeue_last = 0;
 	int do_rt = 0, do_log_status = 0;
 	int no_query = 0, do_queue_late = 0;
@@ -2476,6 +2522,9 @@  int main(int argc, char *argv[])
 		case OPT_QUEUE_LATE:
 			do_queue_late = 1;
 			break;
+		case OPT_RESET_CONTROLS:
+			do_reset_controls = 1;
+			break;
 		case OPT_REQUEUE_LAST:
 			do_requeue_last = 1;
 			break;
@@ -2560,7 +2609,10 @@  int main(int argc, char *argv[])
 		video_set_control(&dev, ctrl_name, ctrl_value);
 
 	if (do_list_controls)
-		video_list_controls(&dev);
+		video_list_controls(&dev, false);
+
+	if (do_reset_controls)
+		video_list_controls(&dev, true);
 
 	if (do_enum_formats) {
 		printf("- Available formats:\n");