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

Commit ace6e979 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: mediabus: fix ambiguous pixel code names 



Endianness notation is meaningless for 8 bit YUYV codes. Switch pixel code
names to explicitly state the order of colour components in the data
stream.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0f9313ad

arch/sh/boards/mach-ap325rxa/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static struct soc_camera_platform_info camera_info = { 
	.format_name = "UYVY",

	.format_depth = 16,

	.format = {

		.code = V4L2_MBUS_FMT_YUYV8_2X8_BE,

		.code = V4L2_MBUS_FMT_UYVY8_2X8,

		.colorspace = V4L2_COLORSPACE_SMPTE170M,

		.field = V4L2_FIELD_NONE,

		.width = 640,

drivers/media/video/ak881x.c

+3 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int ak881x_try_g_mbus_fmt(struct v4l2_subdev *sd, 
	v4l_bound_align_image(&mf->width, 0, 720, 2,

			      &mf->height, 0, ak881x->lines, 1, 0);

	mf->field	= V4L2_FIELD_INTERLACED;

	mf->code	= V4L2_MBUS_FMT_YUYV8_2X8_LE;

	mf->code	= V4L2_MBUS_FMT_YUYV8_2X8;

	mf->colorspace	= V4L2_COLORSPACE_SMPTE170M;



	return 0;
@@ -136,7 +136,7 @@ static int ak881x_s_mbus_fmt(struct v4l2_subdev *sd, 
			     struct v4l2_mbus_framefmt *mf)

{

	if (mf->field != V4L2_FIELD_INTERLACED ||

	    mf->code != V4L2_MBUS_FMT_YUYV8_2X8_LE)

	    mf->code != V4L2_MBUS_FMT_YUYV8_2X8)

		return -EINVAL;



	return ak881x_try_g_mbus_fmt(sd, mf);
@@ -148,7 +148,7 @@ static int ak881x_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned int index, 
	if (index)

		return -EINVAL;



	*code = V4L2_MBUS_FMT_YUYV8_2X8_LE;

	*code = V4L2_MBUS_FMT_YUYV8_2X8;

	return 0;

}

drivers/media/video/mt9m111.c

+8 −8
Original line number Diff line number Diff line
@@ -143,10 +143,10 @@ static const struct mt9m111_datafmt *mt9m111_find_datafmt( 
}



static const struct mt9m111_datafmt mt9m111_colour_fmts[] = {

	{V4L2_MBUS_FMT_YUYV8_2X8_LE, V4L2_COLORSPACE_JPEG},

	{V4L2_MBUS_FMT_YVYU8_2X8_LE, V4L2_COLORSPACE_JPEG},

	{V4L2_MBUS_FMT_YUYV8_2X8_BE, V4L2_COLORSPACE_JPEG},

	{V4L2_MBUS_FMT_YVYU8_2X8_BE, V4L2_COLORSPACE_JPEG},

	{V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG},

	{V4L2_MBUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG},

	{V4L2_MBUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG},

	{V4L2_MBUS_FMT_VYUY8_2X8, V4L2_COLORSPACE_JPEG},

	{V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},

	{V4L2_MBUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},

	{V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
@@ -505,22 +505,22 @@ static int mt9m111_set_pixfmt(struct i2c_client *client, 
	case V4L2_MBUS_FMT_RGB565_2X8_LE:

		ret = mt9m111_setfmt_rgb565(client);

		break;

	case V4L2_MBUS_FMT_YUYV8_2X8_BE:

	case V4L2_MBUS_FMT_UYVY8_2X8:

		mt9m111->swap_yuv_y_chromas = 0;

		mt9m111->swap_yuv_cb_cr = 0;

		ret = mt9m111_setfmt_yuv(client);

		break;

	case V4L2_MBUS_FMT_YVYU8_2X8_BE:

	case V4L2_MBUS_FMT_VYUY8_2X8:

		mt9m111->swap_yuv_y_chromas = 0;

		mt9m111->swap_yuv_cb_cr = 1;

		ret = mt9m111_setfmt_yuv(client);

		break;

	case V4L2_MBUS_FMT_YUYV8_2X8_LE:

	case V4L2_MBUS_FMT_YUYV8_2X8:

		mt9m111->swap_yuv_y_chromas = 1;

		mt9m111->swap_yuv_cb_cr = 0;

		ret = mt9m111_setfmt_yuv(client);

		break;

	case V4L2_MBUS_FMT_YVYU8_2X8_LE:

	case V4L2_MBUS_FMT_YVYU8_2X8:

		mt9m111->swap_yuv_y_chromas = 1;

		mt9m111->swap_yuv_cb_cr = 1;

		ret = mt9m111_setfmt_yuv(client);

drivers/media/video/mt9t112.c

+6 −6
Original line number Diff line number Diff line
@@ -121,22 +121,22 @@ struct mt9t112_priv { 


static const struct mt9t112_format mt9t112_cfmts[] = {

	{

		.code		= V4L2_MBUS_FMT_YUYV8_2X8_BE,

		.code		= V4L2_MBUS_FMT_UYVY8_2X8,

		.colorspace	= V4L2_COLORSPACE_JPEG,

		.fmt		= 1,

		.order		= 0,

	}, {

		.code		= V4L2_MBUS_FMT_YVYU8_2X8_BE,

		.code		= V4L2_MBUS_FMT_VYUY8_2X8,

		.colorspace	= V4L2_COLORSPACE_JPEG,

		.fmt		= 1,

		.order		= 1,

	}, {

		.code		= V4L2_MBUS_FMT_YUYV8_2X8_LE,

		.code		= V4L2_MBUS_FMT_YUYV8_2X8,

		.colorspace	= V4L2_COLORSPACE_JPEG,

		.fmt		= 1,

		.order		= 2,

	}, {

		.code		= V4L2_MBUS_FMT_YVYU8_2X8_LE,

		.code		= V4L2_MBUS_FMT_YVYU8_2X8,

		.colorspace	= V4L2_COLORSPACE_JPEG,

		.fmt		= 1,

		.order		= 3,
@@ -972,7 +972,7 @@ static int mt9t112_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 
	struct v4l2_rect *rect = &a->c;



	return mt9t112_set_params(client, rect->width, rect->height,

				 V4L2_MBUS_FMT_YUYV8_2X8_BE);

				 V4L2_MBUS_FMT_UYVY8_2X8);

}



static int mt9t112_g_fmt(struct v4l2_subdev *sd,
@@ -983,7 +983,7 @@ static int mt9t112_g_fmt(struct v4l2_subdev *sd, 


	if (!priv->format) {

		int ret = mt9t112_set_params(client, VGA_WIDTH, VGA_HEIGHT,

					     V4L2_MBUS_FMT_YUYV8_2X8_BE);

					     V4L2_MBUS_FMT_UYVY8_2X8);

		if (ret < 0)

			return ret;

	}

drivers/media/video/ov772x.c

+4 −4
Original line number Diff line number Diff line
@@ -440,21 +440,21 @@ static const struct regval_list ov772x_vga_regs[] = { 
 */

static const struct ov772x_color_format ov772x_cfmts[] = {

	{

		.code		= V4L2_MBUS_FMT_YUYV8_2X8_LE,

		.code		= V4L2_MBUS_FMT_YUYV8_2X8,

		.colorspace	= V4L2_COLORSPACE_JPEG,

		.dsp3		= 0x0,

		.com3		= SWAP_YUV,

		.com7		= OFMT_YUV,

	},

	{

		.code		= V4L2_MBUS_FMT_YVYU8_2X8_LE,

		.code		= V4L2_MBUS_FMT_YVYU8_2X8,

		.colorspace	= V4L2_COLORSPACE_JPEG,

		.dsp3		= UV_ON,

		.com3		= SWAP_YUV,

		.com7		= OFMT_YUV,

	},

	{

		.code		= V4L2_MBUS_FMT_YUYV8_2X8_BE,

		.code		= V4L2_MBUS_FMT_UYVY8_2X8,

		.colorspace	= V4L2_COLORSPACE_JPEG,

		.dsp3		= 0x0,

		.com3		= 0x0,
@@ -960,7 +960,7 @@ static int ov772x_g_fmt(struct v4l2_subdev *sd, 
	if (!priv->win || !priv->cfmt) {

		u32 width = VGA_WIDTH, height = VGA_HEIGHT;

		int ret = ov772x_set_params(client, &width, &height,

					    V4L2_MBUS_FMT_YUYV8_2X8_LE);

					    V4L2_MBUS_FMT_YUYV8_2X8);

		if (ret < 0)

			return ret;

	}