Commit 463659a0 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

media: hdmi.h: rename ADOBE_RGB to OPRGB and ADOBE_YCC to OPYCC

These names have been renamed in the CTA-861 standard due to trademark
issues. Replace them here as well so they are in sync with the standard.
Signed-off-by: default avatarHans Verkuil <hansverk@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>
parent db034018
...@@ -1357,8 +1357,8 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd, ...@@ -1357,8 +1357,8 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd,
switch (format->format.colorspace) { switch (format->format.colorspace) {
case V4L2_COLORSPACE_OPRGB: 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_OPYCC_601 :
HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB; HDMI_EXTENDED_COLORIMETRY_OPRGB;
break; break;
case V4L2_COLORSPACE_SMPTE170M: case V4L2_COLORSPACE_SMPTE170M:
c = y ? HDMI_COLORIMETRY_ITU_601 : HDMI_COLORIMETRY_NONE; c = y ? HDMI_COLORIMETRY_ITU_601 : HDMI_COLORIMETRY_NONE;
......
...@@ -877,7 +877,7 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, ...@@ -877,7 +877,7 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi,
switch (avi->colorimetry) { switch (avi->colorimetry) {
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_OPRGB:
c.colorspace = V4L2_COLORSPACE_OPRGB; c.colorspace = V4L2_COLORSPACE_OPRGB;
c.xfer_func = V4L2_XFER_FUNC_OPRGB; c.xfer_func = V4L2_XFER_FUNC_OPRGB;
break; break;
...@@ -948,7 +948,7 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, ...@@ -948,7 +948,7 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi,
c.ycbcr_enc = V4L2_YCBCR_ENC_601; c.ycbcr_enc = V4L2_YCBCR_ENC_601;
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_OPYCC_601:
c.colorspace = V4L2_COLORSPACE_OPRGB; 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_OPRGB; c.xfer_func = V4L2_XFER_FUNC_OPRGB;
......
...@@ -592,10 +592,10 @@ hdmi_extended_colorimetry_get_name(enum hdmi_extended_colorimetry ext_col) ...@@ -592,10 +592,10 @@ hdmi_extended_colorimetry_get_name(enum hdmi_extended_colorimetry ext_col)
return "xvYCC 709"; return "xvYCC 709";
case HDMI_EXTENDED_COLORIMETRY_S_YCC_601: case HDMI_EXTENDED_COLORIMETRY_S_YCC_601:
return "sYCC 601"; return "sYCC 601";
case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601: case HDMI_EXTENDED_COLORIMETRY_OPYCC_601:
return "Adobe YCC 601"; return "opYCC 601";
case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB: case HDMI_EXTENDED_COLORIMETRY_OPRGB:
return "Adobe RGB"; return "opRGB";
case HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM: case HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM:
return "BT.2020 Constant Luminance"; return "BT.2020 Constant Luminance";
case HDMI_EXTENDED_COLORIMETRY_BT2020: case HDMI_EXTENDED_COLORIMETRY_BT2020:
......
...@@ -101,8 +101,8 @@ enum hdmi_extended_colorimetry { ...@@ -101,8 +101,8 @@ enum hdmi_extended_colorimetry {
HDMI_EXTENDED_COLORIMETRY_XV_YCC_601, HDMI_EXTENDED_COLORIMETRY_XV_YCC_601,
HDMI_EXTENDED_COLORIMETRY_XV_YCC_709, HDMI_EXTENDED_COLORIMETRY_XV_YCC_709,
HDMI_EXTENDED_COLORIMETRY_S_YCC_601, HDMI_EXTENDED_COLORIMETRY_S_YCC_601,
HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601, HDMI_EXTENDED_COLORIMETRY_OPYCC_601,
HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB, HDMI_EXTENDED_COLORIMETRY_OPRGB,
/* The following EC values are only defined in CEA-861-F. */ /* The following EC values are only defined in CEA-861-F. */
HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM, HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment