[libcamera-devel,v2,05/10] libcamera: v4l2_controls: Store default value

2400 diff mbox series

Store the default value for V4L2 controls as reported by the kernel when
creating ControlRange instances using information coming from
v4l2_query_ext_ctrl.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/libcamera/v4l2_controls.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Hi Jacopo,

Thanks for your work.

On 2019-12-05 21:43:45 +0100, Jacopo Mondi wrote:
> Store the default value for V4L2 controls as reported by the kernel when
> creating ControlRange instances using information coming from
> v4l2_query_ext_ctrl.
> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/libcamera/v4l2_controls.cpp | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/src/libcamera/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp
> index b6547a7c627c..7446c3880330 100644
> --- a/src/libcamera/v4l2_controls.cpp
> +++ b/src/libcamera/v4l2_controls.cpp
> @@ -121,17 +121,20 @@ V4L2ControlRange::V4L2ControlRange(const struct v4l2_query_ext_ctrl &ctrl)
>  	switch (ctrl.type) {
>  	case V4L2_CTRL_TYPE_BOOLEAN:
>  		ControlRange::operator=(ControlRange(static_cast<bool>(ctrl.minimum),
> -						     static_cast<bool>(ctrl.maximum)));
> +						     static_cast<bool>(ctrl.maximum),
> +						     static_cast<bool>(ctrl.default_value)));
>  		break;
>  
>  	case V4L2_CTRL_TYPE_INTEGER64:
>  		ControlRange::operator=(ControlRange(static_cast<int64_t>(ctrl.minimum),
> -						     static_cast<int64_t>(ctrl.maximum)));
> +						     static_cast<int64_t>(ctrl.maximum),
> +						     static_cast<int64_t>(ctrl.default_value)));
>  		break;
>  
>  	default:
>  		ControlRange::operator=(ControlRange(static_cast<int32_t>(ctrl.minimum),
> -						     static_cast<int32_t>(ctrl.maximum)));
> +						     static_cast<int32_t>(ctrl.maximum),
> +						     static_cast<int32_t>(ctrl.default_value)));
>  		break;
>  	}
>  }
> -- 
> 2.23.0
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel