backport missing changes

Author: Michael Ketchel

modules/rgrtcpsummary/CMakeLists.txt

@@ -1,9 +1,9 @@
-project(rtcpsummary)
+project(rgrtcpsummary)
 
 list(APPEND MODULES_DETECTED ${PROJECT_NAME})
 set(MODULES_DETECTED ${MODULES_DETECTED} PARENT_SCOPE)
 
-set(SRCS rtcpsummary.c)
+set(SRCS rgrtcpsummary.c)
 
 if(STATIC)
   add_library(${PROJECT_NAME} OBJECT ${SRCS})

modules/rgrtcpsummary/rgrtcpsummary.c

@@ -1,20 +1,56 @@
 /**
- * @file rtcpsummary.c RTCP summary module
- * Output RTCP stats at the end of a call if there are any
+ * @file rgrtcpsummary.c RG Nets RTCP summary module
+ * Output RTCP stats and MOS score at the end of a call if there are any
  *
- *  Copyright (C) 2010 - 2018 Alfred E. Heggestad
+ *  Copyright (C) 2025 Michael D. Ketchel
  */
 #include <re.h>
 #include <baresip.h>
 
 
+// Clamp value between min and max
+double clamp(double value, double min, double max) {
+	if (value < min) return min;
+	if (value > max) return max;
+	return value;
+}
+
+// Calculate MOS using ITU-T E-model approximation
+double calculate_mos(double rtt_ms, double tx_jitter_ms, double rx_jitter_ms, double packet_loss_percent) {
+	// Step 1: Calculate mouth-to-ear delay (ms)
+	double delay = rtt_ms + tx_jitter_ms + rx_jitter_ms;
+
+	// Step 2: Calculate delay impairment
+	double delay_impairment = 0.024 * delay;
+	if (delay > 177.3) {
+		delay_impairment += 0.11 * (delay - 177.3);
+	}
+
+	// Step 3: Calculate loss impairment (simplified)
+	double loss_impairment = 2.5 * packet_loss_percent;
+
+	// Step 4: Calculate R-factor
+	double R = 94.2 - delay_impairment - loss_impairment;
+	R = clamp(R, 0.0, 100.0);
+
+	// Step 5: Calculate MOS from R-factor
+	double MOS = 1.0 + 0.035 * R + (R * (R - 60.0) * (100.0 - R) * 7.0e-6);
+	MOS = clamp(MOS, 1.0, 5.0);
+
+	return MOS;
+}
+
+
 static void print_rtcp_summary_line(const struct call *call,
 				    const struct stream *s)
 {
 	const struct rtcp_stats *rtcp;
 	rtcp = stream_rtcp_stats(s);
 
 	if (rtcp && (rtcp->tx.sent || rtcp->rx.sent)) {
+
+
+
 		info("\n");
 		/*
 		 * Add a stats line to make it easier to parse result
@@ -32,6 +68,7 @@ static void print_rtcp_summary_line(const struct call *call,
 			"JI=%.1f,%.1f;"/* Jitter RX, TX in ms */
 			"DL=%.1f;"     /* RTT in ms */
 			"IP=%J,%J;"    /* Local, Remote IPs */
+			"MOS=%.2f;"    /* MOS score */
 			 "\n"
 			,
 			 call_setup_duration(call) * 1000,
@@ -46,7 +83,15 @@ static void print_rtcp_summary_line(const struct call *call,
 			 1.0 * rtcp->tx.jit/1000,
 			 1.0 * rtcp->rtt/1000,
 			 sdp_media_laddr(stream_sdpmedia(s)),
-			 sdp_media_raddr(stream_sdpmedia(s)));
+			 sdp_media_raddr(stream_sdpmedia(s)),
+			 calculate_mos(
+			 	1.0 * rtcp->rtt/1000,
+			 	1.0 * rtcp->tx.jit/1000,
+			 	1.0 * rtcp->rx.jit/1000,
+				// A naive handling of packet loss here. There is likely a better way.
+				(1.0*(rtcp->rx.lost + rtcp->tx.lost) / (rtcp->rx.sent + rtcp->tx.sent))
+				)
+			 );
 	}
 	else {
 		/*

src/stream.c

@@ -51,6 +51,12 @@ static void print_rtp_stats(const struct stream *s)
 		     1.0*s->rtcp_stats.tx.jit/1000,
 		     1.0*s->rtcp_stats.rx.jit/1000);
 	}
+	info(
+		 "rtt:         %7f\n"
+		 ,
+		 1.0*s->rtcp_stats.rtt/1000
+		 );
+
 }