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

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

[media] cobalt: simplify colorspace code 



Simplify cobalt_g/try_fmt_vid_cap by not setting the colorspace fields in
pix again (since v4l2_fill_pix_format does that already), and by using
v4l2_fill_mbus_format in cobalt_s_fmt_vid_out which allows the get_fmt
call to be dropped as well.

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

drivers/media/pci/cobalt/cobalt-v4l2.c

+4 −13
Original line number Diff line number Diff line
@@ -737,10 +737,6 @@ static int cobalt_g_fmt_vid_cap(struct file *file, void *priv_fh, 
		sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;

		v4l2_subdev_call(s->sd, pad, get_fmt, NULL, &sd_fmt);

		v4l2_fill_pix_format(pix, &sd_fmt.format);

		pix->colorspace = sd_fmt.format.colorspace;

		pix->xfer_func = sd_fmt.format.xfer_func;

		pix->ycbcr_enc = sd_fmt.format.ycbcr_enc;

		pix->quantization = sd_fmt.format.quantization;

	}



	pix->pixelformat = s->pixfmt;
@@ -783,10 +779,6 @@ static int cobalt_try_fmt_vid_cap(struct file *file, void *priv_fh, 
		sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;

		v4l2_subdev_call(s->sd, pad, get_fmt, NULL, &sd_fmt);

		v4l2_fill_pix_format(pix, &sd_fmt.format);

		pix->colorspace = sd_fmt.format.colorspace;

		pix->xfer_func = sd_fmt.format.xfer_func;

		pix->ycbcr_enc = sd_fmt.format.ycbcr_enc;

		pix->quantization = sd_fmt.format.quantization;

	}



	switch (pix->pixelformat) {
@@ -933,6 +925,7 @@ static int cobalt_s_fmt_vid_out(struct file *file, void *priv_fh, 
	struct cobalt_stream *s = video_drvdata(file);

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

	struct v4l2_subdev_format sd_fmt = { 0 };

	u32 code;



	if (cobalt_try_fmt_vid_out(file, priv_fh, f))

		return -EINVAL;
@@ -945,9 +938,11 @@ static int cobalt_s_fmt_vid_out(struct file *file, void *priv_fh, 
	switch (pix->pixelformat) {

	case V4L2_PIX_FMT_YUYV:

		s->bpp = COBALT_BYTES_PER_PIXEL_YUYV;

		code = MEDIA_BUS_FMT_UYVY8_1X16;

		break;

	case V4L2_PIX_FMT_BGR32:

		s->bpp = COBALT_BYTES_PER_PIXEL_RGB32;

		code = MEDIA_BUS_FMT_RGB888_1X24;

		break;

	default:

		return -EINVAL;
@@ -961,11 +956,7 @@ static int cobalt_s_fmt_vid_out(struct file *file, void *priv_fh, 
	s->ycbcr_enc = pix->ycbcr_enc;

	s->quantization = pix->quantization;

	sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;

	v4l2_subdev_call(s->sd, pad, get_fmt, NULL, &sd_fmt);

	sd_fmt.format.colorspace = pix->colorspace;

	sd_fmt.format.xfer_func = pix->xfer_func;

	sd_fmt.format.ycbcr_enc = pix->ycbcr_enc;

	sd_fmt.format.quantization = pix->quantization;

	v4l2_fill_mbus_format(&sd_fmt.format, pix, code);

	v4l2_subdev_call(s->sd, pad, set_fmt, NULL, &sd_fmt);

	return 0;

}