Also, make cta_block like cta_ext_block
First, fix the first switch statement in cta_ext_block. The first switch statement sets or clears data_block (the name of the block which is used in the Warnings and Failures section of the output).
Remove hex_block because it will be done by the third switch statement that handles outputting the contents of each block.
The "Unknown Extended CTA-861 Data Block 0x%02x.\n" warning now appears after the block name instead of after the block contents (because it's not the contents that caused the error).
Then, in cta_block:
1) Create a first switch statement like that of cta_ext_block (described above).
The "Unknown CTA-861 Data Block %u.\n" warning now appears after the block name instead of after the block contents (because it's not the contents that caused the error).
2) Create a second switch statement like that of cta_ext_block. It handles checking for duplicate blocks.
3) After checking for duplicates, check cta_byte3 / audio_block discrepancy, exactly like cta_ext_block does. These lines come from after the original switch statement of cta_block.
4) The original switch statement of cta_block has lines that are moved to the new first and second switch statements.
Signed-off-by: Joe van Tunen <joevt@xxxxxxx>
---
parse-cta-block.cpp | 82 +++++++++++++++++++++------------------------
1 file changed, 38 insertions(+), 44 deletions(-)
diff --git a/parse-cta-block.cpp b/parse-cta-block.cpp
index cd7650d..be76903 100644
--- a/parse-cta-block.cpp
+++ b/parse-cta-block.cpp
@@ -2032,6 +2032,7 @@ void edid_state::cta_ext_block(unsigned tag, const unsigned char *x, unsigned le
case 0x778: data_block = "HDMI Forum EDID Extension Override Data Block"; break;
case 0x779: data_block = "HDMI Forum Sink Capability Data Block"; break;
default:
+ data_block.clear();
if (tag < 0x70d)
printf(" Unknown CTA-861 Video-Related");
else if (tag < 0x720)
@@ -2041,10 +2042,7 @@ void edid_state::cta_ext_block(unsigned tag, const unsigned char *x, unsigned le
else
printf(" Unknown CTA-861");
printf(" Data Block (extended tag 0x%02x)\n", tag & 0xff);
- hex_block(" ", x, length);
- data_block.clear();
warn("Unknown Extended CTA-861 Data Block 0x%02x.\n", tag & 0xff);
- return;
}
if (data_block.length())
@@ -2125,7 +2123,6 @@ void edid_state::cta_ext_block(unsigned tag, const unsigned char *x, unsigned le
default:
hex_block(" ", x, length);
}
-
}
void edid_state::cta_block(const unsigned char *x, bool duplicate)
@@ -2145,17 +2142,37 @@ void edid_state::cta_block(const unsigned char *x, bool duplicate)
bool audio_block = false;
switch (tag) {
- case 0x01:
- data_block = "Audio Data Block";
- printf(" %s:\n", data_block.c_str());
- cta_audio_block(x, length);
- audio_block = true;
- break;
- case 0x02:
- data_block = "Video Data Block";
+ case 0x01: data_block = "Audio Data Block"; audio_block = true; break;
+ case 0x02: data_block = "Video Data Block"; break;
+ case 0x03: data_block.clear(); break;
+ case 0x04: data_block = "Speaker Allocation Data Block"; audio_block = true; break;
+ case 0x05: data_block = "VESA Display Transfer Characteristics Data Block"; break;
+
+ case 0x07: data_block.clear(); break;
+ default:
+ data_block.clear();
+ if (extended) break;
+ printf(" Unknown CTA-861 tag 0x%02x\n", tag);
+ warn("Unknown CTA-861 Data Block %u.\n", tag);
+ }
+
+ if (data_block.length())
printf(" %s:\n", data_block.c_str());
- cta_svd(x, length, false);
- break;
+
+ switch (tag) {
+ case 0x04:
+ case 0x05:
+ if (duplicate)
+ fail("Only one instance of this Data Block is allowed.\n");
+ }
+
+ // See Table 52 of CTA-861-G for a description of Byte 3
+ if (audio_block && !(cta.byte3 & 0x40))
+ fail("Audio information is present, but bit 6 of Byte 3 of the CTA-861 Extension header indicates no Basic Audio support.\n");
+
+ switch (tag) {
+ case 0x01: cta_audio_block(x, length); break;
+ case 0x02: cta_svd(x, length, false); break;
case 0x03:
data_block_o("Vendor-Specific Data Block");
if (oui == 0x000c03) {
@@ -2189,42 +2206,19 @@ void edid_state::cta_block(const unsigned char *x, bool duplicate)
}
hex_block(" ", x, length);
break;
- case 0x04:
- data_block = "Speaker Allocation Data Block";
- printf(" %s:\n", data_block.c_str());
- if (duplicate)
- fail("Only one instance of this Data Block is allowed.\n");
- cta_sadb(x, length);
- audio_block = true;
- break;
- case 0x05:
- data_block = "VESA Display Transfer Characteristics Data Block";
- printf(" %s:\n", data_block.c_str());
- if (duplicate)
- fail("Only one instance of this Data Block is allowed.\n");
- cta_vesa_dtcdb(x, length);
- break;
+ case 0x04: cta_sadb(x, length); break;
+ case 0x05: cta_vesa_dtcdb(x, length); break;
case 0x07:
- data_block = "Unknown CTA-861 Data Block (extended tag truncated)";
- printf(" %s:\n", data_block.c_str());
+ printf(" Unknown CTA-861 Data Block (extended tag truncated):\n");
fail("Extended tag cannot have zero length.\n");
break;
- default: {
- if (extended) {
+ default:
+ if (extended)
cta_ext_block(tag, x, length, duplicate);
- break;
- }
- printf(" Unknown CTA-861 tag 0x%02x\n", tag);
- hex_block(" ", x, length);
- data_block.clear();
- warn("Unknown CTA-861 Data Block %u.\n", tag);
- break;
- }
+ else
+ hex_block(" ", x, length);
}
- // See Table 52 of CTA-861-G for a description of Byte 3
- if (audio_block && !(cta.byte3 & 0x40))
- fail("Audio information is present, but bit 6 of Byte 3 of the CTA-861 Extension header indicates no Basic Audio support.\n");
cta.first_block = 0;
cta.last_block_was_hdmi_vsdb = 0;
}
--
2.24.3 (Apple Git-128)
