<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24872">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Take into account Marker bit when patching RTP stream<br><br>Change-Id: I1fb449eda49e82607649122b9b9d983a9e5983fa<br>---<br>M include/osmocom/mgcp/mgcp_network.h<br>M src/libosmo-mgcp/mgcp_network.c<br>M tests/mgcp/mgcp_test.c<br>M tests/mgcp/mgcp_test.ok<br>4 files changed, 90 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/72/24872/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h</span><br><span>index 1ed00e4..96f0036 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_network.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_network.h</span><br><span>@@ -174,4 +174,4 @@</span><br><span> /* internal RTP Annex A counting */</span><br><span> void mgcp_rtp_annex_count(const struct mgcp_endpoint *endp, struct mgcp_rtp_state *state,</span><br><span> const uint16_t seq, const int32_t transit,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint32_t ssrc);</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint32_t ssrc, const bool marker_bit);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index 46cb0fd..51d77d7 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -348,13 +348,21 @@</span><br><span> struct mgcp_rtp_state *state,</span><br><span> const struct mgcp_rtp_end *rtp_end,</span><br><span> const struct osmo_sockaddr *addr,</span><br><span style="color: hsl(0, 100%, 40%);">- int16_t delta_seq, uint32_t in_timestamp)</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t delta_seq, uint32_t in_timestamp,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool marker_bit)</span><br><span> {</span><br><span> int32_t tsdelta = state->packet_duration;</span><br><span> int timestamp_offset;</span><br><span> uint32_t out_timestamp;</span><br><span> char ipbuf[INET6_ADDRSTRLEN];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (marker_bit) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If RTP pkt contains marker bit, the timestamps are not longer</span><br><span style="color: hsl(120, 100%, 40%);">+ * in sync, so we can erase timestamp offset patching. */</span><br><span style="color: hsl(120, 100%, 40%);">+ state->patch.timestamp_offset = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (tsdelta == 0) {</span><br><span> tsdelta = state->out_stream.last_tsdelta;</span><br><span> if (tsdelta != 0) {</span><br><span>@@ -398,13 +406,19 @@</span><br><span> struct mgcp_rtp_state *state,</span><br><span> const struct mgcp_rtp_end *rtp_end,</span><br><span> const struct osmo_sockaddr *addr,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t timestamp)</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t timestamp, bool marker_bit)</span><br><span> {</span><br><span> char ipbuf[INET6_ADDRSTRLEN];</span><br><span> int ts_error = 0;</span><br><span> int ts_check = 0;</span><br><span> int ptime = state->packet_duration;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (marker_bit) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If RTP pkt contains marker bit, the timestamps are not longer</span><br><span style="color: hsl(120, 100%, 40%);">+ * in sync, so no alignment is needed. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Align according to: T + Toffs - Tlast = k * Tptime */</span><br><span> </span><br><span> ts_error = ts_alignment_error(&state->out_stream, ptime,</span><br><span>@@ -477,12 +491,13 @@</span><br><span> </span><br><span> void mgcp_rtp_annex_count(const struct mgcp_endpoint *endp,</span><br><span> struct mgcp_rtp_state *state, const uint16_t seq,</span><br><span style="color: hsl(0, 100%, 40%);">- const int32_t transit, const uint32_t ssrc)</span><br><span style="color: hsl(120, 100%, 40%);">+ const int32_t transit, const uint32_t ssrc,</span><br><span style="color: hsl(120, 100%, 40%);">+ const bool marker_bit)</span><br><span> {</span><br><span> int32_t d;</span><br><span> </span><br><span> /* initialize or re-initialize */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!state->stats.initialized || state->stats.ssrc != ssrc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!state->stats.initialized || state->stats.ssrc != ssrc || marker_bit) {</span><br><span> state->stats.initialized = 1;</span><br><span> state->stats.base_seq = seq;</span><br><span> state->stats.max_seq = seq - 1;</span><br><span>@@ -566,6 +581,7 @@</span><br><span> int32_t transit;</span><br><span> uint16_t seq;</span><br><span> uint32_t timestamp, ssrc;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool marker_bit;</span><br><span> struct rtp_hdr *rtp_hdr;</span><br><span> int payload = rtp_end->codec->payload_type;</span><br><span> unsigned int len = msgb_length(msg);</span><br><span>@@ -578,9 +594,10 @@</span><br><span> timestamp = ntohl(rtp_hdr->timestamp);</span><br><span> arrival_time = get_current_ts(rtp_end->codec->rate);</span><br><span> ssrc = ntohl(rtp_hdr->ssrc);</span><br><span style="color: hsl(120, 100%, 40%);">+ marker_bit = !!rtp_hdr->marker;</span><br><span> transit = arrival_time - timestamp;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_rtp_annex_count(endp, state, seq, transit, ssrc);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_rtp_annex_count(endp, state, seq, transit, ssrc, marker_bit);</span><br><span> </span><br><span> if (!state->initialized) {</span><br><span> state->initialized = 1;</span><br><span>@@ -634,7 +651,7 @@</span><br><span> state->packet_duration;</span><br><span> </span><br><span> adjust_rtp_timestamp_offset(endp, state, rtp_end, addr,</span><br><span style="color: hsl(0, 100%, 40%);">- delta_seq, timestamp);</span><br><span style="color: hsl(120, 100%, 40%);">+ delta_seq, timestamp, marker_bit);</span><br><span> </span><br><span> state->patch.patch_ssrc = true;</span><br><span> ssrc = state->patch.orig_ssrc;</span><br><span>@@ -652,10 +669,14 @@</span><br><span> </span><br><span> state->in_stream.last_tsdelta = 0;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Compute current per-packet timestamp delta */</span><br><span style="color: hsl(0, 100%, 40%);">- check_rtp_timestamp(endp, state, &state->in_stream, rtp_end,</span><br><span style="color: hsl(0, 100%, 40%);">- addr, seq, timestamp, "input",</span><br><span style="color: hsl(0, 100%, 40%);">- &state->in_stream.last_tsdelta);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!marker_bit) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Compute current per-packet timestamp delta */</span><br><span style="color: hsl(120, 100%, 40%);">+ check_rtp_timestamp(endp, state, &state->in_stream, rtp_end,</span><br><span style="color: hsl(120, 100%, 40%);">+ addr, seq, timestamp, "input",</span><br><span style="color: hsl(120, 100%, 40%);">+ &state->in_stream.last_tsdelta);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ state->in_stream.last_tsdelta = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (state->patch.patch_ssrc)</span><br><span> ssrc = state->patch.orig_ssrc;</span><br><span>@@ -670,7 +691,7 @@</span><br><span> state->out_stream.ssrc == ssrc && state->packet_duration)</span><br><span> /* Align the timestamp offset */</span><br><span> align_rtp_timestamp_offset(endp, state, rtp_end, addr,</span><br><span style="color: hsl(0, 100%, 40%);">- timestamp);</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamp, marker_bit);</span><br><span> </span><br><span> /* Store the updated SSRC back to the packet */</span><br><span> if (state->patch.patch_ssrc)</span><br><span>@@ -685,10 +706,14 @@</span><br><span> rtp_hdr->timestamp = htonl(timestamp);</span><br><span> </span><br><span> /* Check again, whether the timestamps are still valid */</span><br><span style="color: hsl(0, 100%, 40%);">- if (state->out_stream.ssrc == ssrc)</span><br><span style="color: hsl(0, 100%, 40%);">- check_rtp_timestamp(endp, state, &state->out_stream, rtp_end,</span><br><span style="color: hsl(0, 100%, 40%);">- addr, seq, timestamp, "output",</span><br><span style="color: hsl(0, 100%, 40%);">- &state->out_stream.last_tsdelta);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!marker_bit) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (state->out_stream.ssrc == ssrc)</span><br><span style="color: hsl(120, 100%, 40%);">+ check_rtp_timestamp(endp, state, &state->out_stream, rtp_end,</span><br><span style="color: hsl(120, 100%, 40%);">+ addr, seq, timestamp, "output",</span><br><span style="color: hsl(120, 100%, 40%);">+ &state->out_stream.last_tsdelta);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ state->out_stream.last_tsdelta = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Save output values */</span><br><span> state->out_stream.last_seq = seq;</span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index e6862e5..7496e88 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -1259,6 +1259,15 @@</span><br><span> /* RTP: SeqNo=1002, TS=160320 */</span><br><span> {2.040000, 20, "\x80\x62\x03\xEA\x00\x02\x72\x40\x50\x60\x70\x80"</span><br><span> "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RTP: SeqNo=1003, TS=180320, Marker */</span><br><span style="color: hsl(120, 100%, 40%);">+ {2.060000, 20, "\x80\xE2\x03\xEB\x00\x02\xC0\x60\x50\x60\x70\x80"</span><br><span style="color: hsl(120, 100%, 40%);">+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RTP: SeqNo=1004, TS=180480 */</span><br><span style="color: hsl(120, 100%, 40%);">+ {2.080000, 20, "\x80\x62\x03\xEC\x00\x02\xC1\x00\x50\x60\x70\x80"</span><br><span style="color: hsl(120, 100%, 40%);">+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RTP: SeqNo=1005, TS=180480, 10ms too late */</span><br><span style="color: hsl(120, 100%, 40%);">+ {2.110000, 20, "\x80\x62\x03\xED\x00\x02\xC1\xA0\x50\x60\x70\x80"</span><br><span style="color: hsl(120, 100%, 40%);">+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},</span><br><span> };</span><br><span> </span><br><span> static void test_packet_error_detection(int patch_ssrc, int patch_ts)</span><br><span>@@ -1543,24 +1552,24 @@</span><br><span> </span><br><span> OSMO_ASSERT(conn->state.stats.initialized == 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_rtp_annex_count(endp, &conn->state, 0, 0, 2342);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_rtp_annex_count(endp, &conn->state, 0, 0, 2342, false);</span><br><span> OSMO_ASSERT(conn->state.stats.initialized == 1);</span><br><span> OSMO_ASSERT(conn->state.stats.cycles == 0);</span><br><span> OSMO_ASSERT(conn->state.stats.max_seq == 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_rtp_annex_count(endp, &conn->state, 1, 0, 2342);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_rtp_annex_count(endp, &conn->state, 1, 0, 2342, false);</span><br><span> OSMO_ASSERT(conn->state.stats.initialized == 1);</span><br><span> OSMO_ASSERT(conn->state.stats.cycles == 0);</span><br><span> OSMO_ASSERT(conn->state.stats.max_seq == 1);</span><br><span> </span><br><span> /* now jump.. */</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_rtp_annex_count(endp, &conn->state, UINT16_MAX, 0, 2342);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_rtp_annex_count(endp, &conn->state, UINT16_MAX, 0, 2342, false);</span><br><span> OSMO_ASSERT(conn->state.stats.initialized == 1);</span><br><span> OSMO_ASSERT(conn->state.stats.cycles == 0);</span><br><span> OSMO_ASSERT(conn->state.stats.max_seq == UINT16_MAX);</span><br><span> </span><br><span> /* and wrap */</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_rtp_annex_count(endp, &conn->state, 0, 0, 2342);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_rtp_annex_count(endp, &conn->state, 0, 0, 2342, false);</span><br><span> OSMO_ASSERT(conn->state.stats.initialized == 1);</span><br><span> OSMO_ASSERT(conn->state.stats.cycles == UINT16_MAX + 1);</span><br><span> OSMO_ASSERT(conn->state.stats.max_seq == 0);</span><br><span>diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok</span><br><span>index 9c48147..04f9e0c 100644</span><br><span>--- a/tests/mgcp/mgcp_test.ok</span><br><span>+++ b/tests/mgcp/mgcp_test.ok</span><br><span>@@ -770,6 +770,15 @@</span><br><span> In TS: 160320, dTS: 160, Seq: 1002</span><br><span> Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span> Stats: Jitter = 0, Transit = -144000</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180320, dTS: 0, Seq: 1003</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 20000, dTS: 0, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 0, Transit = -163840</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180480, dTS: 160, Seq: 1004</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 0, Transit = -163840</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180640, dTS: 160, Seq: 1005</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 5, Transit = -163760</span><br><span> Testing packet error detection.</span><br><span> Output SSRC changed to 11223344</span><br><span> In TS: 0, dTS: 0, Seq: 0</span><br><span>@@ -864,6 +873,15 @@</span><br><span> In TS: 160320, dTS: 160, Seq: 1002</span><br><span> Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span> Stats: Jitter = 0, Transit = -144000</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180320, dTS: 0, Seq: 1003</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 20000, dTS: 0, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 0, Transit = -163840</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180480, dTS: 160, Seq: 1004</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 0, Transit = -163840</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180640, dTS: 160, Seq: 1005</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 5, Transit = -163760</span><br><span> Testing packet error detection, patch timestamps.</span><br><span> Output SSRC changed to 11223344</span><br><span> In TS: 0, dTS: 0, Seq: 0</span><br><span>@@ -958,6 +976,15 @@</span><br><span> In TS: 160320, dTS: 160, Seq: 1002</span><br><span> Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span> Stats: Jitter = 0, Transit = -144000</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180320, dTS: 0, Seq: 1003</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 20000, dTS: 0, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 0, Transit = -163840</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180480, dTS: 160, Seq: 1004</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 0, Transit = -163840</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180640, dTS: 160, Seq: 1005</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 5, Transit = -163760</span><br><span> Testing packet error detection, patch SSRC, patch timestamps.</span><br><span> Output SSRC changed to 11223344</span><br><span> In TS: 0, dTS: 0, Seq: 0</span><br><span>@@ -1050,6 +1077,15 @@</span><br><span> In TS: 160320, dTS: 160, Seq: 1002</span><br><span> Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span> Stats: Jitter = 0, Transit = -144000</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180320, dTS: 0, Seq: 1003</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 20000, dTS: 0, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 0, Transit = -163840</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180480, dTS: 160, Seq: 1004</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 0, Transit = -163840</span><br><span style="color: hsl(120, 100%, 40%);">+In TS: 180640, dTS: 160, Seq: 1005</span><br><span style="color: hsl(120, 100%, 40%);">+Out TS change: 160, dTS: 160, Seq change: 1, TS Err change: in +0, out +0</span><br><span style="color: hsl(120, 100%, 40%);">+Stats: Jitter = 5, Transit = -163760</span><br><span> Testing multiple payload types</span><br><span> creating message from statically defined input:</span><br><span> ---------8<---------</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24872">change 24872</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-mgw/+/24872"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1fb449eda49e82607649122b9b9d983a9e5983fa </div>
<div style="display:none"> Gerrit-Change-Number: 24872 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>