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

Commit 5c3112b5 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] mem2mem_testdev: improve field handling 



try_fmt should just set field to NONE and not return an error if
a different field was passed.

buf_prepare should check if the field passed in from userspace has a
supported field value. At the moment only NONE is supported and ANY
is mapped to NONE.

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 ca5f5fdb

drivers/media/platform/mem2mem_testdev.c

+10 −11
Original line number Diff line number Diff line
@@ -516,19 +516,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, 


static int vidioc_try_fmt(struct v4l2_format *f, struct m2mtest_fmt *fmt)

{

	enum v4l2_field field;



	field = f->fmt.pix.field;



	if (field == V4L2_FIELD_ANY)

		field = V4L2_FIELD_NONE;

	else if (V4L2_FIELD_NONE != field)

		return -EINVAL;



	/* V4L2 specification suggests the driver corrects the format struct

	 * if any of the dimensions is unsupported */

	f->fmt.pix.field = field;



	if (f->fmt.pix.height < MIN_H)

		f->fmt.pix.height = MIN_H;

	else if (f->fmt.pix.height > MAX_H)
@@ -542,6 +531,7 @@ static int vidioc_try_fmt(struct v4l2_format *f, struct m2mtest_fmt *fmt) 
	f->fmt.pix.width &= ~DIM_ALIGN_MASK;

	f->fmt.pix.bytesperline = (f->fmt.pix.width * fmt->depth) >> 3;

	f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;

	f->fmt.pix.field = V4L2_FIELD_NONE;

	f->fmt.pix.priv = 0;



	return 0;
@@ -760,6 +750,15 @@ static int m2mtest_buf_prepare(struct vb2_buffer *vb) 
	dprintk(ctx->dev, "type: %d\n", vb->vb2_queue->type);



	q_data = get_q_data(ctx, vb->vb2_queue->type);

	if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {

		if (vb->v4l2_buf.field == V4L2_FIELD_ANY)

			vb->v4l2_buf.field = V4L2_FIELD_NONE;

		if (vb->v4l2_buf.field != V4L2_FIELD_NONE) {

			dprintk(ctx->dev, "%s field isn't supported\n",

					__func__);

			return -EINVAL;

		}

	}



	if (vb2_plane_size(vb, 0) < q_data->sizeimage) {

		dprintk(ctx->dev, "%s data will not fit into plane (%lu < %lu)\n",