Commit 48a8a0cb authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] omap3isp: Default to progressive field order when setting the format



If the requested field order is not supported default to progressive as
we can't guess how the user will configure the pipeline later on.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: default avatarEnrico Butera <ebutera@users.sourceforge.net>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 25c5cc91
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -631,6 +631,15 @@ isp_video_set_format(struct file *file, void *fh, struct v4l2_format *format)
	if (format->type != video->type)
		return -EINVAL;

	/* Default to the progressive field order if the requested value is not
	 * supported (or set to ANY). The only supported orders are progressive
	 * (available on all video nodes) and alternate (available on capture
	 * nodes only).
	 */
	if (format->fmt.pix.field != V4L2_FIELD_ALTERNATE ||
	    video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
		format->fmt.pix.field = V4L2_FIELD_NONE;

	/* Fill the bytesperline and sizeimage fields by converting to media bus
	 * format and back to pixel format.
	 */