aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-09-24 15:56:13 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2018-09-24 15:56:13 +0200
commit4890391b5d9e25ddd933e29c8f812a138e77919b (patch)
treebf7bcc039c7e56fee213c0b7237ff767928f0665 /utils
parentcaed5d64e32d55fd6abb7d4be941aaaa857be42e (diff)
v4l-utils: replace all AdobeRGB/YCC references by opRGB/YCC references.
In November last year all references to the AdobeRGB colorspace were removed from the CTA-861 standards (all versions) and replaced with the corresponding international opRGB standard (IEC 61966-2-5) due to trademark issues. Do the same in v4l-utils. If nothing else, this keeps the utilities in sync with the standard. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/common/v4l2-info.cpp8
-rw-r--r--utils/media-ctl/libv4l2subdev.c4
-rw-r--r--utils/qv4l2/capture-win-gl.cpp6
-rw-r--r--utils/qv4l2/general-tab.cpp4
-rw-r--r--utils/qv4l2/qv4l2.cpp4
-rw-r--r--utils/qv4l2/tpg-tab.cpp4
-rw-r--r--utils/qvidcap/capture-win-gl.cpp10
-rw-r--r--utils/qvidcap/qvidcap.1.in4
-rw-r--r--utils/qvidcap/qvidcap.cpp8
-rw-r--r--utils/qvidcap/v4l2-convert.glsl6
-rw-r--r--utils/v4l2-ctl/v4l2-ctl-edid.cpp20
-rw-r--r--utils/v4l2-ctl/v4l2-ctl-subdev.cpp4
-rw-r--r--utils/v4l2-ctl/v4l2-ctl-vidcap.cpp4
-rw-r--r--utils/v4l2-ctl/v4l2-ctl-vidout.cpp4
-rw-r--r--utils/v4l2-ctl/v4l2-ctl.cpp4
15 files changed, 47 insertions, 47 deletions
diff --git a/utils/common/v4l2-info.cpp b/utils/common/v4l2-info.cpp
index 1429ae72..192f068c 100644
--- a/utils/common/v4l2-info.cpp
+++ b/utils/common/v4l2-info.cpp
@@ -244,8 +244,8 @@ std::string colorspace2s(int val)
return "JPEG";
case V4L2_COLORSPACE_SRGB:
return "sRGB";
- case V4L2_COLORSPACE_ADOBERGB:
- return "AdobeRGB";
+ case V4L2_COLORSPACE_OPRGB:
+ return "opRGB";
case V4L2_COLORSPACE_DCI_P3:
return "DCI-P3";
case V4L2_COLORSPACE_BT2020:
@@ -266,8 +266,8 @@ std::string xfer_func2s(int val)
return "Rec. 709";
case V4L2_XFER_FUNC_SRGB:
return "sRGB";
- case V4L2_XFER_FUNC_ADOBERGB:
- return "AdobeRGB";
+ case V4L2_XFER_FUNC_OPRGB:
+ return "opRGB";
case V4L2_XFER_FUNC_DCI_P3:
return "DCI-P3";
case V4L2_XFER_FUNC_SMPTE2084:
diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c
index ac0c8cfa..a989efb3 100644
--- a/utils/media-ctl/libv4l2subdev.c
+++ b/utils/media-ctl/libv4l2subdev.c
@@ -963,7 +963,7 @@ static struct {
{ "470bg", V4L2_COLORSPACE_470_SYSTEM_BG },
{ "jpeg", V4L2_COLORSPACE_JPEG },
{ "srgb", V4L2_COLORSPACE_SRGB },
- { "adobergb", V4L2_COLORSPACE_ADOBERGB },
+ { "oprgb", V4L2_COLORSPACE_OPRGB },
{ "bt2020", V4L2_COLORSPACE_BT2020 },
{ "dcip3", V4L2_COLORSPACE_DCI_P3 },
};
@@ -999,7 +999,7 @@ static struct {
{ "default", V4L2_XFER_FUNC_DEFAULT },
{ "709", V4L2_XFER_FUNC_709 },
{ "srgb", V4L2_XFER_FUNC_SRGB },
- { "adobergb", V4L2_XFER_FUNC_ADOBERGB },
+ { "oprgb", V4L2_XFER_FUNC_OPRGB },
{ "smpte240m", V4L2_XFER_FUNC_SMPTE240M },
{ "smpte2084", V4L2_XFER_FUNC_SMPTE2084 },
{ "dcip3", V4L2_XFER_FUNC_DCI_P3 },
diff --git a/utils/qv4l2/capture-win-gl.cpp b/utils/qv4l2/capture-win-gl.cpp
index ef8ca909..f7f83326 100644
--- a/utils/qv4l2/capture-win-gl.cpp
+++ b/utils/qv4l2/capture-win-gl.cpp
@@ -198,7 +198,7 @@ void CaptureWinGLEngine::setColorspace(unsigned colorspace, unsigned xfer_func,
case V4L2_COLORSPACE_470_SYSTEM_M:
case V4L2_COLORSPACE_470_SYSTEM_BG:
case V4L2_COLORSPACE_SRGB:
- case V4L2_COLORSPACE_ADOBERGB:
+ case V4L2_COLORSPACE_OPRGB:
case V4L2_COLORSPACE_BT2020:
case V4L2_COLORSPACE_DCI_P3:
break;
@@ -790,7 +790,7 @@ QString CaptureWinGLEngine::codeTransformToLinear()
" b = (b < -0.04045) ? -pow((-b + 0.055) / 1.055, 2.4) : "
" ((b <= 0.04045) ? b / 12.92 : pow((b + 0.055) / 1.055, 2.4));"
);
- case V4L2_XFER_FUNC_ADOBERGB:
+ case V4L2_XFER_FUNC_OPRGB:
return QString(" r = pow(max(r, 0.0), 2.19921875);"
" g = pow(max(g, 0.0), 2.19921875);"
" b = pow(max(b, 0.0), 2.19921875);");
@@ -857,7 +857,7 @@ QString CaptureWinGLEngine::codeColorspaceConversion()
" float bb = -0.0119 * g + 1.0119 * b;"
" r = rr; b = bb;"
);
- case V4L2_COLORSPACE_ADOBERGB:
+ case V4L2_COLORSPACE_OPRGB:
return QString(" float rr = 1.3982832 * r - 0.3982831 * g;"
" float bb = -0.0429383 * g + 1.0429383 * b;"
" r = rr; b = bb;"
diff --git a/utils/qv4l2/general-tab.cpp b/utils/qv4l2/general-tab.cpp
index c48254f7..7ab79a05 100644
--- a/utils/qv4l2/general-tab.cpp
+++ b/utils/qv4l2/general-tab.cpp
@@ -746,7 +746,7 @@ void GeneralTab::formatSection(v4l2_fmtdesc fmt)
m_colorspace->addItem("SMPTE 170M", QVariant(V4L2_COLORSPACE_SMPTE170M));
m_colorspace->addItem("Rec. 709", QVariant(V4L2_COLORSPACE_REC709));
m_colorspace->addItem("sRGB", QVariant(V4L2_COLORSPACE_SRGB));
- m_colorspace->addItem("Adobe RGB", QVariant(V4L2_COLORSPACE_ADOBERGB));
+ m_colorspace->addItem("opRGB", QVariant(V4L2_COLORSPACE_OPRGB));
m_colorspace->addItem("BT.2020", QVariant(V4L2_COLORSPACE_BT2020));
m_colorspace->addItem("DCI-P3", QVariant(V4L2_COLORSPACE_DCI_P3));
m_colorspace->addItem("SMPTE 240M", QVariant(V4L2_COLORSPACE_SMPTE240M));
@@ -761,7 +761,7 @@ void GeneralTab::formatSection(v4l2_fmtdesc fmt)
m_xferFunc->addItem(m_isOutput ? "Default" : "Autodetect", QVariant(V4L2_XFER_FUNC_DEFAULT));
m_xferFunc->addItem("Rec. 709", QVariant(V4L2_XFER_FUNC_709));
m_xferFunc->addItem("sRGB", QVariant(V4L2_XFER_FUNC_SRGB));
- m_xferFunc->addItem("Adobe RGB", QVariant(V4L2_XFER_FUNC_ADOBERGB));
+ m_xferFunc->addItem("opRGB", QVariant(V4L2_XFER_FUNC_OPRGB));
m_xferFunc->addItem("DCI-P3", QVariant(V4L2_XFER_FUNC_DCI_P3));
m_xferFunc->addItem("SMPTE 2084", QVariant(V4L2_XFER_FUNC_SMPTE2084));
m_xferFunc->addItem("SMPTE 240M", QVariant(V4L2_XFER_FUNC_SMPTE240M));
diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp
index 929b795b..df9711b6 100644
--- a/utils/qv4l2/qv4l2.cpp
+++ b/utils/qv4l2/qv4l2.cpp
@@ -190,7 +190,7 @@ ApplicationWindow::ApplicationWindow() :
addSubMenuItem(grp, menu, "SMPTE 170M", V4L2_COLORSPACE_SMPTE170M);
addSubMenuItem(grp, menu, "Rec. 709", V4L2_COLORSPACE_REC709);
addSubMenuItem(grp, menu, "sRGB", V4L2_COLORSPACE_SRGB);
- addSubMenuItem(grp, menu, "Adobe RGB", V4L2_COLORSPACE_ADOBERGB);
+ addSubMenuItem(grp, menu, "opRGB", V4L2_COLORSPACE_OPRGB);
addSubMenuItem(grp, menu, "BT.2020", V4L2_COLORSPACE_BT2020);
addSubMenuItem(grp, menu, "DCI-P3", V4L2_COLORSPACE_DCI_P3);
addSubMenuItem(grp, menu, "SMPTE 240M", V4L2_COLORSPACE_SMPTE240M);
@@ -205,7 +205,7 @@ ApplicationWindow::ApplicationWindow() :
addSubMenuItem(grp, menu, "No Override", -1)->setChecked(true);
addSubMenuItem(grp, menu, "Rec. 709", V4L2_XFER_FUNC_709);
addSubMenuItem(grp, menu, "sRGB", V4L2_XFER_FUNC_SRGB);
- addSubMenuItem(grp, menu, "Adobe RGB", V4L2_XFER_FUNC_ADOBERGB);
+ addSubMenuItem(grp, menu, "opRGB", V4L2_XFER_FUNC_OPRGB);
addSubMenuItem(grp, menu, "DCI-P3", V4L2_XFER_FUNC_DCI_P3);
addSubMenuItem(grp, menu, "SMPTE 2084", V4L2_XFER_FUNC_SMPTE2084);
addSubMenuItem(grp, menu, "SMPTE 240M", V4L2_XFER_FUNC_SMPTE240M);
diff --git a/utils/qv4l2/tpg-tab.cpp b/utils/qv4l2/tpg-tab.cpp
index d5073929..aac756c2 100644
--- a/utils/qv4l2/tpg-tab.cpp
+++ b/utils/qv4l2/tpg-tab.cpp
@@ -143,7 +143,7 @@ void ApplicationWindow::addTpgTab(int m_winWidth)
m_tpgColorspace->addItem("SMPTE 170M", QVariant(V4L2_COLORSPACE_SMPTE170M));
m_tpgColorspace->addItem("Rec. 709", QVariant(V4L2_COLORSPACE_REC709));
m_tpgColorspace->addItem("sRGB", QVariant(V4L2_COLORSPACE_SRGB));
- m_tpgColorspace->addItem("Adobe RGB", QVariant(V4L2_COLORSPACE_ADOBERGB));
+ m_tpgColorspace->addItem("opRGB", QVariant(V4L2_COLORSPACE_OPRGB));
m_tpgColorspace->addItem("BT.2020", QVariant(V4L2_COLORSPACE_BT2020));
m_tpgColorspace->addItem("DCI-P3", QVariant(V4L2_COLORSPACE_DCI_P3));
m_tpgColorspace->addItem("SMPTE 240M", QVariant(V4L2_COLORSPACE_SMPTE240M));
@@ -157,7 +157,7 @@ void ApplicationWindow::addTpgTab(int m_winWidth)
m_tpgXferFunc->addItem("Use Format", QVariant(V4L2_XFER_FUNC_DEFAULT));
m_tpgXferFunc->addItem("Rec. 709", QVariant(V4L2_XFER_FUNC_709));
m_tpgXferFunc->addItem("sRGB", QVariant(V4L2_XFER_FUNC_SRGB));
- m_tpgXferFunc->addItem("Adobe RGB", QVariant(V4L2_XFER_FUNC_ADOBERGB));
+ m_tpgXferFunc->addItem("opRGB", QVariant(V4L2_XFER_FUNC_OPRGB));
m_tpgXferFunc->addItem("DCI-P3", QVariant(V4L2_XFER_FUNC_DCI_P3));
m_tpgXferFunc->addItem("SMPTE 2084", QVariant(V4L2_XFER_FUNC_SMPTE2084));
m_tpgXferFunc->addItem("SMPTE 240M", QVariant(V4L2_XFER_FUNC_SMPTE240M));
diff --git a/utils/qvidcap/capture-win-gl.cpp b/utils/qvidcap/capture-win-gl.cpp
index 95177115..c415f9a9 100644
--- a/utils/qvidcap/capture-win-gl.cpp
+++ b/utils/qvidcap/capture-win-gl.cpp
@@ -117,7 +117,7 @@ const __u32 colorspaces[] = {
V4L2_COLORSPACE_470_SYSTEM_M,
V4L2_COLORSPACE_470_SYSTEM_BG,
V4L2_COLORSPACE_SRGB,
- V4L2_COLORSPACE_ADOBERGB,
+ V4L2_COLORSPACE_OPRGB,
V4L2_COLORSPACE_DCI_P3,
V4L2_COLORSPACE_BT2020,
0
@@ -126,7 +126,7 @@ const __u32 colorspaces[] = {
const __u32 xfer_funcs[] = {
V4L2_XFER_FUNC_709,
V4L2_XFER_FUNC_SRGB,
- V4L2_XFER_FUNC_ADOBERGB,
+ V4L2_XFER_FUNC_OPRGB,
V4L2_XFER_FUNC_DCI_P3,
V4L2_XFER_FUNC_SMPTE2084,
V4L2_XFER_FUNC_SMPTE240M,
@@ -942,7 +942,7 @@ bool CaptureGLWin::setV4LFormat(cv4l_fmt &fmt)
case V4L2_COLORSPACE_470_SYSTEM_M:
case V4L2_COLORSPACE_470_SYSTEM_BG:
case V4L2_COLORSPACE_SRGB:
- case V4L2_COLORSPACE_ADOBERGB:
+ case V4L2_COLORSPACE_OPRGB:
case V4L2_COLORSPACE_BT2020:
case V4L2_COLORSPACE_DCI_P3:
break;
@@ -1842,7 +1842,7 @@ static const struct define defines[] = {
DEF(V4L2_COLORSPACE_470_SYSTEM_M),
DEF(V4L2_COLORSPACE_470_SYSTEM_BG),
DEF(V4L2_COLORSPACE_SRGB),
- DEF(V4L2_COLORSPACE_ADOBERGB),
+ DEF(V4L2_COLORSPACE_OPRGB),
DEF(V4L2_COLORSPACE_BT2020),
DEF(V4L2_COLORSPACE_RAW),
DEF(V4L2_COLORSPACE_DCI_P3),
@@ -1850,7 +1850,7 @@ static const struct define defines[] = {
DEF(V4L2_XFER_FUNC_DEFAULT),
DEF(V4L2_XFER_FUNC_709),
DEF(V4L2_XFER_FUNC_SRGB),
- DEF(V4L2_XFER_FUNC_ADOBERGB),
+ DEF(V4L2_XFER_FUNC_OPRGB),
DEF(V4L2_XFER_FUNC_SMPTE240M),
DEF(V4L2_XFER_FUNC_NONE),
DEF(V4L2_XFER_FUNC_DCI_P3),
diff --git a/utils/qvidcap/qvidcap.1.in b/utils/qvidcap/qvidcap.1.in
index bc1d1113..d7f4af66 100644
--- a/utils/qvidcap/qvidcap.1.in
+++ b/utils/qvidcap/qvidcap.1.in
@@ -34,10 +34,10 @@ Starting with frame <frm> (default 1), pause after displaying each frame
until Space is pressed.
.TP
\fB\-C\fR, \fB\-\-colorspace\fR=\fI<c>\fR
-Override colorspace. <c> can be one of the following colorspaces: smpte170m, smpte240m, rec709, 470m, 470bg, jpeg, srgb, adobergb, bt2020, dcip3
+Override colorspace. <c> can be one of the following colorspaces: smpte170m, smpte240m, rec709, 470m, 470bg, jpeg, srgb, oprgb, bt2020, dcip3
.TP
\fB\-X\fR, \fB\-\-xfer-func\fR=\fI<x>\fR
-Override transfer function. <x> can be one of the following transfer functions: default, 709, srgb, adobergb, smpte240m, smpte2084, dcip3, none
+Override transfer function. <x> can be one of the following transfer functions: default, 709, srgb, oprgb, smpte240m, smpte2084, dcip3, none
.TP
\fB\-Y\fR, \fB\-\-ycbcr-enc\fR=\fI<y>\fR
Override Y'CbCr encoding. <y> can be one of the following Y'CbCr encodings: default, 601, 709, xv601, xv709, bt2020, bt2020c, smpte240m
diff --git a/utils/qvidcap/qvidcap.cpp b/utils/qvidcap/qvidcap.cpp
index 04f05546..0f81a729 100644
--- a/utils/qvidcap/qvidcap.cpp
+++ b/utils/qvidcap/qvidcap.cpp
@@ -41,10 +41,10 @@ static void usage()
" -C, --colorspace=<c> override colorspace\n"
" <c> can be one of the following colorspaces:\n"
" smpte170m, smpte240m, rec709, 470m, 470bg, jpeg, srgb,\n"
- " adobergb, bt2020, dcip3\n"
+ " oprgb, bt2020, dcip3\n"
" -X, --xfer-func=<x> override transfer function\n"
" <x> can be one of the following transfer functions:\n"
- " default, 709, srgb, adobergb, smpte240m, smpte2084, dcip3, none\n"
+ " default, 709, srgb, oprgb, smpte240m, smpte2084, dcip3, none\n"
" -Y, --ycbcr-enc=<y> override Y'CbCr encoding\n"
" <y> can be one of the following Y'CbCr encodings:\n"
" default, 601, 709, xv601, xv709, bt2020, bt2020c, smpte240m\n"
@@ -158,7 +158,7 @@ static __u32 parse_colorspace(const QString &s)
if (s == "470bg") return V4L2_COLORSPACE_470_SYSTEM_BG;
if (s == "jpeg") return V4L2_COLORSPACE_JPEG;
if (s == "srgb") return V4L2_COLORSPACE_SRGB;
- if (s == "adobergb") return V4L2_COLORSPACE_ADOBERGB;
+ if (s == "oprgb") return V4L2_COLORSPACE_OPRGB;
if (s == "bt2020") return V4L2_COLORSPACE_BT2020;
if (s == "dcip3") return V4L2_COLORSPACE_DCI_P3;
return 0;
@@ -170,7 +170,7 @@ static __u32 parse_xfer_func(const QString &s)
if (s == "smpte240m") return V4L2_XFER_FUNC_SMPTE240M;
if (s == "rec709") return V4L2_XFER_FUNC_709;
if (s == "srgb") return V4L2_XFER_FUNC_SRGB;
- if (s == "adobergb") return V4L2_XFER_FUNC_ADOBERGB;
+ if (s == "oprgb") return V4L2_XFER_FUNC_OPRGB;
if (s == "dcip3") return V4L2_XFER_FUNC_DCI_P3;
if (s == "smpte2084") return V4L2_XFER_FUNC_SMPTE2084;
if (s == "none") return V4L2_XFER_FUNC_NONE;
diff --git a/utils/qvidcap/v4l2-convert.glsl b/utils/qvidcap/v4l2-convert.glsl
index 8346ccd2..6ca12d8d 100644
--- a/utils/qvidcap/v4l2-convert.glsl
+++ b/utils/qvidcap/v4l2-convert.glsl
@@ -71,7 +71,7 @@ const mat3 colconv = mat3(
1.0440, 0, 0,
-0.0440, 1, -0.0119,
0, 0, 1.0119
-#elif COLSP == V4L2_COLORSPACE_ADOBERGB
+#elif COLSP == V4L2_COLORSPACE_OPRGB
1.3982832, 0, 0,
-0.3982831, 1, -0.0429383,
0, 0, 1.0429383
@@ -334,7 +334,7 @@ void main()
rgb = vec3(XFER(rgb.r), XFER(rgb.g), XFER(rgb.b));
-#elif XFERFUNC == V4L2_XFER_FUNC_ADOBERGB
+#elif XFERFUNC == V4L2_XFER_FUNC_OPRGB
// Avoid powers of negative numbers
rgb = max(rgb, vec3(0.0));
@@ -374,7 +374,7 @@ void main()
// specified as linear RGB.
#if COLSP == V4L2_COLORSPACE_SMPTE170M || COLSP == V4L2_COLORSPACE_SMPTE240M || \
COLSP == V4L2_COLORSPACE_470_SYSTEM_M || COLSP == V4L2_COLORSPACE_470_SYSTEM_BG || \
- COLSP == V4L2_COLORSPACE_ADOBERGB || COLSP == V4L2_COLORSPACE_DCI_P3 || \
+ COLSP == V4L2_COLORSPACE_OPRGB || COLSP == V4L2_COLORSPACE_DCI_P3 || \
COLSP == V4L2_COLORSPACE_BT2020
rgb = colconv * rgb;
#endif
diff --git a/utils/v4l2-ctl/v4l2-ctl-edid.cpp b/utils/v4l2-ctl/v4l2-ctl-edid.cpp
index 88a91cf8..f41b76bd 100644
--- a/utils/v4l2-ctl/v4l2-ctl-edid.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-edid.cpp
@@ -107,8 +107,8 @@ static __u8 toggle_colorimetry_flags1;
#define COLORIMETRY_XVYCC601 (1 << 0)
#define COLORIMETRY_XVYCC709 (1 << 1)
#define COLORIMETRY_SYCC (1 << 2)
-#define COLORIMETRY_ADOBEYCC (1 << 3)
-#define COLORIMETRY_ADOBERGB (1 << 4)
+#define COLORIMETRY_OPYCC (1 << 3)
+#define COLORIMETRY_OPRGB (1 << 4)
#define COLORIMETRY_BT2020CYCC (1 << 5)
#define COLORIMETRY_BT2020YCC (1 << 6)
#define COLORIMETRY_BT2020RGB (1 << 7)
@@ -195,8 +195,8 @@ void edid_usage(void)
" xvycc-601: toggle the xvYCC 601 bit.\n"
" xvycc-709: toggle the xvYCC 709 bit.\n"
" sycc: toggle the sYCC 601 bit.\n"
- " adobe-ycc: toggle the Adobe YCC 601 bit.\n"
- " adobe-rgb: toggle the Adobe RGB bit.\n"
+ " opycc: toggle the opYCC 601 bit.\n"
+ " oprgb: toggle the opRGB bit.\n"
" bt2020-rgb: toggle the BT2020 RGB bit.\n"
" bt2020-ycc: toggle the BT2020 YCC bit.\n"
" bt2020-cycc: toggle the BT2020 cYCC bit.\n"
@@ -687,8 +687,8 @@ static void print_edid_mods(const struct v4l2_edid *e)
printf(" xvYCC 601: %s\n", (v1 & COLORIMETRY_XVYCC601) ? "yes" : "no");
printf(" xvYCC 709: %s\n", (v1 & COLORIMETRY_XVYCC709) ? "yes" : "no");
printf(" sYCC: %s\n", (v1 & COLORIMETRY_SYCC) ? "yes" : "no");
- printf(" AdobeRGB: %s\n", (v1 & COLORIMETRY_ADOBERGB) ? "yes" : "no");
- printf(" AdobeYCC: %s\n", (v1 & COLORIMETRY_ADOBEYCC) ? "yes" : "no");
+ printf(" opRGB: %s\n", (v1 & COLORIMETRY_OPRGB) ? "yes" : "no");
+ printf(" opYCC: %s\n", (v1 & COLORIMETRY_OPYCC) ? "yes" : "no");
printf(" BT.2020 RGB: %s\n", (v1 & COLORIMETRY_BT2020RGB) ? "yes" : "no");
printf(" BT.2020 YCC: %s\n", (v1 & COLORIMETRY_BT2020YCC) ? "yes" : "no");
printf(" BT.2020 cYCC: %s\n", (v1 & COLORIMETRY_BT2020CYCC) ? "yes" : "no");
@@ -948,8 +948,8 @@ void edid_cmd(int ch, char *optarg)
"xvycc-601",
"xvycc-709",
"sycc",
- "adobe-ycc",
- "adobe-rgb",
+ "opycc",
+ "oprgb",
"bt2020-rgb",
"bt2020-ycc",
"bt2020-cycc",
@@ -1077,8 +1077,8 @@ void edid_cmd(int ch, char *optarg)
case 24: toggle_colorimetry_flags1 |= COLORIMETRY_XVYCC601; break;
case 25: toggle_colorimetry_flags1 |= COLORIMETRY_XVYCC709; break;
case 26: toggle_colorimetry_flags1 |= COLORIMETRY_SYCC; break;
- case 27: toggle_colorimetry_flags1 |= COLORIMETRY_ADOBEYCC; break;
- case 28: toggle_colorimetry_flags1 |= COLORIMETRY_ADOBERGB; break;
+ case 27: toggle_colorimetry_flags1 |= COLORIMETRY_OPYCC; break;
+ case 28: toggle_colorimetry_flags1 |= COLORIMETRY_OPRGB; break;
case 29: toggle_colorimetry_flags1 |= COLORIMETRY_BT2020RGB; break;
case 30: toggle_colorimetry_flags1 |= COLORIMETRY_BT2020YCC; break;
case 31: toggle_colorimetry_flags1 |= COLORIMETRY_BT2020CYCC; break;
diff --git a/utils/v4l2-ctl/v4l2-ctl-subdev.cpp b/utils/v4l2-ctl/v4l2-ctl-subdev.cpp
index 3d39ccbb..17532d5e 100644
--- a/utils/v4l2-ctl/v4l2-ctl-subdev.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-subdev.cpp
@@ -80,9 +80,9 @@ void subdev_usage(void)
" alternate, interlaced_tb, interlaced_bt\n"
" <c> can be one of the following colorspaces:\n"
" smpte170m, smpte240m, rec709, 470m, 470bg, jpeg, srgb,\n"
- " adobergb, bt2020, dcip3\n"
+ " oprgb, bt2020, dcip3\n"
" <xf> can be one of the following transfer functions:\n"
- " default, 709, srgb, adobergb, smpte240m, smpte2084, dcip3, none\n"
+ " default, 709, srgb, oprgb, smpte240m, smpte2084, dcip3, none\n"
" <y> can be one of the following Y'CbCr encodings:\n"
" default, 601, 709, xv601, xv709, bt2020, bt2020c, smpte240m\n"
" <hsv> can be one of the following HSV encodings:\n"
diff --git a/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp b/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp
index 21a59f69..dc17a868 100644
--- a/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp
@@ -53,9 +53,9 @@ void vidcap_usage(void)
" alternate, interlaced_tb, interlaced_bt\n"
" <c> can be one of the following colorspaces:\n"
" smpte170m, smpte240m, rec709, 470m, 470bg, jpeg, srgb,\n"
- " adobergb, bt2020, dcip3\n"
+ " oprgb, bt2020, dcip3\n"
" <xf> can be one of the following transfer functions:\n"
- " default, 709, srgb, adobergb, smpte240m, smpte2084, dcip3, none\n"
+ " default, 709, srgb, oprgb, smpte240m, smpte2084, dcip3, none\n"
" <y> can be one of the following Y'CbCr encodings:\n"
" default, 601, 709, xv601, xv709, bt2020, bt2020c, smpte240m\n"
" <hsv> can be one of the following HSV encodings:\n"
diff --git a/utils/v4l2-ctl/v4l2-ctl-vidout.cpp b/utils/v4l2-ctl/v4l2-ctl-vidout.cpp
index 2827e00d..5823df9c 100644
--- a/utils/v4l2-ctl/v4l2-ctl-vidout.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-vidout.cpp
@@ -44,9 +44,9 @@ void vidout_usage(void)
" alternate, interlaced_tb, interlaced_bt\n"
" <c> can be one of the following colorspaces:\n"
" smpte170m, smpte240m, rec709, 470m, 470bg, jpeg, srgb,\n"
- " adobergb, bt2020, dcip3\n"
+ " oprgb, bt2020, dcip3\n"
" <xf> can be one of the following transfer functions:\n"
- " default, 709, srgb, adobergb, smpte240m, smpte2084, dcip3, none\n"
+ " default, 709, srgb, oprgb, smpte240m, smpte2084, dcip3, none\n"
" <y> can be one of the following Y'CbCr encodings:\n"
" default, 601, 709, xv601, xv709, bt2020, bt2020c, smpte240m\n"
" <hsv> can be one of the following HSV encodings:\n"
diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp
index 9ac23c43..de9383d6 100644
--- a/utils/v4l2-ctl/v4l2-ctl.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl.cpp
@@ -672,7 +672,7 @@ __u32 parse_colorspace(const char *s)
if (!strcmp(s, "470bg")) return V4L2_COLORSPACE_470_SYSTEM_BG;
if (!strcmp(s, "jpeg")) return V4L2_COLORSPACE_JPEG;
if (!strcmp(s, "srgb")) return V4L2_COLORSPACE_SRGB;
- if (!strcmp(s, "adobergb")) return V4L2_COLORSPACE_ADOBERGB;
+ if (!strcmp(s, "oprgb")) return V4L2_COLORSPACE_OPRGB;
if (!strcmp(s, "bt2020")) return V4L2_COLORSPACE_BT2020;
if (!strcmp(s, "dcip3")) return V4L2_COLORSPACE_DCI_P3;
return 0;
@@ -684,7 +684,7 @@ __u32 parse_xfer_func(const char *s)
if (!strcmp(s, "smpte240m")) return V4L2_XFER_FUNC_SMPTE240M;
if (!strcmp(s, "rec709")) return V4L2_XFER_FUNC_709;
if (!strcmp(s, "srgb")) return V4L2_XFER_FUNC_SRGB;
- if (!strcmp(s, "adobergb")) return V4L2_XFER_FUNC_ADOBERGB;
+ if (!strcmp(s, "oprgb")) return V4L2_XFER_FUNC_OPRGB;
if (!strcmp(s, "dcip3")) return V4L2_XFER_FUNC_DCI_P3;
if (!strcmp(s, "smpte2084")) return V4L2_XFER_FUNC_SMPTE2084;
if (!strcmp(s, "none")) return V4L2_XFER_FUNC_NONE;

Privacy Policy