Since all three occurrences of OUI parsing are the same in parse-cta-block.cpp, we can move them to a separate function in edid-decode.cpp (because we may want to use the function for non-CTA parsing as well).
data_block_oui contains identical code except for the following:
1) The warning for unknown OUI name is output after the block name instead of after the block contents.
Other changes that don't affect output:
- oui is set to 0 if the OUI is unknown so that it can't lead to executing any known OUI code by the caller.
- A macro is used to call data_block_oui. It updates x and length appropriately for the caller.
Signed-off-by: Joe van Tunen <joevt@xxxxxxx>
---
edid-decode.cpp | 34 +++++++++++++++++
edid-decode.h | 2 +
parse-cta-block.cpp | 91 +++++----------------------------------------
3 files changed, 46 insertions(+), 81 deletions(-)
diff --git a/edid-decode.cpp b/edid-decode.cpp
index d77646d..ec903f9 100644
--- a/edid-decode.cpp
+++ b/edid-decode.cpp
@@ -679,6 +679,40 @@ const char *oui_name(unsigned oui, bool reverse)
}
}
+void edid_state::data_block_oui(const char *block_name, const unsigned char *x, unsigned length, unsigned *ouinum)
+{
+ const char *name;
+ unsigned oui = 0;
+ bool reverse = false;
+
+ if (length < 3) {
+ data_block = std::string(block_name);
+ fail("Invalid length %u < 3.\n", length);
+ }
+ else {
+ oui = (x[2] << 16) + (x[1] << 8) + x[0];
+ x += 3; length -=3;
+ name = oui_name(oui);
+ if (!name) {
+ name = oui_name(oui, true);
+ if (name)
+ reverse = true;
+ }
+ if (!name) {
+ printf(" %s, OUI %s:\n", block_name, ouitohex(oui).c_str());
+ data_block.clear();
+ warn("Unknown %s, OUI %s.\n", block_name, ouitohex(oui).c_str());
+ }
+ else {
+ data_block = std::string(block_name) + " (" + name + ")";
+ if (reverse)
+ fail((std::string("OUI ") + ouitohex(oui) + " is in the wrong byte order\n").c_str());
+ printf(" %s, OUI %s:\n", data_block.c_str(), ouitohex(oui).c_str());
+ }
+ }
+ if (ouinum) *ouinum = oui;
+}
+
std::string ouitohex(unsigned oui)
{
char buf[32];
diff --git a/edid-decode.h b/edid-decode.h
index a41ee6b..ca130c5 100644
--- a/edid-decode.h
+++ b/edid-decode.h
@@ -331,6 +331,8 @@ struct edid_state {
void list_dmts();
void list_established_timings();
+ void data_block_oui(const char *block_name, const unsigned char *x, unsigned length, unsigned *ouinum);
+
void print_vic_index(const char *prefix, unsigned idx, const char *suffix, bool ycbcr420 = false);
void hdmi_latency(unsigned char vid_lat, unsigned char aud_lat, bool is_ilaced);
void cta_vcdb(const unsigned char *x, unsigned length);
diff --git a/parse-cta-block.cpp b/parse-cta-block.cpp
index 2c83a35..cd7650d 100644
--- a/parse-cta-block.cpp
+++ b/parse-cta-block.cpp
@@ -1991,13 +1991,17 @@ static void cta_hdmi_audio_block(const unsigned char *x, unsigned length)
}
}
+#define data_block_o(n) \
+ do { \
+ data_block_oui(n, x, length, &oui); \
+ x += (length < 3) ? length : 3; \
+ length -= (length < 3) ? length : 3; \
+ } while(0)
+
void edid_state::cta_ext_block(unsigned tag, const unsigned char *x, unsigned length,
bool duplicate)
{
- const char *block_name;
- const char *name;
unsigned oui;
- bool reverse = false;
bool audio_block = false;
switch (tag) {
@@ -2068,31 +2072,7 @@ void edid_state::cta_ext_block(unsigned tag, const unsigned char *x, unsigned le
switch (tag) {
case 0x700: cta_vcdb(x, length); break;
case 0x701:
- block_name = "Vendor-Specific Video Data Block";
- if (length < 3) {
- data_block = std::string(block_name);
- fail("Invalid length %u < 3.\n", length);
- break;
- }
- oui = (x[2] << 16) + (x[1] << 8) + x[0];
- x += 3; length -=3;
- name = oui_name(oui);
- if (!name) {
- name = oui_name(oui, true);
- if (name)
- reverse = true;
- }
- if (!name) {
- printf(" %s, OUI %s:\n", block_name, ouitohex(oui).c_str());
- hex_block(" ", x, length);
- data_block.clear();
- warn("Unknown %s, OUI %s.\n", block_name, ouitohex(oui).c_str());
- break;
- }
- data_block = std::string(block_name) + " (" + name + ")";
- if (reverse)
- fail((std::string("OUI ") + ouitohex(oui) + " is in the wrong byte order\n").c_str());
- printf(" %s, OUI %s:\n", data_block.c_str(), ouitohex(oui).c_str());
+ data_block_o("Vendor-Specific Video Data Block");
if (oui == 0x90848b)
cta_hdr10plus(x, length);
else if (oui == 0x00d046)
@@ -2108,31 +2088,7 @@ void edid_state::cta_ext_block(unsigned tag, const unsigned char *x, unsigned le
case 0x70e: cta_svd(x, length, true); break;
case 0x70f: cta_y420cmdb(x, length); break;
case 0x711:
- block_name = "Vendor-Specific Audio Data Block";
- if (length < 3) {
- data_block = std::string(block_name);
- fail("Invalid length %u < 3.\n", length);
- break;
- }
- oui = (x[2] << 16) + (x[1] << 8) + x[0];
- x += 3; length -=3;
- name = oui_name(oui);
- if (!name) {
- name = oui_name(oui, true);
- if (name)
- reverse = true;
- }
- if (!name) {
- printf(" %s, OUI %s:\n", block_name, ouitohex(oui).c_str());
- hex_block(" ", x, length);
- data_block.clear();
- warn("Unknown %s, OUI %s.\n", block_name, ouitohex(oui).c_str());
- break;
- }
- data_block = std::string(block_name) + " (" + name + ")";
- if (reverse)
- fail((std::string("OUI ") + ouitohex(oui) + " is in the wrong byte order\n").c_str());
- printf(" %s, OUI %s:\n", data_block.c_str(), ouitohex(oui).c_str());
+ data_block_o("Vendor-Specific Audio Data Block");
if (oui == 0x00d046)
cta_dolby_audio(x, length);
else
@@ -2185,10 +2141,7 @@ void edid_state::cta_block(const unsigned char *x, bool duplicate)
x++;
}
- const char *block_name;
- const char *name;
unsigned oui;
- bool reverse = false;
bool audio_block = false;
switch (tag) {
@@ -2204,31 +2157,7 @@ void edid_state::cta_block(const unsigned char *x, bool duplicate)
cta_svd(x, length, false);
break;
case 0x03:
- block_name = "Vendor-Specific Data Block";
- if (length < 3) {
- data_block = std::string(block_name);
- fail("Invalid length %u < 3.\n", length);
- break;
- }
- oui = (x[2] << 16) + (x[1] << 8) + x[0];
- x += 3; length -=3;
- name = oui_name(oui);
- if (!name) {
- name = oui_name(oui, true);
- if (name)
- reverse = true;
- }
- if (!name) {
- printf(" %s, OUI %s:\n", block_name, ouitohex(oui).c_str());
- hex_block(" ", x, length);
- data_block.clear();
- warn("Unknown %s, OUI %s.\n", block_name, ouitohex(oui).c_str());
- break;
- }
- data_block = std::string(block_name) + " (" + name + ")";
- if (reverse)
- fail((std::string("OUI ") + ouitohex(oui) + " is in the wrong byte order\n").c_str());
- printf(" %s, OUI %s:\n", data_block.c_str(), ouitohex(oui).c_str());
+ data_block_o("Vendor-Specific Data Block");
if (oui == 0x000c03) {
cta_hdmi_block(x, length);
cta.last_block_was_hdmi_vsdb = 1;
--
2.24.3 (Apple Git-128)
