Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/scripts/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions lib/src/st2110/st_tx_fastmetadata_session.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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) <
Comment thread
awilczyns marked this conversation as resolved.
sizeof(*hdr) + data_item_length_bytes) {
err("%s: packet doesn't contain RTP payload", __func__);
return;
}
Expand Down
14 changes: 14 additions & 0 deletions tests/tools/RxTxApp/src/parse_json.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions versions.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading