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

Commit b1452c51 authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

media: replace ADOBERGB by OPRGB 



commit db0340182444612bcadb98bdec22f651aa42266c upstream.

The CTA-861 standards have been updated to refer to opRGB instead
of AdobeRGB. The official standard is in fact named opRGB, so
switch to that.

The two old defines referring to ADOBERGB in the public API are
put under #ifndef __KERNEL__ and a comment mentions that they are
deprecated.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: stable@vger.kernel.org
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29ba4b99

Documentation/media/videodev2.h.rst.exceptions

+4 −2
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ replace symbol V4L2_MEMORY_USERPTR :c:type:`v4l2_memory` 
# Documented enum v4l2_colorspace

replace symbol V4L2_COLORSPACE_470_SYSTEM_BG :c:type:`v4l2_colorspace`

replace symbol V4L2_COLORSPACE_470_SYSTEM_M :c:type:`v4l2_colorspace`

replace symbol V4L2_COLORSPACE_ADOBERGB :c:type:`v4l2_colorspace`

replace symbol V4L2_COLORSPACE_OPRGB :c:type:`v4l2_colorspace`

replace define V4L2_COLORSPACE_ADOBERGB :c:type:`v4l2_colorspace`

replace symbol V4L2_COLORSPACE_BT2020 :c:type:`v4l2_colorspace`

replace symbol V4L2_COLORSPACE_DCI_P3 :c:type:`v4l2_colorspace`

replace symbol V4L2_COLORSPACE_DEFAULT :c:type:`v4l2_colorspace`
@@ -69,7 +70,8 @@ replace symbol V4L2_COLORSPACE_SRGB :c:type:`v4l2_colorspace` 


# Documented enum v4l2_xfer_func

replace symbol V4L2_XFER_FUNC_709 :c:type:`v4l2_xfer_func`

replace symbol V4L2_XFER_FUNC_ADOBERGB :c:type:`v4l2_xfer_func`

replace symbol V4L2_XFER_FUNC_OPRGB :c:type:`v4l2_xfer_func`

replace define V4L2_XFER_FUNC_ADOBERGB :c:type:`v4l2_xfer_func`

replace symbol V4L2_XFER_FUNC_DCI_P3 :c:type:`v4l2_xfer_func`

replace symbol V4L2_XFER_FUNC_DEFAULT :c:type:`v4l2_xfer_func`

replace symbol V4L2_XFER_FUNC_NONE :c:type:`v4l2_xfer_func`

drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c

+131 −131

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/i2c/adv7511.c

+1 −1
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd, 
	state->xfer_func = format->format.xfer_func;



	switch (format->format.colorspace) {

	case V4L2_COLORSPACE_ADOBERGB:

	case V4L2_COLORSPACE_OPRGB:

		c = HDMI_COLORIMETRY_EXTENDED;

		ec = y ? HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601 :

			 HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB;

drivers/media/i2c/adv7604.c

+1 −1
Original line number Diff line number Diff line
@@ -2476,7 +2476,7 @@ static int adv76xx_log_status(struct v4l2_subdev *sd) 
		"YCbCr Bt.601 (16-235)", "YCbCr Bt.709 (16-235)",

		"xvYCC Bt.601", "xvYCC Bt.709",

		"YCbCr Bt.601 (0-255)", "YCbCr Bt.709 (0-255)",

		"sYCC", "Adobe YCC 601", "AdobeRGB", "invalid", "invalid",

		"sYCC", "opYCC 601", "opRGB", "invalid", "invalid",

		"invalid", "invalid", "invalid"

	};

	static const char * const rgb_quantization_range_txt[] = {

drivers/media/i2c/tc358743.c

+2 −2
Original line number Diff line number Diff line
@@ -1243,9 +1243,9 @@ static int tc358743_log_status(struct v4l2_subdev *sd) 
	u8 vi_status3 =  i2c_rd8(sd, VI_STATUS3);

	const int deep_color_mode[4] = { 8, 10, 12, 16 };

	static const char * const input_color_space[] = {

		"RGB", "YCbCr 601", "Adobe RGB", "YCbCr 709", "NA (4)",

		"RGB", "YCbCr 601", "opRGB", "YCbCr 709", "NA (4)",

		"xvYCC 601", "NA(6)", "xvYCC 709", "NA(8)", "sYCC601",

		"NA(10)", "NA(11)", "NA(12)", "Adobe YCC 601"};

		"NA(10)", "NA(11)", "NA(12)", "opYCC 601"};



	v4l2_info(sd, "-----Chip status-----\n");

	v4l2_info(sd, "Chip ID: 0x%02x\n",