1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From 9eaafa9f93c9a97498b73583a70b9e238cbe4536 Mon Sep 17 00:00:00 2001
From: jc-kynesim <jc@kynesim.co.uk>
Date: Fri, 11 Jun 2021 15:14:31 +0100
Subject: [PATCH] bcm2835: Allow compressed frames to set sizeimage
(#4386)
Allow the user to set sizeimage in TRY_FMT and S_FMT if the format
flags have V4L2_FMT_FLAG_COMPRESSED set
Signed-off-by: John Cox <jc@kynesim.co.uk>
---
.../bcm2835-codec/bcm2835-v4l2-codec.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
@@ -1291,6 +1291,8 @@ static int vidioc_g_fmt_vid_cap(struct f
static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
struct bcm2835_codec_fmt *fmt)
{
+ unsigned int sizeimage;
+
/*
* The V4L2 specification requires the driver to correct the format
* struct if any of the dimensions is unsupported
@@ -1319,9 +1321,18 @@ static int vidioc_try_fmt(struct bcm2835
f->fmt.pix_mp.num_planes = 1;
f->fmt.pix_mp.plane_fmt[0].bytesperline =
get_bytesperline(f->fmt.pix_mp.width, fmt);
- f->fmt.pix_mp.plane_fmt[0].sizeimage =
- get_sizeimage(f->fmt.pix_mp.plane_fmt[0].bytesperline,
- f->fmt.pix_mp.width, f->fmt.pix_mp.height, fmt);
+ sizeimage = get_sizeimage(f->fmt.pix_mp.plane_fmt[0].bytesperline,
+ f->fmt.pix_mp.width, f->fmt.pix_mp.height,
+ fmt);
+ /*
+ * Drivers must set sizeimage for uncompressed formats
+ * Compressed formats allow the client to request an alternate
+ * size for the buffer.
+ */
+ if (!(fmt->flags & V4L2_FMT_FLAG_COMPRESSED) ||
+ f->fmt.pix_mp.plane_fmt[0].sizeimage < sizeimage)
+ f->fmt.pix_mp.plane_fmt[0].sizeimage = sizeimage;
+
memset(f->fmt.pix_mp.plane_fmt[0].reserved, 0,
sizeof(f->fmt.pix_mp.plane_fmt[0].reserved));
|
