This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: edid-decode: sync with CTA-861-J standard Author: Hans Verkuil <[email protected]> Date: Wed Oct 22 08:59:52 2025 +0200 A new CTA-861-J standard was released. Update edid-decode accordingly: - Added one check for empty Audio Data Block - Updated speaker allocation checks Signed-off-by: Hans Verkuil <[email protected]> utils/edid-decode/edid-decode.1.in | 4 +--- utils/edid-decode/parse-cta-block.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 7 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=b4d32a5ed98b60d69b97d779cf691e8cc27fb3f5 diff --git a/utils/edid-decode/edid-decode.1.in b/utils/edid-decode/edid-decode.1.in index 9700a5075cca..869ef53f72d6 100644 --- a/utils/edid-decode/edid-decode.1.in +++ b/utils/edid-decode/edid-decode.1.in @@ -137,9 +137,7 @@ HDCP 1.4: High-bandwidth Digital Content Protection System, Revision 1.4 .TP HDCP 2.3: High-bandwidth Digital Content Protection System, Mapping HDCP to HDMI, Revision 2.3 .TP -CTA-861-I: A DTV Profile for Uncompressed High Speed Digital Interfaces -.TP -CTA-861.7: Improvements to CTA-861-I +CTA-861-J: A DTV Profile for Uncompressed High Speed Digital Interfaces .TP SPWG Notebook Panel Specification, Version 3.5 .TP diff --git a/utils/edid-decode/parse-cta-block.cpp b/utils/edid-decode/parse-cta-block.cpp index 4a658f17746b..46040ea3fe3c 100644 --- a/utils/edid-decode/parse-cta-block.cpp +++ b/utils/edid-decode/parse-cta-block.cpp @@ -472,6 +472,8 @@ void edid_state::cta_audio_block(const unsigned char *x, unsigned length) fail("Broken CTA-861 audio block length %d.\n", length); return; } + if (!length) + fail("This Data Block is empty.\n"); for (i = 0; i < length; i += 3) { format = (x[i] & 0x78) >> 3; @@ -1846,7 +1848,7 @@ const char *cta_speaker_map[] = { void edid_state::cta_sadb(const unsigned char *x, unsigned length) { - unsigned sad_deprecated = 0x7f000; + unsigned sad_valid = 0x3f; unsigned sad; unsigned i; @@ -1858,13 +1860,13 @@ void edid_state::cta_sadb(const unsigned char *x, unsigned length) sad = ((x[2] << 16) | (x[1] << 8) | x[0]); for (i = 0; cta_speaker_map[i]; i++) { - bool deprecated = sad_deprecated & (1 << i); + bool valid = sad_valid & (1 << i); if ((sad >> i) & 1) printf(" %s%s\n", cta_speaker_map[i], - deprecated ? " (Deprecated, use the RCDB)" : ""); + valid ? "" : " (Deprecated, use the RCDB)"); } - if (sad & 0xff040) + if (sad & ~sad_valid) warn("Specifies deprecated speakers.\n"); } _______________________________________________ linuxtv-commits mailing list -- [email protected] To unsubscribe send an email to [email protected]
