commit 4bbddc6de986991acb4810e3120596a4c043f142
author Jacob Erlbeck <jerlbeck@sysmocom.de> Wed Dec 18 12:54:51 2013 +0100
committer Holger Hans Peter Freyther <holger@moiji-mobile.com> Thu Dec 19 11:56:11 2013 +0100
tree 5bfed678b922ebf4b664567fcacf42c92d7c1f1a
parent 65c7a4551a34ec560d6cf96d8613d300ea4c7c2d

mgcp/rtp: Only patch timestamp alignment errors

Currently, all timestamps are force to SeqNo*d + C which is more than
required by the nanoBTS which seems to be sensitive to alignment
errors only (dTS != k*d, d = ptime * rate = 160).

This patch replaces the force_constant_timing feature by a
force_aligned_timing feature. The timestamp offset will only be
changed (and timestamp errors counted) when the alignment does not
match to the raster based on ptime (default 20ms).

The VTY interface does not change.

Sponsored-by: On-Waves ehf

openbsc/src/libmgcp/mgcp_vty.c

diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c
index 235b8bd..8411b4a 100644
--- a/openbsc/src/libmgcp/mgcp_vty.c
+++ b/openbsc/src/libmgcp/mgcp_vty.c
@@ -89,11 +89,11 @@
 		vty_out(vty, "  rtcp-omit%s", VTY_NEWLINE);
 	else
 		vty_out(vty, "  no rtcp-omit%s", VTY_NEWLINE);
-	if (g_cfg->trunk.force_constant_ssrc || g_cfg->trunk.force_constant_timing) {
+	if (g_cfg->trunk.force_constant_ssrc || g_cfg->trunk.force_aligned_timing) {
 		vty_out(vty, "  %srtp-patch ssrc%s",
 			g_cfg->trunk.force_constant_ssrc ? "" : "no ", VTY_NEWLINE);
 		vty_out(vty, "  %srtp-patch timestamp%s",
-			g_cfg->trunk.force_constant_timing ? "" : "no ", VTY_NEWLINE);
+			g_cfg->trunk.force_aligned_timing ? "" : "no ", VTY_NEWLINE);
 	} else
 		vty_out(vty, "  no rtp-patch%s", VTY_NEWLINE);
 	if (g_cfg->trunk.audio_payload != -1)
@@ -480,7 +480,7 @@
       "Adjust RTP timestamp\n"
       )
 {
-	g_cfg->trunk.force_constant_timing = 1;
+	g_cfg->trunk.force_aligned_timing = 1;
 	return CMD_SUCCESS;
 }
 
@@ -491,7 +491,7 @@
       "Adjust RTP timestamp\n"
       )
 {
-	g_cfg->trunk.force_constant_timing = 0;
+	g_cfg->trunk.force_aligned_timing = 0;
 	return CMD_SUCCESS;
 }
 
@@ -501,7 +501,7 @@
       NO_STR RTP_PATCH_STR)
 {
 	g_cfg->trunk.force_constant_ssrc = 0;
-	g_cfg->trunk.force_constant_timing = 0;
+	g_cfg->trunk.force_aligned_timing = 0;
 	return CMD_SUCCESS;
 }
 
@@ -598,11 +598,11 @@
 			vty_out(vty, "  rtcp-omit%s", VTY_NEWLINE);
 		else
 			vty_out(vty, "  no rtcp-omit%s", VTY_NEWLINE);
-		if (trunk->force_constant_ssrc || trunk->force_constant_timing) {
+		if (trunk->force_constant_ssrc || trunk->force_aligned_timing) {
 			vty_out(vty, "  %srtp-patch ssrc%s",
 				trunk->force_constant_ssrc ? "" : "no ", VTY_NEWLINE);
 			vty_out(vty, "  %srtp-patch timestamp%s",
-				trunk->force_constant_timing ? "" : "no ", VTY_NEWLINE);
+				trunk->force_aligned_timing ? "" : "no ", VTY_NEWLINE);
 		} else
 			vty_out(vty, "  no rtp-patch%s", VTY_NEWLINE);
 		if (trunk->audio_fmtp_extra)
@@ -747,7 +747,7 @@
       )
 {
 	struct mgcp_trunk_config *trunk = vty->index;
-	trunk->force_constant_timing = 1;
+	trunk->force_aligned_timing = 1;
 	return CMD_SUCCESS;
 }
 
@@ -759,7 +759,7 @@
       )
 {
 	struct mgcp_trunk_config *trunk = vty->index;
-	trunk->force_constant_timing = 0;
+	trunk->force_aligned_timing = 0;
 	return CMD_SUCCESS;
 }
 
@@ -770,7 +770,7 @@
 {
 	struct mgcp_trunk_config *trunk = vty->index;
 	trunk->force_constant_ssrc = 0;
-	trunk->force_constant_timing = 0;
+	trunk->force_aligned_timing = 0;
 	return CMD_SUCCESS;
 }