Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e8ec0a4 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] mem2mem_testdev: pick default format with try_fmt 



This resolves an issue raised by v4l2-compliance: if the given format does
not exist, then pick a default format.

While there is an exception regarding this for TV capture drivers, this
m2m driver should do the right thing.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 43405831

drivers/media/platform/mem2mem_testdev.c

+10 −2
Original line number Diff line number Diff line
@@ -543,7 +543,11 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, 
	struct m2mtest_ctx *ctx = file2ctx(file);



	fmt = find_format(f);

	if (!fmt || !(fmt->types & MEM2MEM_CAPTURE)) {

	if (!fmt) {

		f->fmt.pix.pixelformat = formats[0].fourcc;

		fmt = find_format(f);

	}

	if (!(fmt->types & MEM2MEM_CAPTURE)) {

		v4l2_err(&ctx->dev->v4l2_dev,

			 "Fourcc format (0x%08x) invalid.\n",

			 f->fmt.pix.pixelformat);
@@ -561,7 +565,11 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *priv, 
	struct m2mtest_ctx *ctx = file2ctx(file);



	fmt = find_format(f);

	if (!fmt || !(fmt->types & MEM2MEM_OUTPUT)) {

	if (!fmt) {

		f->fmt.pix.pixelformat = formats[0].fourcc;

		fmt = find_format(f);

	}

	if (!(fmt->types & MEM2MEM_OUTPUT)) {

		v4l2_err(&ctx->dev->v4l2_dev,

			 "Fourcc format (0x%08x) invalid.\n",

			 f->fmt.pix.pixelformat);