v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields
PATCH v2 1/1 v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields
Make the core set the reserved fields to zero in
vv4l2_pix_format_mplane.4l2_plane_pix_format,
for _MPLANE queue types.
Moving this to the core avoids having to do so in each and every driver.
--
v2:
* Drop unneeded clear in g_fmt.
The sturct was already being cleared here.
* Only zero plane_fmt reserved fields.
* Use CLEAR_FIELD_MACRO.
drivers/media/v4l2-core/v4l2-ioctl.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/media/v4l2-core/v4l2-ioctl.c +10 -0
@@ -1512,6 +1512,7 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,struct v4l2_format *p = arg;struct video_device *vfd =video_devdata (file);int ret =check_fmt (file, p->type); +int i;if (ret)return ret;
@@ -1536,6 +1537,8 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,if (unlikely (!ops->vidioc_s_fmt_vid_cap_mplane))break ;CLEAR_AFTER_FIELD (p, fmt.pix_mp.xfer_func); +for (i =0 ; i < p->fmt.pix_mp.num_planes; i++) +CLEAR_AFTER_FIELD (p, fmt.pix_mp.plane_fmt[i].bytesperline);return ops->vidioc_s_fmt_vid_cap_mplane (file, fh, arg);case V4L2_BUF_TYPE_VIDEO_OVERLAY :if (unlikely (!ops->vidioc_s_fmt_vid_overlay))
@@ -1564,6 +1567,8 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,if (unlikely (!ops->vidioc_s_fmt_vid_out_mplane))break ;CLEAR_AFTER_FIELD (p, fmt.pix_mp.xfer_func); +for (i =0 ; i < p->fmt.pix_mp.num_planes; i++) +CLEAR_AFTER_FIELD (p, fmt.pix_mp.plane_fmt[i].bytesperline);return ops->vidioc_s_fmt_vid_out_mplane (file, fh, arg);case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY :if (unlikely (!ops->vidioc_s_fmt_vid_out_overlay))
@@ -1604,6 +1609,7 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, {struct v4l2_format *p = arg;int ret =check_fmt (file, p->type); +int i;if (ret)return ret;
@@ -1623,6 +1629,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,if (unlikely (!ops->vidioc_try_fmt_vid_cap_mplane))break ;CLEAR_AFTER_FIELD (p, fmt.pix_mp.xfer_func); +for (i =0 ; i < p->fmt.pix_mp.num_planes; i++) +CLEAR_AFTER_FIELD (p, fmt.pix_mp.plane_fmt[i].bytesperline);return ops->vidioc_try_fmt_vid_cap_mplane (file, fh, arg);case V4L2_BUF_TYPE_VIDEO_OVERLAY :if (unlikely (!ops->vidioc_try_fmt_vid_overlay))
@@ -1651,6 +1659,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,if (unlikely (!ops->vidioc_try_fmt_vid_out_mplane))break ;CLEAR_AFTER_FIELD (p, fmt.pix_mp.xfer_func); +for (i =0 ; i < p->fmt.pix_mp.num_planes; i++) +CLEAR_AFTER_FIELD (p, fmt.pix_mp.plane_fmt[i].bytesperline);return ops->vidioc_try_fmt_vid_out_mplane (file, fh, arg);case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY :if (unlikely (!ops->vidioc_try_fmt_vid_out_overlay))
Signature · 1 line
2.19.1
Quoted 24 lines · Ezequiel Garcia
Make the core set the reserved fields to zero in
vv4l2_pix_format_mplane.4l2_plane_pix_format,
for_MPLANEqueue types.Moving this to the core avoids having to do so in each and every driver.
Suggested-by Tomasz Figa <[email protected]>Signed-off-by Ezequiel Garcia <[email protected]>--
v2:
* Drop unneeded clear ing_fmt.
The sturct was already being cleared here.
* Only zeroplane_fmtreserved fields.
* UseCLEAR_FIELD_MACRO.drivers/media/v4l2-core/v4l2-ioctl.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/media/v4l2-core/v4l2-ioctl.c +0
-0
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, · line 1515
Quoted 4 lines
drivers/media/v4l2-core/v4l2-ioctl.c +1
-0@@ -1512,6 +1512,7 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,struct v4l2_format *p = arg;struct video_device *vfd =video_devdata (file);int ret =check_fmt (file, p->type); +int i;
unsigned int; same below.
With that,
Quoted 47 lines
drivers/media/v4l2-core/v4l2-ioctl.c +9
-0if (ret)return ret;@@ -1536,6 +1537,8 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,if (unlikely (!ops->vidioc_s_fmt_vid_cap_mplane))break ;CLEAR_AFTER_FIELD (p, fmt.pix_mp.xfer_func); +for (i =0 ; i < p->fmt.pix_mp.num_planes; i++) +CLEAR_AFTER_FIELD (p, fmt.pix_mp.plane_fmt[i].bytesperline);return ops->vidioc_s_fmt_vid_cap_mplane (file, fh, arg);case V4L2_BUF_TYPE_VIDEO_OVERLAY :if (unlikely (!ops->vidioc_s_fmt_vid_overlay))@@ -1564,6 +1567,8 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,if (unlikely (!ops->vidioc_s_fmt_vid_out_mplane))break ;CLEAR_AFTER_FIELD (p, fmt.pix_mp.xfer_func); +for (i =0 ; i < p->fmt.pix_mp.num_planes; i++) +CLEAR_AFTER_FIELD (p, fmt.pix_mp.plane_fmt[i].bytesperline);return ops->vidioc_s_fmt_vid_out_mplane (file, fh, arg);case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY :if (unlikely (!ops->vidioc_s_fmt_vid_out_overlay))@@ -1604,6 +1609,7 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, {struct v4l2_format *p = arg;int ret =check_fmt (file, p->type); +int i;if (ret)return ret;@@ -1623,6 +1629,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,if (unlikely (!ops->vidioc_try_fmt_vid_cap_mplane))break ;CLEAR_AFTER_FIELD (p, fmt.pix_mp.xfer_func); +for (i =0 ; i < p->fmt.pix_mp.num_planes; i++) +CLEAR_AFTER_FIELD (p, fmt.pix_mp.plane_fmt[i].bytesperline);return ops->vidioc_try_fmt_vid_cap_mplane (file, fh, arg);case V4L2_BUF_TYPE_VIDEO_OVERLAY :if (unlikely (!ops->vidioc_try_fmt_vid_overlay))@@ -1651,6 +1659,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,if (unlikely (!ops->vidioc_try_fmt_vid_out_mplane))break ;CLEAR_AFTER_FIELD (p, fmt.pix_mp.xfer_func); +for (i =0 ; i < p->fmt.pix_mp.num_planes; i++) +CLEAR_AFTER_FIELD (p, fmt.pix_mp.plane_fmt[i].bytesperline);return ops->vidioc_try_fmt_vid_out_mplane (file, fh, arg);case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY :if (unlikely (!ops->vidioc_try_fmt_vid_out_overlay))
Signature · 2 lines
Sakari Ailus e-mail: [email protected]