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

[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
...@@ -543,7 +543,11 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, ...@@ -543,7 +543,11 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
struct m2mtest_ctx *ctx = file2ctx(file); struct m2mtest_ctx *ctx = file2ctx(file);
fmt = find_format(f); 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, v4l2_err(&ctx->dev->v4l2_dev,
"Fourcc format (0x%08x) invalid.\n", "Fourcc format (0x%08x) invalid.\n",
f->fmt.pix.pixelformat); f->fmt.pix.pixelformat);
...@@ -561,7 +565,11 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *priv, ...@@ -561,7 +565,11 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
struct m2mtest_ctx *ctx = file2ctx(file); struct m2mtest_ctx *ctx = file2ctx(file);
fmt = find_format(f); 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, v4l2_err(&ctx->dev->v4l2_dev,
"Fourcc format (0x%08x) invalid.\n", "Fourcc format (0x%08x) invalid.\n",
f->fmt.pix.pixelformat); f->fmt.pix.pixelformat);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment