Commit 66853ec4 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] sh-vou: let sh_vou_s_fmt_vid_out call sh_vou_try_fmt_vid_out 



This ensures that both do the same checks, and simplifies s_fmt_vid_out
a bit.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 61fbacc1

drivers/media/platform/sh_vou.c

+40 −46
Original line number Diff line number Diff line
@@ -673,34 +673,19 @@ static void vou_adjust_output(struct sh_vou_geometry *geo, v4l2_std_id std) 
		 vou_scale_v_num[idx_v], vou_scale_v_den[idx_v], best);

}



static int sh_vou_s_fmt_vid_out(struct file *file, void *priv,

static int sh_vou_try_fmt_vid_out(struct file *file, void *priv,

				  struct v4l2_format *fmt)

{

	struct sh_vou_device *vou_dev = video_drvdata(file);

	struct v4l2_pix_format *pix = &fmt->fmt.pix;

	unsigned int img_height_max;

	int pix_idx;

	struct sh_vou_geometry geo;

	struct v4l2_subdev_format format = {

		.which = V4L2_SUBDEV_FORMAT_ACTIVE,

		/* Revisit: is this the correct code? */

		.format.code = MEDIA_BUS_FMT_YUYV8_2X8,

		.format.field = V4L2_FIELD_INTERLACED,

		.format.colorspace = V4L2_COLORSPACE_SMPTE170M,

	};

	struct v4l2_mbus_framefmt *mbfmt = &format.format;

	int ret;



	dev_dbg(vou_dev->v4l2_dev.dev, "%s(): %ux%u -> %ux%u\n", __func__,

		vou_dev->rect.width, vou_dev->rect.height,

		pix->width, pix->height);



	if (pix->field == V4L2_FIELD_ANY)

		pix->field = V4L2_FIELD_NONE;

	dev_dbg(vou_dev->v4l2_dev.dev, "%s()\n", __func__);



	if (fmt->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||

	    pix->field != V4L2_FIELD_NONE)

		return -EINVAL;

	pix->field = V4L2_FIELD_INTERLACED;

	pix->colorspace = V4L2_COLORSPACE_SMPTE170M;

	pix->ycbcr_enc = pix->quantization = 0;



	for (pix_idx = 0; pix_idx < ARRAY_SIZE(vou_fmt); pix_idx++)

		if (vou_fmt[pix_idx].pfmt == pix->pixelformat)
@@ -714,9 +699,37 @@ static int sh_vou_s_fmt_vid_out(struct file *file, void *priv, 
	else

		img_height_max = 576;



	/* Image width must be a multiple of 4 */

	v4l_bound_align_image(&pix->width, 0, VOU_MAX_IMAGE_WIDTH, 2,

			      &pix->height, 0, img_height_max, 1, 0);

	pix->bytesperline = pix->width * 2;



	return 0;

}



static int sh_vou_s_fmt_vid_out(struct file *file, void *priv,

				struct v4l2_format *fmt)

{

	struct sh_vou_device *vou_dev = video_drvdata(file);

	struct v4l2_pix_format *pix = &fmt->fmt.pix;

	unsigned int img_height_max;

	struct sh_vou_geometry geo;

	struct v4l2_subdev_format format = {

		.which = V4L2_SUBDEV_FORMAT_ACTIVE,

		/* Revisit: is this the correct code? */

		.format.code = MEDIA_BUS_FMT_YUYV8_2X8,

		.format.field = V4L2_FIELD_INTERLACED,

		.format.colorspace = V4L2_COLORSPACE_SMPTE170M,

	};

	struct v4l2_mbus_framefmt *mbfmt = &format.format;

	int ret = sh_vou_try_fmt_vid_out(file, priv, fmt);

	int pix_idx;



	if (ret)

		return ret;



	for (pix_idx = 0; pix_idx < ARRAY_SIZE(vou_fmt); pix_idx++)

		if (vou_fmt[pix_idx].pfmt == pix->pixelformat)

			break;



	geo.in_width = pix->width;

	geo.in_height = pix->height;
@@ -735,6 +748,11 @@ static int sh_vou_s_fmt_vid_out(struct file *file, void *priv, 
	dev_dbg(vou_dev->v4l2_dev.dev, "%s(): %ux%u -> %ux%u\n", __func__,

		geo.output.width, geo.output.height, mbfmt->width, mbfmt->height);



	if (vou_dev->std & V4L2_STD_525_60)

		img_height_max = 480;

	else

		img_height_max = 576;



	/* Sanity checks */

	if ((unsigned)mbfmt->width > VOU_MAX_IMAGE_WIDTH ||

	    (unsigned)mbfmt->height > img_height_max ||
@@ -767,30 +785,6 @@ static int sh_vou_s_fmt_vid_out(struct file *file, void *priv, 
	return 0;

}



static int sh_vou_try_fmt_vid_out(struct file *file, void *priv,

				  struct v4l2_format *fmt)

{

	struct sh_vou_device *vou_dev = video_drvdata(file);

	struct v4l2_pix_format *pix = &fmt->fmt.pix;

	int i;



	dev_dbg(vou_dev->v4l2_dev.dev, "%s()\n", __func__);



	fmt->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;

	pix->field = V4L2_FIELD_NONE;



	v4l_bound_align_image(&pix->width, 0, VOU_MAX_IMAGE_WIDTH, 1,

			      &pix->height, 0, VOU_MAX_IMAGE_HEIGHT, 1, 0);



	for (i = 0; i < ARRAY_SIZE(vou_fmt); i++)

		if (vou_fmt[i].pfmt == pix->pixelformat)

			return 0;



	pix->pixelformat = vou_fmt[0].pfmt;



	return 0;

}



static int sh_vou_reqbufs(struct file *file, void *priv,

			  struct v4l2_requestbuffers *req)

{