* [PATCH 1/2] media: v4l2-ctrl: Initialize _BUTTON and _CTRL_CLASS @ 2019-05-29 19:28 Ezequiel Garcia 2019-05-29 19:28 ` [PATCH 2/2] media: v4l2-ctrl: Move compound control initialization Ezequiel Garcia 0 siblings, 1 reply; 4+ messages in thread From: Ezequiel Garcia @ 2019-05-29 19:28 UTC (permalink / raw) To: linux-media, Hans Verkuil Cc: kernel, Nicolas Dufresne, Boris Brezillon, Ezequiel Garcia These two control types don't really need a default value, as they are not expected to carry any value. However, it's slightly clearer to initialize them explicitly instead of falling back to the switch default. Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> --- drivers/media/v4l2-core/v4l2-ctrls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 1870cecad9ae..c7d5fdb8efb4 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1530,6 +1530,8 @@ static void std_init(const struct v4l2_ctrl *ctrl, u32 idx, case V4L2_CTRL_TYPE_MENU: case V4L2_CTRL_TYPE_BITMASK: case V4L2_CTRL_TYPE_BOOLEAN: + case V4L2_CTRL_TYPE_BUTTON: + case V4L2_CTRL_TYPE_CTRL_CLASS: ptr.p_s32[idx] = ctrl->default_value; break; case V4L2_CTRL_TYPE_U8: -- 2.20.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] media: v4l2-ctrl: Move compound control initialization 2019-05-29 19:28 [PATCH 1/2] media: v4l2-ctrl: Initialize _BUTTON and _CTRL_CLASS Ezequiel Garcia @ 2019-05-29 19:28 ` Ezequiel Garcia 2019-05-30 8:03 ` Boris Brezillon 0 siblings, 1 reply; 4+ messages in thread From: Ezequiel Garcia @ 2019-05-29 19:28 UTC (permalink / raw) To: linux-media, Hans Verkuil Cc: kernel, Nicolas Dufresne, Boris Brezillon, Ezequiel Garcia 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@collabora.com> --- drivers/media/v4l2-core/v4l2-ctrls.c | 55 +++++++++++++++++----------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index c7d5fdb8efb4..44afda1d77b3 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1506,25 +1506,49 @@ static bool std_equal(const struct v4l2_ctrl *ctrl, u32 idx, } } -static void std_init(const struct v4l2_ctrl *ctrl, u32 idx, +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; + memset(ptr.p, 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; + /* 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; + return; + default: + idx *= ctrl->elem_size; + memset(ptr.p + idx, 0, ctrl->elem_size); + return; + } +} + +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); ptr.p_char[idx + ctrl->minimum] = '\0'; - break; + return; case V4L2_CTRL_TYPE_INTEGER64: ptr.p_s64[idx] = ctrl->default_value; - break; + return; case V4L2_CTRL_TYPE_INTEGER: case V4L2_CTRL_TYPE_INTEGER_MENU: case V4L2_CTRL_TYPE_MENU: @@ -1533,32 +1557,21 @@ static void std_init(const struct v4l2_ctrl *ctrl, u32 idx, case V4L2_CTRL_TYPE_BUTTON: case V4L2_CTRL_TYPE_CTRL_CLASS: ptr.p_s32[idx] = ctrl->default_value; - break; + return; case V4L2_CTRL_TYPE_U8: ptr.p_u8[idx] = ctrl->default_value; - break; + return; case V4L2_CTRL_TYPE_U16: ptr.p_u16[idx] = ctrl->default_value; - break; + return; 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; + return; default: - idx *= ctrl->elem_size; - memset(ptr.p + idx, 0, ctrl->elem_size); - break; + std_init_compound(ctrl, idx, ptr); + return; } + } static void std_log(const struct v4l2_ctrl *ctrl) -- 2.20.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] media: v4l2-ctrl: Move compound control initialization 2019-05-29 19:28 ` [PATCH 2/2] media: v4l2-ctrl: Move compound control initialization Ezequiel Garcia @ 2019-05-30 8:03 ` Boris Brezillon 2019-05-30 12:43 ` Ezequiel Garcia 0 siblings, 1 reply; 4+ messages in thread From: Boris Brezillon @ 2019-05-30 8:03 UTC (permalink / raw) To: Ezequiel Garcia; +Cc: linux-media, Hans Verkuil, kernel, Nicolas Dufresne Hi Ezequiel, On Wed, 29 May 2019 16:28:11 -0300 Ezequiel Garcia <ezequiel@collabora.com> 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@collabora.com> > --- > drivers/media/v4l2-core/v4l2-ctrls.c | 55 +++++++++++++++++----------- > 1 file changed, 34 insertions(+), 21 deletions(-) > > diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c > index c7d5fdb8efb4..44afda1d77b3 100644 > --- a/drivers/media/v4l2-core/v4l2-ctrls.c > +++ b/drivers/media/v4l2-core/v4l2-ctrls.c > @@ -1506,25 +1506,49 @@ static bool std_equal(const struct v4l2_ctrl *ctrl, u32 idx, > } > } > > -static void std_init(const struct v4l2_ctrl *ctrl, u32 idx, > +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; > > + memset(ptr.p, 0, ctrl->elem_size); > + Hm, shouldn't we have idx *= ctrl->elem_size; memset(ptr.p + idx, 0, ctrl->elem_size); instead? Looks like your solution always resets the first element of an array even if idx > 0. > /* > * 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; > + /* 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; > + return; > + default: > + idx *= ctrl->elem_size; > + memset(ptr.p + idx, 0, ctrl->elem_size); > + return; If you fix the first memset() you can get rid of this one. Also don't see why you use return instead of break in this switch-case block (there's no reason to bail out early in this function). > + } > +} > + > +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); > ptr.p_char[idx + ctrl->minimum] = '\0'; > - break; > + return; > case V4L2_CTRL_TYPE_INTEGER64: > ptr.p_s64[idx] = ctrl->default_value; > - break; > + return; > case V4L2_CTRL_TYPE_INTEGER: > case V4L2_CTRL_TYPE_INTEGER_MENU: > case V4L2_CTRL_TYPE_MENU: > @@ -1533,32 +1557,21 @@ static void std_init(const struct v4l2_ctrl *ctrl, u32 idx, > case V4L2_CTRL_TYPE_BUTTON: > case V4L2_CTRL_TYPE_CTRL_CLASS: > ptr.p_s32[idx] = ctrl->default_value; > - break; > + return; > case V4L2_CTRL_TYPE_U8: > ptr.p_u8[idx] = ctrl->default_value; > - break; > + return; > case V4L2_CTRL_TYPE_U16: > ptr.p_u16[idx] = ctrl->default_value; > - break; > + return; > 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; > + return; > default: > - idx *= ctrl->elem_size; > - memset(ptr.p + idx, 0, ctrl->elem_size); > - break; > + std_init_compound(ctrl, idx, ptr); > + return; Same comment here: I see no reasons to have return instead of break. > } > + You can get rid of this blank line. > } > > static void std_log(const struct v4l2_ctrl *ctrl) Regards, Boris ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] media: v4l2-ctrl: Move compound control initialization 2019-05-30 8:03 ` Boris Brezillon @ 2019-05-30 12:43 ` Ezequiel Garcia 0 siblings, 0 replies; 4+ messages in thread From: Ezequiel Garcia @ 2019-05-30 12:43 UTC (permalink / raw) To: Boris Brezillon; +Cc: linux-media, Hans Verkuil, kernel, Nicolas Dufresne On Thu, 2019-05-30 at 10:03 +0200, Boris Brezillon wrote: > Hi Ezequiel, > > On Wed, 29 May 2019 16:28:11 -0300 > Ezequiel Garcia <ezequiel@collabora.com> 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@collabora.com> > > --- > > drivers/media/v4l2-core/v4l2-ctrls.c | 55 +++++++++++++++++----------- > > 1 file changed, 34 insertions(+), 21 deletions(-) > > > > diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c > > index c7d5fdb8efb4..44afda1d77b3 100644 > > --- a/drivers/media/v4l2-core/v4l2-ctrls.c > > +++ b/drivers/media/v4l2-core/v4l2-ctrls.c > > @@ -1506,25 +1506,49 @@ static bool std_equal(const struct v4l2_ctrl *ctrl, u32 idx, > > } > > } > > > > -static void std_init(const struct v4l2_ctrl *ctrl, u32 idx, > > +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; > > > > + memset(ptr.p, 0, ctrl->elem_size); > > + > > Hm, shouldn't we have > > idx *= ctrl->elem_size; > memset(ptr.p + idx, 0, ctrl->elem_size); > > instead? > > Looks like your solution always resets the first element of an array > even if idx > 0. > Yeah, this patch is poorly thought. This and the other comments make sense. Thanks for the review, Ezequiel > > /* > > * 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; > > + /* 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; > > + return; > > + default: > > + idx *= ctrl->elem_size; > > + memset(ptr.p + idx, 0, ctrl->elem_size); > > + return; > > If you fix the first memset() you can get rid of this one. Also don't > see why you use return instead of break in this switch-case block > (there's no reason to bail out early in this function). > > > + } > > +} > > + > > +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); > > ptr.p_char[idx + ctrl->minimum] = '\0'; > > - break; > > + return; > > case V4L2_CTRL_TYPE_INTEGER64: > > ptr.p_s64[idx] = ctrl->default_value; > > - break; > > + return; > > case V4L2_CTRL_TYPE_INTEGER: > > case V4L2_CTRL_TYPE_INTEGER_MENU: > > case V4L2_CTRL_TYPE_MENU: > > @@ -1533,32 +1557,21 @@ static void std_init(const struct v4l2_ctrl *ctrl, u32 idx, > > case V4L2_CTRL_TYPE_BUTTON: > > case V4L2_CTRL_TYPE_CTRL_CLASS: > > ptr.p_s32[idx] = ctrl->default_value; > > - break; > > + return; > > case V4L2_CTRL_TYPE_U8: > > ptr.p_u8[idx] = ctrl->default_value; > > - break; > > + return; > > case V4L2_CTRL_TYPE_U16: > > ptr.p_u16[idx] = ctrl->default_value; > > - break; > > + return; > > 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; > > + return; > > default: > > - idx *= ctrl->elem_size; > > - memset(ptr.p + idx, 0, ctrl->elem_size); > > - break; > > + std_init_compound(ctrl, idx, ptr); > > + return; > > Same comment here: I see no reasons to have return instead of break. > > > } > > + > > You can get rid of this blank line. > > > } > > > > static void std_log(const struct v4l2_ctrl *ctrl) > > Regards, > > Boris ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-30 12:44 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-29 19:28 [PATCH 1/2] media: v4l2-ctrl: Initialize _BUTTON and _CTRL_CLASS Ezequiel Garcia 2019-05-29 19:28 ` [PATCH 2/2] media: v4l2-ctrl: Move compound control initialization Ezequiel Garcia 2019-05-30 8:03 ` Boris Brezillon 2019-05-30 12:43 ` Ezequiel Garcia
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.