<p>neels <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/15135">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">test_mgcp_codec_pt_translate(): more tests<br><br>Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1<br>---<br>M tests/mgcp/mgcp_test.c<br>M tests/mgcp/mgcp_test.ok<br>2 files changed, 76 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 2c1e690..460ea9b 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -1770,6 +1770,49 @@</span><br><span> },</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ .descr = "different order and different payload type numbers",</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%);">+ { 0, "PCMU/8000/1", NULL, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 111, "GSM-HR-08/8000/1", NULL, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 112, "AMR/8000/1", &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%);">+ { 97, "GSM-HR-08/8000/1", NULL, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, "PCMU/8000/1", NULL, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 96, "AMR/8000/1", &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 = {112, 96}, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {0, 0}, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {111, 97} },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {123, -EINVAL} },</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 = "both sides have the same payload_type numbers assigned to differing codecs",</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%);">+ { 0, "PCMU/8000/1", NULL, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 96, "GSM-HR-08/8000/1", NULL, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 97, "AMR/8000/1", &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%);">+ { 97, "GSM-HR-08/8000/1", NULL, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, "PCMU/8000/1", NULL, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 96, "AMR/8000/1", &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 = {96, 97}, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {97, 96}, },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .payload_type_map = {0, 0}, },</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> .descr = "conn0 has no codecs",</span><br><span> .codecs = {</span><br><span> {</span><br><span>diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok</span><br><span>index 677cdc8..708e0c3 100644</span><br><span>--- a/tests/mgcp/mgcp_test.ok</span><br><span>+++ b/tests/mgcp/mgcp_test.ok</span><br><span>@@ -1235,7 +1235,38 @@</span><br><span> - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97</span><br><span> - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111</span><br><span> - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22</span><br><span style="color: hsl(0, 100%, 40%);">-#1: conn0 has no codecs</span><br><span style="color: hsl(120, 100%, 40%);">+#1: different order and different payload type numbers</span><br><span style="color: hsl(120, 100%, 40%);">+ - add codecs on conn0:</span><br><span style="color: hsl(120, 100%, 40%);">+ 0: 0 PCMU/8000/1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 1: 111 GSM-HR-08/8000/1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 2: 112 AMR/8000/1 octet-aligned=1 -> 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: 97 GSM-HR-08/8000/1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 1: 0 PCMU/8000/1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 2: 96 AMR/8000/1 octet-aligned=1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22</span><br><span style="color: hsl(120, 100%, 40%);">+#2: both sides have the same payload_type numbers assigned to differing codecs</span><br><span style="color: hsl(120, 100%, 40%);">+ - add codecs on conn0:</span><br><span style="color: hsl(120, 100%, 40%);">+ 0: 0 PCMU/8000/1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 1: 96 GSM-HR-08/8000/1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 2: 97 AMR/8000/1 octet-aligned=1 -> 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: 97 GSM-HR-08/8000/1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 1: 0 PCMU/8000/1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ 2: 96 AMR/8000/1 octet-aligned=1 -> rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 96) -> 97</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn1, conn0, 97) -> 96</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 97) -> 96</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn1, conn0, 96) -> 97</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+ - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+#3: conn0 has no codecs</span><br><span> - add codecs on conn0:</span><br><span> (none)</span><br><span> - add codecs on conn1:</span><br><span>@@ -1245,7 +1276,7 @@</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(0, 100%, 40%);">-#2: conn1 has no codecs</span><br><span style="color: hsl(120, 100%, 40%);">+#4: conn1 has no codecs</span><br><span> - add codecs on conn0:</span><br><span> 0: 112 AMR/8000/1 octet-aligned=1 -> rc=0</span><br><span> 1: 0 PCMU/8000/1 -> rc=0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/15135">change 15135</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/+/15135"/><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: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 </div>
<div style="display:none"> Gerrit-Change-Number: 15135 </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: fixeria <axilirator@gmail.com> </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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>