xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: coda: limit frame interval enumeration to supported encoder frame sizes

Browse Source 
[ Upstream commit 67e33dd957880879e785cfea83a3aa24bd5c5577 ]

Let VIDIOC_ENUM_FRAMEINTERVALS return -EINVAL if userspace queries
frame intervals for frame sizes unsupported by the encoder. Fixes the
following v4l2-compliance failure:

		fail: v4l2-test-formats.cpp(123): found frame intervals for invalid size 47x16
		fail: v4l2-test-formats.cpp(282): node->codec_mask & STATEFUL_ENCODER
	test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: FAIL

[hverkuil: drop incorrect 'For decoder devices, return -ENOTTY.' in the commit log]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Philipp Zabel
2022-04-26 11:15:55 +02:00
committed by Greg Kroah-Hartman
parent 8ddc89437c
commit f3915b4665
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/platform/coda/coda-common.c
View File

@@ -1318,7 +1318,8 @@ static int coda_enum_frameintervals(struct file *file, void *fh,
struct v4l2_frmivalenum *f) struct v4l2_frmivalenum *f)
{ {
struct coda_ctx *ctx = fh_to_ctx(fh); struct coda_ctx *ctx = fh_to_ctx(fh);
int i; struct coda_q_data *q_data;
const struct coda_codec *codec;
if (f->index) if (f->index)
return -EINVAL; return -EINVAL;
@@ -1327,12 +1328,19 @@ static int coda_enum_frameintervals(struct file *file, void *fh,
if (!ctx->vdoa && f->pixel_format == V4L2_PIX_FMT_YUYV) if (!ctx->vdoa && f->pixel_format == V4L2_PIX_FMT_YUYV)
return -EINVAL; return -EINVAL;
for (i = 0; i < CODA_MAX_FORMATS; i++) { if (coda_format_normalize_yuv(f->pixel_format) == V4L2_PIX_FMT_YUV420) {
if (f->pixel_format == ctx->cvd->src_formats[i] || q_data = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
f->pixel_format == ctx->cvd->dst_formats[i]) codec = coda_find_codec(ctx->dev, f->pixel_format,
break; q_data->fourcc);
} else {
codec = coda_find_codec(ctx->dev, V4L2_PIX_FMT_YUV420,
f->pixel_format);
} }
if (i == CODA_MAX_FORMATS) if (!codec)
return -EINVAL;
if (f->width < MIN_W || f->width > codec->max_w ||
f->height < MIN_H || f->height > codec->max_h)
return -EINVAL; return -EINVAL;
f->type = V4L2_FRMIVAL_TYPE_CONTINUOUS; f->type = V4L2_FRMIVAL_TYPE_CONTINUOUS;