提交 b1452c51 编写于 作者: H Hans Verkuil 提交者: Greg Kroah-Hartman

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: NHans Verkuil <hans.verkuil@cisco.com>
Cc: stable@vger.kernel.org
Acked-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: NMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 29ba4b99
...@@ -56,7 +56,8 @@ replace symbol V4L2_MEMORY_USERPTR :c:type:`v4l2_memory` ...@@ -56,7 +56,8 @@ replace symbol V4L2_MEMORY_USERPTR :c:type:`v4l2_memory`
# Documented enum v4l2_colorspace # Documented enum v4l2_colorspace
replace symbol V4L2_COLORSPACE_470_SYSTEM_BG :c:type:`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_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_BT2020 :c:type:`v4l2_colorspace`
replace symbol V4L2_COLORSPACE_DCI_P3 :c:type:`v4l2_colorspace` replace symbol V4L2_COLORSPACE_DCI_P3 :c:type:`v4l2_colorspace`
replace symbol V4L2_COLORSPACE_DEFAULT :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` ...@@ -69,7 +70,8 @@ replace symbol V4L2_COLORSPACE_SRGB :c:type:`v4l2_colorspace`
# Documented enum v4l2_xfer_func # Documented enum v4l2_xfer_func
replace symbol V4L2_XFER_FUNC_709 :c:type:`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_DCI_P3 :c:type:`v4l2_xfer_func`
replace symbol V4L2_XFER_FUNC_DEFAULT :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` replace symbol V4L2_XFER_FUNC_NONE :c:type:`v4l2_xfer_func`
......
...@@ -1355,7 +1355,7 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd, ...@@ -1355,7 +1355,7 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd,
state->xfer_func = format->format.xfer_func; state->xfer_func = format->format.xfer_func;
switch (format->format.colorspace) { switch (format->format.colorspace) {
case V4L2_COLORSPACE_ADOBERGB: case V4L2_COLORSPACE_OPRGB:
c = HDMI_COLORIMETRY_EXTENDED; c = HDMI_COLORIMETRY_EXTENDED;
ec = y ? HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601 : ec = y ? HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601 :
HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB; HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB;
......
...@@ -2476,7 +2476,7 @@ static int adv76xx_log_status(struct v4l2_subdev *sd) ...@@ -2476,7 +2476,7 @@ static int adv76xx_log_status(struct v4l2_subdev *sd)
"YCbCr Bt.601 (16-235)", "YCbCr Bt.709 (16-235)", "YCbCr Bt.601 (16-235)", "YCbCr Bt.709 (16-235)",
"xvYCC Bt.601", "xvYCC Bt.709", "xvYCC Bt.601", "xvYCC Bt.709",
"YCbCr Bt.601 (0-255)", "YCbCr Bt.709 (0-255)", "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" "invalid", "invalid", "invalid"
}; };
static const char * const rgb_quantization_range_txt[] = { static const char * const rgb_quantization_range_txt[] = {
......
...@@ -1243,9 +1243,9 @@ static int tc358743_log_status(struct v4l2_subdev *sd) ...@@ -1243,9 +1243,9 @@ static int tc358743_log_status(struct v4l2_subdev *sd)
u8 vi_status3 = i2c_rd8(sd, VI_STATUS3); u8 vi_status3 = i2c_rd8(sd, VI_STATUS3);
const int deep_color_mode[4] = { 8, 10, 12, 16 }; const int deep_color_mode[4] = { 8, 10, 12, 16 };
static const char * const input_color_space[] = { 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", "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 status-----\n");
v4l2_info(sd, "Chip ID: 0x%02x\n", v4l2_info(sd, "Chip ID: 0x%02x\n",
......
...@@ -111,7 +111,7 @@ enum vivid_colorspace { ...@@ -111,7 +111,7 @@ enum vivid_colorspace {
VIVID_CS_170M, VIVID_CS_170M,
VIVID_CS_709, VIVID_CS_709,
VIVID_CS_SRGB, VIVID_CS_SRGB,
VIVID_CS_ADOBERGB, VIVID_CS_OPRGB,
VIVID_CS_2020, VIVID_CS_2020,
VIVID_CS_DCI_P3, VIVID_CS_DCI_P3,
VIVID_CS_240M, VIVID_CS_240M,
......
...@@ -348,7 +348,7 @@ static int vivid_vid_cap_s_ctrl(struct v4l2_ctrl *ctrl) ...@@ -348,7 +348,7 @@ static int vivid_vid_cap_s_ctrl(struct v4l2_ctrl *ctrl)
V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_SMPTE170M,
V4L2_COLORSPACE_REC709, V4L2_COLORSPACE_REC709,
V4L2_COLORSPACE_SRGB, V4L2_COLORSPACE_SRGB,
V4L2_COLORSPACE_ADOBERGB, V4L2_COLORSPACE_OPRGB,
V4L2_COLORSPACE_BT2020, V4L2_COLORSPACE_BT2020,
V4L2_COLORSPACE_DCI_P3, V4L2_COLORSPACE_DCI_P3,
V4L2_COLORSPACE_SMPTE240M, V4L2_COLORSPACE_SMPTE240M,
...@@ -729,7 +729,7 @@ static const char * const vivid_ctrl_colorspace_strings[] = { ...@@ -729,7 +729,7 @@ static const char * const vivid_ctrl_colorspace_strings[] = {
"SMPTE 170M", "SMPTE 170M",
"Rec. 709", "Rec. 709",
"sRGB", "sRGB",
"AdobeRGB", "opRGB",
"BT.2020", "BT.2020",
"DCI-P3", "DCI-P3",
"SMPTE 240M", "SMPTE 240M",
...@@ -752,7 +752,7 @@ static const char * const vivid_ctrl_xfer_func_strings[] = { ...@@ -752,7 +752,7 @@ static const char * const vivid_ctrl_xfer_func_strings[] = {
"Default", "Default",
"Rec. 709", "Rec. 709",
"sRGB", "sRGB",
"AdobeRGB", "opRGB",
"SMPTE 240M", "SMPTE 240M",
"None", "None",
"DCI-P3", "DCI-P3",
......
...@@ -413,7 +413,7 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv, ...@@ -413,7 +413,7 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv,
mp->colorspace = V4L2_COLORSPACE_SMPTE170M; mp->colorspace = V4L2_COLORSPACE_SMPTE170M;
} else if (mp->colorspace != V4L2_COLORSPACE_SMPTE170M && } else if (mp->colorspace != V4L2_COLORSPACE_SMPTE170M &&
mp->colorspace != V4L2_COLORSPACE_REC709 && mp->colorspace != V4L2_COLORSPACE_REC709 &&
mp->colorspace != V4L2_COLORSPACE_ADOBERGB && mp->colorspace != V4L2_COLORSPACE_OPRGB &&
mp->colorspace != V4L2_COLORSPACE_BT2020 && mp->colorspace != V4L2_COLORSPACE_BT2020 &&
mp->colorspace != V4L2_COLORSPACE_SRGB) { mp->colorspace != V4L2_COLORSPACE_SRGB) {
mp->colorspace = V4L2_COLORSPACE_REC709; mp->colorspace = V4L2_COLORSPACE_REC709;
......
...@@ -838,8 +838,8 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, ...@@ -838,8 +838,8 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi,
case HDMI_COLORIMETRY_EXTENDED: case HDMI_COLORIMETRY_EXTENDED:
switch (avi->extended_colorimetry) { switch (avi->extended_colorimetry) {
case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB: case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB:
c.colorspace = V4L2_COLORSPACE_ADOBERGB; c.colorspace = V4L2_COLORSPACE_OPRGB;
c.xfer_func = V4L2_XFER_FUNC_ADOBERGB; c.xfer_func = V4L2_XFER_FUNC_OPRGB;
break; break;
case HDMI_EXTENDED_COLORIMETRY_BT2020: case HDMI_EXTENDED_COLORIMETRY_BT2020:
c.colorspace = V4L2_COLORSPACE_BT2020; c.colorspace = V4L2_COLORSPACE_BT2020;
...@@ -909,9 +909,9 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, ...@@ -909,9 +909,9 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi,
c.xfer_func = V4L2_XFER_FUNC_SRGB; c.xfer_func = V4L2_XFER_FUNC_SRGB;
break; break;
case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601: case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601:
c.colorspace = V4L2_COLORSPACE_ADOBERGB; c.colorspace = V4L2_COLORSPACE_OPRGB;
c.ycbcr_enc = V4L2_YCBCR_ENC_601; c.ycbcr_enc = V4L2_YCBCR_ENC_601;
c.xfer_func = V4L2_XFER_FUNC_ADOBERGB; c.xfer_func = V4L2_XFER_FUNC_OPRGB;
break; break;
case HDMI_EXTENDED_COLORIMETRY_BT2020: case HDMI_EXTENDED_COLORIMETRY_BT2020:
c.colorspace = V4L2_COLORSPACE_BT2020; c.colorspace = V4L2_COLORSPACE_BT2020;
......
...@@ -225,8 +225,8 @@ enum v4l2_colorspace { ...@@ -225,8 +225,8 @@ enum v4l2_colorspace {
/* For RGB colorspaces such as produces by most webcams. */ /* For RGB colorspaces such as produces by most webcams. */
V4L2_COLORSPACE_SRGB = 8, V4L2_COLORSPACE_SRGB = 8,
/* AdobeRGB colorspace */ /* opRGB colorspace */
V4L2_COLORSPACE_ADOBERGB = 9, V4L2_COLORSPACE_OPRGB = 9,
/* BT.2020 colorspace, used for UHDTV. */ /* BT.2020 colorspace, used for UHDTV. */
V4L2_COLORSPACE_BT2020 = 10, V4L2_COLORSPACE_BT2020 = 10,
...@@ -258,7 +258,7 @@ enum v4l2_xfer_func { ...@@ -258,7 +258,7 @@ enum v4l2_xfer_func {
* *
* V4L2_COLORSPACE_SRGB, V4L2_COLORSPACE_JPEG: V4L2_XFER_FUNC_SRGB * V4L2_COLORSPACE_SRGB, V4L2_COLORSPACE_JPEG: V4L2_XFER_FUNC_SRGB
* *
* V4L2_COLORSPACE_ADOBERGB: V4L2_XFER_FUNC_ADOBERGB * V4L2_COLORSPACE_OPRGB: V4L2_XFER_FUNC_OPRGB
* *
* V4L2_COLORSPACE_SMPTE240M: V4L2_XFER_FUNC_SMPTE240M * V4L2_COLORSPACE_SMPTE240M: V4L2_XFER_FUNC_SMPTE240M
* *
...@@ -269,7 +269,7 @@ enum v4l2_xfer_func { ...@@ -269,7 +269,7 @@ enum v4l2_xfer_func {
V4L2_XFER_FUNC_DEFAULT = 0, V4L2_XFER_FUNC_DEFAULT = 0,
V4L2_XFER_FUNC_709 = 1, V4L2_XFER_FUNC_709 = 1,
V4L2_XFER_FUNC_SRGB = 2, V4L2_XFER_FUNC_SRGB = 2,
V4L2_XFER_FUNC_ADOBERGB = 3, V4L2_XFER_FUNC_OPRGB = 3,
V4L2_XFER_FUNC_SMPTE240M = 4, V4L2_XFER_FUNC_SMPTE240M = 4,
V4L2_XFER_FUNC_NONE = 5, V4L2_XFER_FUNC_NONE = 5,
V4L2_XFER_FUNC_DCI_P3 = 6, V4L2_XFER_FUNC_DCI_P3 = 6,
...@@ -281,7 +281,7 @@ enum v4l2_xfer_func { ...@@ -281,7 +281,7 @@ enum v4l2_xfer_func {
* This depends on the colorspace. * This depends on the colorspace.
*/ */
#define V4L2_MAP_XFER_FUNC_DEFAULT(colsp) \ #define V4L2_MAP_XFER_FUNC_DEFAULT(colsp) \
((colsp) == V4L2_COLORSPACE_ADOBERGB ? V4L2_XFER_FUNC_ADOBERGB : \ ((colsp) == V4L2_COLORSPACE_OPRGB ? V4L2_XFER_FUNC_OPRGB : \
((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_XFER_FUNC_SMPTE240M : \ ((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_XFER_FUNC_SMPTE240M : \
((colsp) == V4L2_COLORSPACE_DCI_P3 ? V4L2_XFER_FUNC_DCI_P3 : \ ((colsp) == V4L2_COLORSPACE_DCI_P3 ? V4L2_XFER_FUNC_DCI_P3 : \
((colsp) == V4L2_COLORSPACE_RAW ? V4L2_XFER_FUNC_NONE : \ ((colsp) == V4L2_COLORSPACE_RAW ? V4L2_XFER_FUNC_NONE : \
...@@ -295,7 +295,7 @@ enum v4l2_ycbcr_encoding { ...@@ -295,7 +295,7 @@ enum v4l2_ycbcr_encoding {
* *
* V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M, * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M,
* V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_SRGB, * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_SRGB,
* V4L2_COLORSPACE_ADOBERGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601 * V4L2_COLORSPACE_OPRGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601
* *
* V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709 * V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709
* *
...@@ -382,6 +382,17 @@ enum v4l2_quantization { ...@@ -382,6 +382,17 @@ enum v4l2_quantization {
(((is_rgb_or_hsv) || (colsp) == V4L2_COLORSPACE_JPEG) ? \ (((is_rgb_or_hsv) || (colsp) == V4L2_COLORSPACE_JPEG) ? \
V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE)) V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE))
/*
* Deprecated names for opRGB colorspace (IEC 61966-2-5)
*
* WARNING: Please don't use these deprecated defines in your code, as
* there is a chance we have to remove them in the future.
*/
#ifndef __KERNEL__
#define V4L2_COLORSPACE_ADOBERGB V4L2_COLORSPACE_OPRGB
#define V4L2_XFER_FUNC_ADOBERGB V4L2_XFER_FUNC_OPRGB
#endif
enum v4l2_priority { enum v4l2_priority {
V4L2_PRIORITY_UNSET = 0, /* not initialized */ V4L2_PRIORITY_UNSET = 0, /* not initialized */
V4L2_PRIORITY_BACKGROUND = 1, V4L2_PRIORITY_BACKGROUND = 1,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册