From 2c53bc8937d7de7e1ae8e75e527ed4ce24ac2bca Mon Sep 17 00:00:00 2001 From: Mathis Engelbart Date: Sat, 12 Jul 2025 12:51:12 +0200 Subject: [PATCH] Fix num reports field see https://www.rfc-editor.org/errata/eid8166 --- code/ScreamRx.cpp | 4 ++-- code/ScreamV2Tx.cpp | 2 +- gstscream/src/screamrx/ScreamRx.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ScreamRx.cpp b/code/ScreamRx.cpp index 1768c50..7814714 100644 --- a/code/ScreamRx.cpp +++ b/code/ScreamRx.cpp @@ -176,9 +176,9 @@ bool ScreamRx::Stream::getStandardizedFeedback(uint32_t time_ntp, size += 2; /* - * Write number of reports- 1 + * Write number of reports */ - tmp_s = nReportedRtpPackets - 1; + tmp_s = nReportedRtpPackets; tmp_s = htons(tmp_s); memcpy(buf + 6, &tmp_s, 2); size += 2; diff --git a/code/ScreamV2Tx.cpp b/code/ScreamV2Tx.cpp index d37163a..da53479 100644 --- a/code/ScreamV2Tx.cpp +++ b/code/ScreamV2Tx.cpp @@ -579,7 +579,7 @@ void ScreamV2Tx::incomingStandardizedFeedback(uint32_t time_ntp, memcpy(&num_reports, buf + ptr, 2); ptr += 2; begin_seq = ntohs(begin_seq); - num_reports = ntohs(num_reports) + 1; + num_reports = ntohs(num_reports); end_seq = begin_seq + num_reports - 1; /* diff --git a/gstscream/src/screamrx/ScreamRx.rs b/gstscream/src/screamrx/ScreamRx.rs index 2c99b28..0721813 100644 --- a/gstscream/src/screamrx/ScreamRx.rs +++ b/gstscream/src/screamrx/ScreamRx.rs @@ -423,9 +423,9 @@ impl Stream { }; bytes.extend_from_slice(&tmp_s.to_be_bytes()); /* - * Write number of reports- 1 + * Write number of reports */ - let tmp_s: u16 = (self.nReportedRtpPackets - 1).try_into().unwrap(); + let tmp_s: u16 = (self.nReportedRtpPackets).try_into().unwrap(); bytes.extend_from_slice(&tmp_s.to_be_bytes()); /*