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: fix emscripten build Author: Hans Verkuil <[email protected]> Date: Mon May 11 08:30:36 2026 +0200 The previous patches broke the emscripten build, fix it. Signed-off-by: Hans Verkuil <[email protected]> utils/edid-decode/edid-decode.cpp | 34 +++++++++++++++++--------------- utils/edid-decode/emscripten/meson.build | 2 ++ 2 files changed, 20 insertions(+), 16 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=5c11e7d6bd49c1554c3739be5934df11457702cc diff --git a/utils/edid-decode/edid-decode.cpp b/utils/edid-decode/edid-decode.cpp index d9fc7b37cd82..b25ea663e7ea 100644 --- a/utils/edid-decode/edid-decode.cpp +++ b/utils/edid-decode/edid-decode.cpp @@ -1691,6 +1691,7 @@ static struct parse_data eld_pdata = { 0 }; +#ifndef __EMSCRIPTEN__ static unsigned char scdc[256]; static struct parse_data scdc_pdata = { @@ -1709,6 +1710,7 @@ static struct parse_data hdcp_pdata = { sizeof(hdcp), 0 }; +#endif static bool data_add_byte(parse_data &pdata, const char *s) { @@ -2057,22 +2059,6 @@ int edid_state::parse_scdc_pdata(parse_data &pdata) return failures ? -2 : 0; } -static int hdcp_from_file(parse_data &pdata, const char *from_file) -{ - int ret = data_from_file(pdata, from_file); - - if (ret < 0) - return ret; - - unsigned char *hdcp_prim = &pdata.buf[0]; - unsigned char *ksv_fifo = hdcp_prim + 256; - unsigned char *hdcp_sec = ksv_fifo + 128 * 5; - unsigned kvs_fifo_sz = hdcp_prim[0x41] & 0x7f; - memcpy(hdcp_sec, ksv_fifo + kvs_fifo_sz * 5, 256); - memset(ksv_fifo + kvs_fifo_sz * 5, 0, (128 - kvs_fifo_sz) * 5); - return 0; -} - int edid_state::parse_hdcp_pdata(parse_data &pdata) { state.block_nr = 0; @@ -2135,6 +2121,22 @@ int edid_state::parse_hdcp_pdata(parse_data &pdata) #ifndef __EMSCRIPTEN__ +static int hdcp_from_file(parse_data &pdata, const char *from_file) +{ + int ret = data_from_file(pdata, from_file); + + if (ret < 0) + return ret; + + unsigned char *hdcp_prim = &pdata.buf[0]; + unsigned char *ksv_fifo = hdcp_prim + 256; + unsigned char *hdcp_sec = ksv_fifo + 128 * 5; + unsigned kvs_fifo_sz = hdcp_prim[0x41] & 0x7f; + memcpy(hdcp_sec, ksv_fifo + kvs_fifo_sz * 5, 256); + memset(ksv_fifo + kvs_fifo_sz * 5, 0, (128 - kvs_fifo_sz) * 5); + return 0; +} + static unsigned char crc_calc(const unsigned char *b) { unsigned char sum = 0; diff --git a/utils/edid-decode/emscripten/meson.build b/utils/edid-decode/emscripten/meson.build index 138d8441260e..c6ed85fd5608 100644 --- a/utils/edid-decode/emscripten/meson.build +++ b/utils/edid-decode/emscripten/meson.build @@ -64,6 +64,8 @@ edid_decode_sources = [ '../parse-ls-ext-block.cpp', '../parse-vtb-ext-block.cpp', '../parse-if.cpp', + '../parse-hdcp.cpp', + '../parse-scdc.cpp', ] edid_decode = executable( _______________________________________________ linuxtv-commits mailing list -- [email protected] To unsubscribe send an email to [email protected]
