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

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

[media] vivid: use V4L2_DV_FL_IS_CE_VIDEO instead of V4L2_DV_BT_STD_CEA861 



Don't rely on V4L2_DV_BT_STD_CEA861 since that include the
640x480p format, which is an IT format, not CE.

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

drivers/media/platform/vivid/vivid-ctrls.c

+1 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ static int vivid_vid_out_s_ctrl(struct v4l2_ctrl *ctrl) 
		dev->dvi_d_out = ctrl->val == V4L2_DV_TX_MODE_DVI_D;

		if (!vivid_is_hdmi_out(dev))

			break;

		if (!dev->dvi_d_out && (bt->standards & V4L2_DV_BT_STD_CEA861)) {

		if (!dev->dvi_d_out && (bt->flags & V4L2_DV_FL_IS_CE_VIDEO)) {

			if (bt->width == 720 && bt->height <= 576)

				dev->colorspace_out = V4L2_COLORSPACE_SMPTE170M;

			else

drivers/media/platform/vivid/vivid-vid-cap.c

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ void vivid_update_format_cap(struct vivid_dev *dev, bool keep_controls) 
		 */

		if (keep_controls || !dev->colorspace)

			break;

		if (bt->standards & V4L2_DV_BT_STD_CEA861) {

		if (bt->flags & V4L2_DV_FL_IS_CE_VIDEO) {

			if (bt->width == 720 && bt->height <= 576)

				v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_170M);

			else
@@ -1358,7 +1358,7 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i) 
			v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_170M);

			break;

		case HDMI:

			if (bt->standards & V4L2_DV_BT_STD_CEA861) {

			if (bt->flags & V4L2_DV_FL_IS_CE_VIDEO) {

				if (dev->src_rect.width == 720 && dev->src_rect.height <= 576)

					v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_170M);

				else

drivers/media/platform/vivid/vivid-vid-out.c

+2 −2
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ void vivid_update_format_out(struct vivid_dev *dev) 
			dev->field_out = V4L2_FIELD_ALTERNATE;

		else

			dev->field_out = V4L2_FIELD_NONE;

		if (!dev->dvi_d_out && (bt->standards & V4L2_DV_BT_STD_CEA861)) {

		if (!dev->dvi_d_out && (bt->flags & V4L2_DV_FL_IS_CE_VIDEO)) {

			if (bt->width == 720 && bt->height <= 576)

				dev->colorspace_out = V4L2_COLORSPACE_SMPTE170M;

			else
@@ -411,7 +411,7 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv, 
	mp->quantization = V4L2_QUANTIZATION_DEFAULT;

	if (vivid_is_svid_out(dev)) {

		mp->colorspace = V4L2_COLORSPACE_SMPTE170M;

	} else if (dev->dvi_d_out || !(bt->standards & V4L2_DV_BT_STD_CEA861)) {

	} else if (dev->dvi_d_out || !(bt->flags & V4L2_DV_FL_IS_CE_VIDEO)) {

		mp->colorspace = V4L2_COLORSPACE_SRGB;

		if (dev->dvi_d_out)

			mp->quantization = V4L2_QUANTIZATION_LIM_RANGE;