On 6/6/19 6:12 PM, Ezequiel Garcia wrote:
> Rework std_init adding an explicit initialization for
> compound controls.
>
> While here, make sure the control is initialized to zero,
> before providing default values for all its fields.
>
> Signed-off-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx>
> ---
> Changes from v2:
> * Align parameters to parenthesis
> * Drop unneeded zero initialization
>
> Changes from v1:
> * Drop the s/break/return replacements
> * Drop unneeded default cases
> * Fix memset to take account of the index
> ---
> drivers/media/v4l2-core/v4l2-ctrls.c | 37 +++++++++++++++++-----------
> 1 file changed, 22 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
> index 92a5521f6813..18c8d0c102d2 100644
> --- a/drivers/media/v4l2-core/v4l2-ctrls.c
> +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
> @@ -1506,17 +1506,36 @@ static bool std_equal(const struct v4l2_ctrl *ctrl, u32 idx,
> }
> }
>
> -static void std_init(const struct v4l2_ctrl *ctrl, u32 idx,
> - union v4l2_ctrl_ptr ptr)
> +static void std_init_compound(const struct v4l2_ctrl *ctrl, u32 idx,
> + union v4l2_ctrl_ptr ptr)
> {
> struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params;
>
> + idx *= ctrl->elem_size;
> + memset(ptr.p + idx, 0, ctrl->elem_size);
> +
> /*
> * The cast is needed to get rid of a gcc warning complaining that
> * V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS is not part of the
> * v4l2_ctrl_type enum.
> */
> switch ((u32)ctrl->type) {
> + case V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS:
> + p_mpeg2_slice_params = ptr.p;
This is wrong, it should be ptr.p + idx, just as is done in the memset.
I'd add a 'void *p = ptr.p + idx * ctrl->elem_size;' variable at the beginning
and use 'p' in the memset and in the line above.
Regards,
Hans
> + /* 4:2:0 */
> + p_mpeg2_slice_params->sequence.chroma_format = 1;
> + /* interlaced top field */
> + p_mpeg2_slice_params->picture.picture_structure = 1;
> + p_mpeg2_slice_params->picture.picture_coding_type =
> + V4L2_MPEG2_PICTURE_CODING_TYPE_I;
> + break;
> + }
> +}
> +
> +static void std_init(const struct v4l2_ctrl *ctrl, u32 idx,
> + union v4l2_ctrl_ptr ptr)
> +{
> + switch (ctrl->type) {
> case V4L2_CTRL_TYPE_STRING:
> idx *= ctrl->elem_size;
> memset(ptr.p_char + idx, ' ', ctrl->minimum);
> @@ -1545,20 +1564,8 @@ static void std_init(const struct v4l2_ctrl *ctrl, u32 idx,
> case V4L2_CTRL_TYPE_U32:
> ptr.p_u32[idx] = ctrl->default_value;
> break;
> - case V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS:
> - p_mpeg2_slice_params = ptr.p;
> - /* 4:2:0 */
> - p_mpeg2_slice_params->sequence.chroma_format = 1;
> - /* 8 bits */
> - p_mpeg2_slice_params->picture.intra_dc_precision = 0;
> - /* interlaced top field */
> - p_mpeg2_slice_params->picture.picture_structure = 1;
> - p_mpeg2_slice_params->picture.picture_coding_type =
> - V4L2_MPEG2_PICTURE_CODING_TYPE_I;
> - break;
> default:
> - idx *= ctrl->elem_size;
> - memset(ptr.p + idx, 0, ctrl->elem_size);
> + std_init_compound(ctrl, idx, ptr);
> break;
> }
> }
>
