From 825e2135c183f4b5f184ad96f7e28d71a057f61f Mon Sep 17 00:00:00 2001 From: "Wilczynski, Andrzej" Date: Thu, 2 Jul 2026 13:19:44 +0000 Subject: [PATCH 1/3] Fix: Added missing fps option for fastmetadata Signed-off-by: Wilczynski, Andrzej --- tests/tools/RxTxApp/src/parse_json.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/tools/RxTxApp/src/parse_json.c b/tests/tools/RxTxApp/src/parse_json.c index 61cb945c2..32bcd61ff 100644 --- a/tests/tools/RxTxApp/src/parse_json.c +++ b/tests/tools/RxTxApp/src/parse_json.c @@ -1409,6 +1409,20 @@ static int st_json_parse_tx_fmd(int idx, json_object* fmd_obj, fmd->info.fmd_fps = ST_FPS_P25; } else if (strcmp(fmd_fps, "p29") == 0) { fmd->info.fmd_fps = ST_FPS_P29_97; + } else if (strcmp(fmd_fps, "p119") == 0) { + fmd->info.fmd_fps = ST_FPS_P119_88; + } else if (strcmp(fmd_fps, "p120") == 0) { + fmd->info.fmd_fps = ST_FPS_P120; + } else if (strcmp(fmd_fps, "p100") == 0) { + fmd->info.fmd_fps = ST_FPS_P100; + } else if (strcmp(fmd_fps, "p60") == 0) { + fmd->info.fmd_fps = ST_FPS_P60; + } else if (strcmp(fmd_fps, "p30") == 0) { + fmd->info.fmd_fps = ST_FPS_P30; + } else if (strcmp(fmd_fps, "p24") == 0) { + fmd->info.fmd_fps = ST_FPS_P24; + } else if (strcmp(fmd_fps, "p23") == 0) { + fmd->info.fmd_fps = ST_FPS_P23_98; } else { err("%s, invalid fmd fps %s\n", __func__, fmd_fps); return -ST_JSON_NOT_VALID; From 08d4b277f94cc725ad2442b146a5c704211ae6f9 Mon Sep 17 00:00:00 2001 From: "Wilczynski, Andrzej" Date: Fri, 3 Jul 2026 12:12:06 +0000 Subject: [PATCH 2/3] Fixed failing test_st41_no_chain Signed-off-by: Wilczynski, Andrzej --- lib/src/st2110/st_tx_fastmetadata_session.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/src/st2110/st_tx_fastmetadata_session.c b/lib/src/st2110/st_tx_fastmetadata_session.c index 6f2879377..808e438a1 100644 --- a/lib/src/st2110/st_tx_fastmetadata_session.c +++ b/lib/src/st2110/st_tx_fastmetadata_session.c @@ -399,7 +399,7 @@ static void tx_fastmetadata_session_build_packet( struct rte_udp_hdr* udp; struct st41_rtp_hdr* rtp; - if (rte_pktmbuf_data_len(pkt) < sizeof(*hdr)) { + if (rte_pktmbuf_tailroom(pkt) < sizeof(*hdr)) { err("%s: packet is less than fmd hdr size", __func__); return; } @@ -435,7 +435,8 @@ static void tx_fastmetadata_session_build_packet( uint16_t data_item_length = (data_item_length_bytes + 3) / 4; /* expressed in number of 4-byte words */ - if (rte_pktmbuf_data_len(pkt) < sizeof(*hdr) + data_item_length_bytes) { + if (rte_pktmbuf_tailroom(pkt) + rte_pktmbuf_data_len(pkt) < + sizeof(*hdr) + data_item_length_bytes) { err("%s: packet doesn't contain RTP payload", __func__); return; } From 3c63fa2d7bb5a48747ef513857ce56173ee9d7f8 Mon Sep 17 00:00:00 2001 From: "Wilczynski, Andrzej" Date: Fri, 3 Jul 2026 12:36:12 +0000 Subject: [PATCH 3/3] Fix: Detect stale SvtJpegxs core lib in setup_environment.sh need_build only checked ldconfig SONAME presence, not version, so a stale SvtJpegxs install (surviving git clean as a system-wide install) was treated as up-to-date after versions.env bumped SVT_JPEG_XS_VER to a commit requiring SvtJpegxs >= 0.10.0. FFmpeg configure then failed with "SvtJpegxs >= 0.10.0 not found using pkg-config" on mtl-runner-7. Add a pkg-config version check alongside the SONAME check so an outdated install triggers a rebuild instead of being skipped. The minimum version is now a versions.env variable instead of a hardcoded literal, matching the convention used by the other pinned versions. Fixes: 46b13a9439d9 ("Ci: skip copying missing jpeg-xs helper files on v0.9.0") Signed-off-by: Wilczynski, Andrzej --- .github/scripts/setup_environment.sh | 3 +++ versions.env | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/scripts/setup_environment.sh b/.github/scripts/setup_environment.sh index 4675a533f..9b7888a0f 100755 --- a/.github/scripts/setup_environment.sh +++ b/.github/scripts/setup_environment.sh @@ -487,6 +487,9 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then if ! ldconfig -p 2>/dev/null | grep -q "libSvtJpegxs.so.0"; then echo "Core SvtJpegxs library not found." need_build=1 + elif ! pkg-config --atleast-version="${SVT_JPEG_XS_MIN_VER}" SvtJpegxs 2>/dev/null; then + echo "Core SvtJpegxs library is outdated (< ${SVT_JPEG_XS_MIN_VER} required by FFmpeg). Rebuilding." + need_build=1 fi export SVT_JPEG_XS_REPO="${setup_script_folder}/SVT-JPEG-XS" diff --git a/versions.env b/versions.env index db4a5e41a..35668d00a 100644 --- a/versions.env +++ b/versions.env @@ -9,6 +9,7 @@ FFMPEG_VERSION=7.0 XDP_TOOLS_VER=1.6.3 EBPF_VER=1.5.0 SVT_JPEG_XS_VER=8e50180ad909a0bdcdf91b462c64033f0fe3e112 +SVT_JPEG_XS_MIN_VER=0.10.0 DPDK_REPO=https://github.com/dpdk/dpdk/archive/refs/tags/v${DPDK_VER}.tar.gz ICE_REPO=https://downloadmirror.intel.com/${ICE_DMID}/ice-${ICE_VER}.tar.gz