diff mbox

[4/5] media/v4l2-ctrls: Always execute EXECUTE_ON_WRITE ctrls

Message ID 1426778486-21807-5-git-send-email-ricardo.ribalda@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ricardo Ribalda Delgado March 19, 2015, 3:21 p.m. UTC
Any control with V4L2_CTRL_FLAG_EXECUTE_ON_WRITE set should return
changed == true in cluster_changed.

This forces the value to be passed to the driver even if it has not
changed.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 drivers/media/v4l2-core/v4l2-ctrls.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Hans Verkuil March 20, 2015, 1:46 p.m. UTC | #1
One comment:

On 03/19/2015 04:21 PM, Ricardo Ribalda Delgado wrote:
> Any control with V4L2_CTRL_FLAG_EXECUTE_ON_WRITE set should return
> changed == true in cluster_changed.
> 
> This forces the value to be passed to the driver even if it has not
> changed.
> 
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
>  drivers/media/v4l2-core/v4l2-ctrls.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
> index da0ffd3..8f96478 100644
> --- a/drivers/media/v4l2-core/v4l2-ctrls.c
> +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
> @@ -1611,6 +1611,10 @@ static int cluster_changed(struct v4l2_ctrl *master)
>  
>  		if (ctrl == NULL)
>  			continue;
> +
> +		if (ctrl->flags & V4L2_CTRL_FLAG_EXECUTE_ON_WRITE)
> +			changed = true;

I think this should be:

			changed = ctrl_changed = true;

This marks the cluster as changed (correct), and the control as changed
as well (that means a CH_VALUE event will be sent). The next volatile
check will put ctrl_changed back to false if it was volatile, otherwise
the for loop will just be skipped.

Right now writing to a non-button non-volatile control with EXECUTE_ON_WRITE
set and if you write the same value to it (so ctrl->type_ops->equal() returns
0) won't send the CH_VALUE event.

Very much a corner case, but still, it's easily solved.

	Hans

> +
>                  /*
>                   * Set has_changed to false to avoid generating
>                   * the event V4L2_EVENT_CTRL_CH_VALUE
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index da0ffd3..8f96478 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -1611,6 +1611,10 @@  static int cluster_changed(struct v4l2_ctrl *master)
 
 		if (ctrl == NULL)
 			continue;
+
+		if (ctrl->flags & V4L2_CTRL_FLAG_EXECUTE_ON_WRITE)
+			changed = true;
+
                 /*
                  * Set has_changed to false to avoid generating
                  * the event V4L2_EVENT_CTRL_CH_VALUE