<p>neels <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/15136">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
keith: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">differentiate AMR octet-aligned=0 vs =1<br><br>Add corresponding tests in mgcp_test.c<br><br>Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124<br>---<br>M src/libosmo-mgcp/mgcp_codec.c<br>M tests/mgcp/mgcp_test.c<br>M tests/mgcp/mgcp_test.ok<br>3 files changed, 104 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c</span><br><span>index 7f1a6d1..5d7f840 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_codec.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_codec.c</span><br><span>@@ -348,6 +348,25 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Return true if octet-aligned is set in the given codec. Default to octet-aligned=0, i.e. bandwidth-efficient mode.</span><br><span style="color: hsl(120, 100%, 40%);">+ * See RFC4867 "RTP Payload Format for AMR and AMR-WB" sections "8.1. AMR Media Type Registration" and "8.2. AMR-WB</span><br><span style="color: hsl(120, 100%, 40%);">+ * Media Type Registration":</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * octet-align: Permissible values are 0 and 1. If 1, octet-aligned</span><br><span style="color: hsl(120, 100%, 40%);">+ * operation SHALL be used. If 0 or if not present,</span><br><span style="color: hsl(120, 100%, 40%);">+ * bandwidth-efficient operation is employed.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * https://tools.ietf.org/html/rfc4867</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool amr_is_octet_aligned(const struct mgcp_rtp_codec *codec)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!codec->param_present)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!codec->param.amr_octet_aligned_present)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return codec->param.amr_octet_aligned;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Compare two codecs, all parameters must match up, except for the payload type</span><br><span> * number. */</span><br><span> static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b)</span><br><span>@@ -364,6 +383,10 @@</span><br><span> return false;</span><br><span> if (strcmp(codec_a->subtype_name, codec_b->subtype_name))</span><br><span> return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(codec_a->subtype_name, "AMR")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (amr_is_octet_aligned(codec_a) != amr_is_octet_aligned(codec_b))</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return true;</span><br><span> }</span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 460ea9b..5ebe475 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -1716,7 +1716,6 @@</span><br><span> .amr_octet_aligned = true,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if 0</span><br><span> static const struct mgcp_codec_param amr_param_octet_aligned_false = {</span><br><span> .amr_octet_aligned_present = true,</span><br><span> .amr_octet_aligned = false,</span><br><span>@@ -1725,7 +1724,6 @@</span><br><span> static const struct mgcp_codec_param amr_param_octet_aligned_unset = {</span><br><span> .amr_octet_aligned_present = false,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> struct testcase_mgcp_codec_pt_translate_codec {</span><br><span> int payload_type;</span><br><span>@@ -1850,6 +1848,58 @@</span><br><span> { .end = true },</span><br><span> },</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .descr = "test AMR with differing octet-aligned settings",</span><br><span style="color: hsl(120, 100%, 40%);">+ .codecs = {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 111, "AMR/8000", &amr_param_octet_aligned_true, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 112, "AMR/8000", &amr_param_octet_aligned_false, },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 122, "AMR/8000", &amr_param_octet_aligned_false, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 121, "AMR/8000", &amr_param_octet_aligned_true, },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ .expect = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {111, 121}, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {112, 122} },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .end = true },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .descr = "test AMR with missing octet-aligned settings (defaults to 0)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .codecs = {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 111, "AMR/8000", &amr_param_octet_aligned_true, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 112, "AMR/8000", &amr_param_octet_aligned_false, },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 122, "AMR/8000", &amr_param_octet_aligned_unset, },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ .expect = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {111, -EINVAL}, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {112, 122} },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .end = true },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .descr = "test AMR with NULL param (defaults to 0)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .codecs = {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 111, "AMR/8000", &amr_param_octet_aligned_true, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 112, "AMR/8000", &amr_param_octet_aligned_false, },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 122, "AMR/8000", NULL, },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ .expect = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {111, -EINVAL}, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {112, 122} },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .end = true },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> static void test_mgcp_codec_pt_translate(void)</span><br><span>diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok</span><br><span>index 708e0c3..14d5d73 100644</span><br><span>--- a/tests/mgcp/mgcp_test.ok</span><br><span>+++ b/tests/mgcp/mgcp_test.ok</span><br><span>@@ -1286,6 +1286,35 @@</span><br><span> - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22</span><br><span> - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22</span><br><span> - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22</span><br><span style="color: hsl(120, 100%, 40%);">+#5: test AMR with differing octet-aligned settings</span><br><span style="color: hsl(120, 100%, 40%);">+ - add codecs on conn0:</span><br><span style="color: hsl(120, 100%, 40%);">+ 0: 111 AMR/8000 octet-aligned=1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 1: 112 AMR/8000 octet-aligned=0 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ - add codecs on conn1:</span><br><span style="color: hsl(120, 100%, 40%);">+ 0: 122 AMR/8000 octet-aligned=0 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 1: 121 AMR/8000 octet-aligned=1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> 121</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn1, conn0, 121) -> 111</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112</span><br><span style="color: hsl(120, 100%, 40%);">+#6: test AMR with missing octet-aligned settings (defaults to 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ - add codecs on conn0:</span><br><span style="color: hsl(120, 100%, 40%);">+ 0: 111 AMR/8000 octet-aligned=1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 1: 112 AMR/8000 octet-aligned=0 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ - add codecs on conn1:</span><br><span style="color: hsl(120, 100%, 40%);">+ 0: 122 AMR/8000 octet-aligned=unset -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112</span><br><span style="color: hsl(120, 100%, 40%);">+#7: test AMR with NULL param (defaults to 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ - add codecs on conn0:</span><br><span style="color: hsl(120, 100%, 40%);">+ 0: 111 AMR/8000 octet-aligned=1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 1: 112 AMR/8000 octet-aligned=0 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ - add codecs on conn1:</span><br><span style="color: hsl(120, 100%, 40%);">+ 0: 122 AMR/8000 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112</span><br><span> </span><br><span> Testing test_conn_id_matching</span><br><span> needle='23AB' found '000023AB'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/15136">change 15136</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/+/15136"/><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: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 </div>
<div style="display:none"> Gerrit-Change-Number: 15136 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>