From 3cae59f7aeffaf19313022eac4a92cb6cf3081ee Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Sat, 11 Sep 2021 17:21:07 +0100 Subject: [PATCH] staging: bcm2835-codec: Allow custom specified strides/bytesperline. If the client provides a bytesperline value in try_fmt/s_fmt then validate it and correct if necessary. Signed-off-by: Dave Stevenson --- drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c index 202830a..8e6a3ab 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1347,7 +1347,7 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f, struct bcm2835_codec_fmt *fmt) { - unsigned int sizeimage; + unsigned int sizeimage, min_bytesperline; /* * The V4L2 specification requires the driver to correct the format @@ -1375,8 +1375,12 @@ static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f, f->fmt.pix_mp.height = ALIGN(f->fmt.pix_mp.height, 16); } f->fmt.pix_mp.num_planes = 1; + min_bytesperline = get_bytesperline(f->fmt.pix_mp.width, fmt); + if (f->fmt.pix_mp.plane_fmt[0].bytesperline < min_bytesperline) + f->fmt.pix_mp.plane_fmt[0].bytesperline = min_bytesperline; f->fmt.pix_mp.plane_fmt[0].bytesperline = - get_bytesperline(f->fmt.pix_mp.width, fmt); + ALIGN(f->fmt.pix_mp.plane_fmt[0].bytesperline, fmt->bytesperline_align); + sizeimage = get_sizeimage(f->fmt.pix_mp.plane_fmt[0].bytesperline, f->fmt.pix_mp.width, f->fmt.pix_mp.height, fmt); -- 2.7.4