aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--edid-decode.12
-rw-r--r--parse-base-block.cpp2
-rw-r--r--parse-cta-block.cpp26
-rw-r--r--parse-displayid-block.cpp4
-rw-r--r--test/README2
5 files changed, 18 insertions, 18 deletions
diff --git a/edid-decode.1 b/edid-decode.1
index 2a79244..9de52a0 100644
--- a/edid-decode.1
+++ b/edid-decode.1
@@ -179,7 +179,7 @@ Report the preferred timings at the end.
.TP
\fB\-P\fR, \fB\-\-physical\-address\fR
Just report the HDMI Source Physical Address and nothing else. Reports f.f.f.f
-if the EDID could not be parsed, or if there was no CTA Vendor-Specific Data Block
+if the EDID could not be parsed, or if there was no CTA-861 Vendor-Specific Data Block
with OUI 00-0C-03. Otherwise it reports the Source Physical Address as provided
in that Data Block. This can be used as input to HDMI CEC utilities such as the
linux cec-ctl(1) utility.
diff --git a/parse-base-block.cpp b/parse-base-block.cpp
index a9d4f7c..45ec061 100644
--- a/parse-base-block.cpp
+++ b/parse-base-block.cpp
@@ -1212,7 +1212,7 @@ void edid_state::detailed_timings(const char *prefix, const unsigned char *x,
unsigned hbl, vbl;
std::string s_sync, s_flags;
- // Only count DTDs in base block 0 or CTA extension blocks
+ // Only count DTDs in base block 0 or CTA-861 extension blocks
if (base_or_cta)
base.dtd_cnt++;
data_block = "Detailed Timing Descriptor #" + std::to_string(base.dtd_cnt);
diff --git a/parse-cta-block.cpp b/parse-cta-block.cpp
index 68444a2..0116333 100644
--- a/parse-cta-block.cpp
+++ b/parse-cta-block.cpp
@@ -274,7 +274,7 @@ static void cta_audio_block(const unsigned char *x, unsigned length)
unsigned i, format, ext_format = 0;
if (length % 3) {
- fail("Broken CTA audio block length %d\n", length);
+ fail("Broken CTA-861 audio block length %d\n", length);
return;
}
@@ -1636,7 +1636,7 @@ void edid_state::cta_ext_block(const unsigned char *x, unsigned length)
case 0x0d: data_block = "Video Format Preference Data Block"; break;
case 0x0e: data_block = "YCbCr 4:2:0 Video Data Block"; break;
case 0x0f: data_block = "YCbCr 4:2:0 Capability Map Data Block"; break;
- case 0x10: data_block = "Reserved for CTA Miscellaneous Audio Fields"; break;
+ case 0x10: data_block = "Reserved for CTA-861 Miscellaneous Audio Fields"; break;
case 0x11: data_block = "Vendor-Specific Audio Data Block"; break;
case 0x12: data_block = "HDMI Audio Data Block"; break;
case 0x13: data_block = "Room Configuration Data Block"; break;
@@ -1648,17 +1648,17 @@ void edid_state::cta_ext_block(const unsigned char *x, unsigned length)
case 0x79: data_block = "HDMI Forum Sink Capability Data Block"; break;
default:
if (x[0] <= 12)
- printf(" Unknown CTA Video-Related");
+ printf(" Unknown CTA-861 Video-Related");
else if (x[0] <= 31)
- printf(" Unknown CTA Audio-Related");
+ printf(" Unknown CTA-861 Audio-Related");
else if (x[0] >= 120 && x[0] <= 127)
- printf(" Unknown CTA HDMI-Related");
+ printf(" Unknown CTA-861 HDMI-Related");
else
- printf(" Unknown CTA");
+ printf(" Unknown CTA-861");
printf(" Data Block (extended tag 0x%02x, length %u)\n", x[0], length);
hex_block(" ", x + 1, length);
data_block.clear();
- warn("Unknown Extended CTA Data Block 0x%02x.\n", x[0]);
+ warn("Unknown Extended CTA-861 Data Block 0x%02x.\n", x[0]);
return;
}
@@ -1741,7 +1741,7 @@ void edid_state::cta_ext_block(const unsigned char *x, unsigned length)
case 0x20: cta_ifdb(x + 1, length); return;
case 0x78:
cta_hf_eeodb(x + 1, length);
- // This must be the first CTA block
+ // This must be the first CTA-861 block
if (!cta.first_block)
fail("Block starts at a wrong offset.\n");
return;
@@ -1839,10 +1839,10 @@ void edid_state::cta_block(const unsigned char *x)
unsigned tag = (*x & 0xe0) >> 5;
unsigned length = *x & 0x1f;
- printf(" Unknown CTA tag 0x%02x, length %u\n", tag, length);
+ printf(" Unknown CTA-861 tag 0x%02x, length %u\n", tag, length);
hex_block(" ", x + 1, length);
data_block.clear();
- warn("Unknown CTA Data Block %u.\n", tag);
+ warn("Unknown CTA-861 Data Block %u.\n", tag);
break;
}
}
@@ -1909,9 +1909,9 @@ void edid_state::parse_cta_block(const unsigned char *x)
printf(" Revision: %u\n", version);
if (version == 0)
- fail("Invalid CTA Extension revision 0\n");
+ fail("Invalid CTA-861 Extension revision 0\n");
if (version > 3)
- warn("Unknown CTA Extension revision %u\n", version);
+ warn("Unknown CTA-861 Extension revision %u\n", version);
if (version >= 1) do {
if (version == 1 && x[3] != 0)
@@ -1944,7 +1944,7 @@ void edid_state::parse_cta_block(const unsigned char *x)
if (cta.first_block)
cta.byte3 = x[3];
else if (x[3] != cta.byte3)
- fail("Byte 3 must be the same for all CTA Extension Blocks.\n");
+ fail("Byte 3 must be the same for all CTA-861 Extension Blocks.\n");
if (cta.first_block) {
unsigned native_dtds = x[3] & 0x0f;
diff --git a/parse-displayid-block.cpp b/parse-displayid-block.cpp
index 5301406..7e05d6d 100644
--- a/parse-displayid-block.cpp
+++ b/parse-displayid-block.cpp
@@ -1468,7 +1468,7 @@ void edid_state::parse_displayid_block(const unsigned char *x)
case 0x05: data_block = "Video Timing Modes Type 3 - Short Timings Data Block"; break;
case 0x06: data_block = "Video Timing Modes Type 4 - DMT Timings Data Block"; break;
case 0x07: data_block = "Supported Timing Modes Type 1 - VESA DMT Timings Data Block"; break;
- case 0x08: data_block = "Supported Timing Modes Type 2 - CTA Timings Data Block"; break;
+ case 0x08: data_block = "Supported Timing Modes Type 2 - CTA-861 Timings Data Block"; break;
case 0x09: data_block = "Video Timing Range Data Block"; break;
case 0x0a: data_block = "Product Serial Number Data Block"; break;
case 0x0b: data_block = "GP ASCII String Data Block"; break;
@@ -1517,7 +1517,7 @@ void edid_state::parse_displayid_block(const unsigned char *x)
}
break;
// 0x80 RESERVED
- case 0x81: data_block = "CTA DisplayID Data Block (" + utohex(tag) + ")"; break;
+ case 0x81: data_block = "CTA-861 DisplayID Data Block (" + utohex(tag) + ")"; break;
// 0x82 .. 0xff RESERVED
default: data_block = "Unknown DisplayID Data Block (" + utohex(tag) + ")"; break;
}
diff --git a/test/README b/test/README
index 806d0c7..abfa482 100644
--- a/test/README
+++ b/test/README
@@ -13,7 +13,7 @@ xrandr.test: an EDID as reported by 'xrandr --props'.
Two hand-crafted EDIDs to test rarely seen EDID extensions or data blocks:
cta-vesa.test: has VESA Display Transfer Characteristics Data Block and
- VESA Video Display Device Data Block in the CTA block.
+ VESA Video Display Device Data Block in the CTA-861 block.
ls-ext.test: has a Localized String Extension Block.

Privacy Policy