From: joevt <joevt@shaw.ca>
To: Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-media@vger.kernel.org
Subject: [PATCH 19/28] edid-decode: remove offset from displayid_block
Date: Fri, 24 Sep 2021 16:31:40 -0700 [thread overview]
Message-ID: <20210924233149.10028-20-joevt@shaw.ca> (raw)
In-Reply-To: <20210924233149.10028-1-joevt@shaw.ca>
Change the function so that x points to the start of the DisplayID block.
Signed-off-by: Joe van Tunen <joevt@shaw.ca>
---
edid-decode.h | 2 +-
parse-displayid-block.cpp | 134 +++++++++++++++++++-------------------
2 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/edid-decode.h b/edid-decode.h
index b450abd..d220e05 100644
--- a/edid-decode.h
+++ b/edid-decode.h
@@ -394,7 +394,7 @@ struct edid_state {
void parse_displayid_type_10_timing(const unsigned char *x, unsigned sz,
bool is_cta = false);
void preparse_displayid_block(const unsigned char *x);
- unsigned displayid_block(const unsigned version, const unsigned char *x, unsigned offset, unsigned length);
+ unsigned displayid_block(const unsigned version, const unsigned char *x, unsigned length);
void parse_displayid_block(const unsigned char *x);
void parse_displayid_vesa(const unsigned char *x);
void parse_displayid_cta_data_block(const unsigned char *x);
diff --git a/parse-displayid-block.cpp b/parse-displayid-block.cpp
index c0ad872..3be96f4 100644
--- a/parse-displayid-block.cpp
+++ b/parse-displayid-block.cpp
@@ -1609,10 +1609,10 @@ void edid_state::preparse_displayid_block(const unsigned char *x)
}
}
-unsigned edid_state::displayid_block(const unsigned version, const unsigned char *x, unsigned offset, unsigned length)
+unsigned edid_state::displayid_block(const unsigned version, const unsigned char *x, unsigned length)
{
unsigned i;
- unsigned tag = x[offset];
+ unsigned tag = x[0];
unsigned oui = 0;
switch (tag) {
@@ -1655,7 +1655,7 @@ unsigned edid_state::displayid_block(const unsigned version, const unsigned char
case 0x7f: // DisplayID 1.3
if ((tag == 0x7e && version >= 0x20) ||
(tag == 0x7f && version < 0x20)) {
- oui = (x[offset + 3] << 16) + (x[offset + 4] << 8) + x[offset + 5];
+ oui = (x[3] << 16) + (x[4] << 8) + x[5];
const char *name = oui_name(oui);
bool reversed = false;
@@ -1689,14 +1689,14 @@ unsigned edid_state::displayid_block(const unsigned version, const unsigned char
if (length < 3) {
// report a problem when the remaining bytes are not 0.
- if (tag || x[offset + 1]) {
+ if (tag || x[1]) {
fail("Not enough bytes remain (%d) for a DisplayID data block or the DisplayID filler is non-0.\n", length);
}
return 0xff;
}
- unsigned block_rev = x[offset + 1] & 0x07;
- unsigned len = x[offset + 2];
+ unsigned block_rev = x[1] & 0x07;
+ unsigned len = x[2];
if (length < len + 3) {
fail("The length of this DisplayID data block (%d) exceeds the number of bytes remaining (%d).\n", len + 3, length);
@@ -1705,7 +1705,7 @@ unsigned edid_state::displayid_block(const unsigned version, const unsigned char
if (!tag && !len) {
// A Product Identification Data Block with no payload bytes is not valid - assume this is the end.
- if (!memchk(x + offset, length)) {
+ if (!memchk(x, length)) {
fail("Non-0 filler bytes in the DisplayID block.\n");
}
return 0xff;
@@ -1714,132 +1714,132 @@ unsigned edid_state::displayid_block(const unsigned version, const unsigned char
printf(" %s:\n", data_block.c_str());
switch (tag) {
- case 0x00: parse_displayid_product_id(x + offset); break;
- case 0x01: parse_displayid_parameters(x + offset); break;
- case 0x02: parse_displayid_color_characteristics(x + offset); break;
+ case 0x00: parse_displayid_product_id(x); break;
+ case 0x01: parse_displayid_parameters(x); break;
+ case 0x02: parse_displayid_color_characteristics(x); break;
case 0x03:
- check_displayid_datablock_revision(x[offset + 1], 0, block_rev & 1);
+ check_displayid_datablock_revision(x[1], 0, block_rev & 1);
for (i = 0; i < len / 20; i++)
- parse_displayid_type_1_7_timing(&x[offset + 3 + (i * 20)], false, block_rev);
+ parse_displayid_type_1_7_timing(&x[3 + (i * 20)], false, block_rev);
break;
case 0x04:
- check_displayid_datablock_revision(x[offset + 1]);
+ check_displayid_datablock_revision(x[1]);
for (i = 0; i < len / 11; i++)
- parse_displayid_type_2_timing(&x[offset + 3 + (i * 11)]);
+ parse_displayid_type_2_timing(&x[3 + (i * 11)]);
break;
case 0x05:
- check_displayid_datablock_revision(x[offset + 1], 0, block_rev & 1);
+ check_displayid_datablock_revision(x[1], 0, block_rev & 1);
for (i = 0; i < len / 3; i++)
- parse_displayid_type_3_timing(&x[offset + 3 + (i * 3)]);
+ parse_displayid_type_3_timing(&x[3 + (i * 3)]);
break;
case 0x06:
- check_displayid_datablock_revision(x[offset + 1], 0xc0, 1);
+ check_displayid_datablock_revision(x[1], 0xc0, 1);
for (i = 0; i < len; i++)
- parse_displayid_type_4_8_timing((x[offset + 1] & 0xc0) >> 6, x[offset + 3 + i]);
+ parse_displayid_type_4_8_timing((x[1] & 0xc0) >> 6, x[3 + i]);
break;
case 0x07:
- check_displayid_datablock_revision(x[offset + 1]);
+ check_displayid_datablock_revision(x[1]);
for (i = 0; i < min(len, 10) * 8; i++)
- if (x[offset + 3 + i / 8] & (1 << (i % 8))) {
+ if (x[3 + i / 8] & (1 << (i % 8))) {
char type[16];
sprintf(type, "DMT 0x%02x", i + 1);
print_timings(" ", find_dmt_id(i + 1), type);
}
break;
case 0x08:
- check_displayid_datablock_revision(x[offset + 1]);
+ check_displayid_datablock_revision(x[1]);
for (i = 0; i < min(len, 8) * 8; i++)
- if (x[offset + 3 + i / 8] & (1 << (i % 8))) {
+ if (x[3 + i / 8] & (1 << (i % 8))) {
char type[16];
sprintf(type, "VIC %3u", i + 1);
print_timings(" ", find_vic_id(i + 1), type);
}
break;
- case 0x09: parse_displayid_video_timing_range_limits(x + offset); break;
+ case 0x09: parse_displayid_video_timing_range_limits(x); break;
case 0x0a:
- case 0x0b: parse_displayid_string(x + offset); break;
- case 0x0c: parse_displayid_display_device(x + offset); break;
- case 0x0d: parse_displayid_intf_power_sequencing(x + offset); break;
- case 0x0e: parse_displayid_transfer_characteristics(x + offset); break;
- case 0x0f: parse_displayid_display_intf(x + offset); break;
- case 0x10: parse_displayid_stereo_display_intf(x + offset); break;
+ case 0x0b: parse_displayid_string(x); break;
+ case 0x0c: parse_displayid_display_device(x); break;
+ case 0x0d: parse_displayid_intf_power_sequencing(x); break;
+ case 0x0e: parse_displayid_transfer_characteristics(x); break;
+ case 0x0f: parse_displayid_display_intf(x); break;
+ case 0x10: parse_displayid_stereo_display_intf(x); break;
case 0x11:
- check_displayid_datablock_revision(x[offset + 1]);
+ check_displayid_datablock_revision(x[1]);
for (i = 0; i < len / 7; i++)
- parse_displayid_type_5_timing(&x[offset + 3 + (i * 7)]);
+ parse_displayid_type_5_timing(&x[3 + (i * 7)]);
break;
- case 0x12: parse_displayid_tiled_display_topology(x + offset, false); break;
+ case 0x12: parse_displayid_tiled_display_topology(x, false); break;
case 0x13:
- check_displayid_datablock_revision(x[offset + 1]);
- for (i = 0; i < len; i += (x[offset + 3 + i + 2] & 0x40) ? 17 : 14)
- parse_displayid_type_6_timing(&x[offset + 3 + i]);
+ check_displayid_datablock_revision(x[1]);
+ for (i = 0; i < len; i += (x[3 + i + 2] & 0x40) ? 17 : 14)
+ parse_displayid_type_6_timing(&x[3 + i]);
break;
- case 0x20: parse_displayid_product_id(x + offset); break;
+ case 0x20: parse_displayid_product_id(x); break;
case 0x21:
if (block_rev >= 1)
- check_displayid_datablock_revision(x[offset + 1], 0x80, 1);
+ check_displayid_datablock_revision(x[1], 0x80, 1);
else
- check_displayid_datablock_revision(x[offset + 1], 0x80, 0);
- parse_displayid_parameters_v2(x + offset, block_rev);
+ check_displayid_datablock_revision(x[1], 0x80, 0);
+ parse_displayid_parameters_v2(x, block_rev);
break;
case 0x22: {
unsigned sz = 20;
if (block_rev >= 2)
- check_displayid_datablock_revision(x[offset + 1], 0x08, 2);
+ check_displayid_datablock_revision(x[1], 0x08, 2);
else if (block_rev == 1)
- check_displayid_datablock_revision(x[offset + 1], 0x08, 1);
+ check_displayid_datablock_revision(x[1], 0x08, 1);
else
- check_displayid_datablock_revision(x[offset + 1]);
- sz += (x[offset + 1] & 0x70) >> 4;
- if (block_rev >= 1 && (x[offset + 1] & 0x08))
+ check_displayid_datablock_revision(x[1]);
+ sz += (x[1] & 0x70) >> 4;
+ if (block_rev >= 1 && (x[1] & 0x08))
printf(" These timings support DSC pass-through\n");
for (i = 0; i < len / sz; i++)
- parse_displayid_type_1_7_timing(&x[offset + 3 + i * sz], true, block_rev);
+ parse_displayid_type_1_7_timing(&x[3 + i * sz], true, block_rev);
break;
}
case 0x23:
if (block_rev)
- check_displayid_datablock_revision(x[offset + 1], 0xe8, 1);
+ check_displayid_datablock_revision(x[1], 0xe8, 1);
else
- check_displayid_datablock_revision(x[offset + 1], 0xc8);
- if (x[offset + 1] & 0x08) {
+ check_displayid_datablock_revision(x[1], 0xc8);
+ if (x[1] & 0x08) {
for (i = 0; i < len / 2; i++)
- parse_displayid_type_4_8_timing((x[offset + 1] & 0xc0) >> 6,
- x[offset + 3 + i * 2] |
- (x[offset + 4 + i * 2] << 8));
+ parse_displayid_type_4_8_timing((x[1] & 0xc0) >> 6,
+ x[3 + i * 2] |
+ (x[4 + i * 2] << 8));
} else {
for (i = 0; i < len; i++)
- parse_displayid_type_4_8_timing((x[offset + 1] & 0xc0) >> 6,
- x[offset + 3 + i]);
+ parse_displayid_type_4_8_timing((x[1] & 0xc0) >> 6,
+ x[3 + i]);
}
break;
case 0x24:
- check_displayid_datablock_revision(x[offset + 1]);
+ check_displayid_datablock_revision(x[1]);
for (i = 0; i < len / 6; i++)
- parse_displayid_type_9_timing(&x[offset + 3 + i * 6]);
+ parse_displayid_type_9_timing(&x[3 + i * 6]);
break;
- case 0x25: parse_displayid_dynamic_video_timings_range_limits(x + offset); break;
- case 0x26: parse_displayid_interface_features(x + offset); break;
- case 0x27: parse_displayid_stereo_display_intf(x + offset); break;
- case 0x28: parse_displayid_tiled_display_topology(x + offset, true); break;
- case 0x29: parse_displayid_ContainerID(x + offset); break;
+ case 0x25: parse_displayid_dynamic_video_timings_range_limits(x); break;
+ case 0x26: parse_displayid_interface_features(x); break;
+ case 0x27: parse_displayid_stereo_display_intf(x); break;
+ case 0x28: parse_displayid_tiled_display_topology(x, true); break;
+ case 0x29: parse_displayid_ContainerID(x); break;
case 0x32: {
- unsigned sz = 6 + ((x[offset + 1] & 0x70) >> 4);
+ unsigned sz = 6 + ((x[1] & 0x70) >> 4);
- check_displayid_datablock_revision(x[offset + 1], 0x70);
+ check_displayid_datablock_revision(x[1], 0x70);
for (i = 0; i < len / sz; i++)
- parse_displayid_type_10_timing(&x[offset + 3 + i * sz], sz);
+ parse_displayid_type_10_timing(&x[3 + i * sz], sz);
break;
}
- case 0x81: parse_displayid_cta_data_block(x + offset); break;
+ case 0x81: parse_displayid_cta_data_block(x); break;
case 0x7e:
if (oui == 0x3a0292) {
- parse_displayid_vesa(x + offset);
+ parse_displayid_vesa(x);
break;
}
// fall-through
- default: hex_block(" ", x + offset + 3, len); break;
+ default: hex_block(" ", x + 3, len); break;
}
if ((tag == 0x00 || tag == 0x20) &&
@@ -1890,7 +1890,7 @@ void edid_state::parse_displayid_block(const unsigned char *x)
unsigned offset = 5;
while (length > 0) {
- unsigned len = displayid_block(version, x, offset, length);
+ unsigned len = displayid_block(version, x + offset, length);
if (len == 0xff) break;
length -= len + 3;
offset += len + 3;
--
2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2021-09-24 23:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 23:31 [PATCH 00/28] bug fixes, additions, changes joevt
2021-09-24 23:31 ` [PATCH 01/28] edid-decode: remove unnecessary length check joevt
2021-09-24 23:31 ` [PATCH 02/28] edid-decode: fix standard timing vertical pixels joevt
2021-09-24 23:31 ` [PATCH 03/28] edid-decode: exclude oui from _block functions joevt
2021-09-24 23:31 ` [PATCH 04/28] edid-decode: check cta_hdr10plus length joevt
2021-09-24 23:31 ` [PATCH 05/28] edid-decode: Capitalize fail sentence joevt
2021-09-24 23:31 ` [PATCH 06/28] edid-decode: Replace return with break in switch joevt
2021-09-24 23:31 ` [PATCH 07/28] edid-decode: extended tag length check joevt
2021-09-24 23:31 ` [PATCH 08/28] edid-decode: Output block type before fail joevt
2021-09-24 23:31 ` [PATCH 09/28] edid-decode: update Microsoft expected length joevt
2021-09-24 23:31 ` [PATCH 10/28] edid-decode: Capitalize fail sentence joevt
2021-09-24 23:31 ` [PATCH 11/28] edid-decode: make all OUI handlers the same joevt
2021-09-24 23:31 ` [PATCH 12/28] edid-decode: move OUI parsing to separate function joevt
2021-09-24 23:31 ` [PATCH 13/28] edid-decode: move unknown block warning joevt
2021-09-24 23:31 ` [PATCH 14/28] edid-decode: remove cta_ext_block joevt
2021-09-24 23:31 ` [PATCH 15/28] edid-decode: change unknown CTA block names joevt
2021-09-24 23:31 ` [PATCH 16/28] edid-decode: move audio fail/warn messages joevt
2021-09-24 23:31 ` [PATCH 17/28] edid-decode: replace first_block with block_number joevt
2021-09-24 23:31 ` [PATCH 18/28] edid-decode: move parse_displayid_block inner loop joevt
2021-09-24 23:31 ` joevt [this message]
2021-09-25 9:05 ` [PATCH 00/28] bug fixes, additions, changes Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210924233149.10028-20-joevt@shaw.ca \
--to=joevt@shaw.ca \
--cc=hverkuil@xs4all.nl \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).