This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
neels gerrit-no-reply at lists.osmocom.orgneels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15135
Change subject: test_mgcp_codec_pt_translate(): more tests
......................................................................
test_mgcp_codec_pt_translate(): more tests
Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1
---
M tests/mgcp/mgcp_test.c
M tests/mgcp/mgcp_test.ok
2 files changed, 112 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/35/15135/1
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 2c1e690..44e8234 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -1770,6 +1770,49 @@
},
},
{
+ .descr = "different order and different payload type numbers",
+ .codecs = {
+ {
+ { 0, "PCMU/8000/1", NULL, },
+ { 111, "GSM-HR-08/8000/1", NULL, },
+ { 112, "AMR/8000/1", &amr_param_octet_aligned_true, },
+ },
+ {
+ { 97, "GSM-HR-08/8000/1", NULL, },
+ { 0, "PCMU/8000/1", NULL, },
+ { 96, "AMR/8000/1", &amr_param_octet_aligned_true, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {112, 96}, },
+ { .payload_type_map = {0, 0}, },
+ { .payload_type_map = {111, 97} },
+ { .payload_type_map = {123, -EINVAL} },
+ { .end = true },
+ },
+ },
+ {
+ .descr = "both sides have the same payload_type numbers assigned to conflicting codecs",
+ .codecs = {
+ {
+ { 0, "PCMU/8000/1", NULL, },
+ { 96, "GSM-HR-08/8000/1", NULL, },
+ { 97, "AMR/8000/1", &amr_param_octet_aligned_true, },
+ },
+ {
+ { 97, "GSM-HR-08/8000/1", NULL, },
+ { 0, "PCMU/8000/1", NULL, },
+ { 96, "AMR/8000/1", &amr_param_octet_aligned_true, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {96, 97}, },
+ { .payload_type_map = {97, 96}, },
+ { .payload_type_map = {0, 0}, },
+ { .end = true },
+ },
+ },
+ {
.descr = "conn0 has no codecs",
.codecs = {
{
diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok
index 6f4da10..13d1870 100644
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
@@ -1218,6 +1218,75 @@
p10, aPCMU -> (null)
'10,a :PCMU' -> '(null)'
+Testing mgcp_codec_pt_translate()
+#0: same order, but differing payload type numbers
+ - add codecs on conn0:
+ 0: 112 AMR/8000/1 octet-aligned=1 -> rc=0
+ 1: 0 PCMU/8000/1 -> rc=0
+ 2: 111 GSM-HR-08/8000/1 -> rc=0
+ - add codecs on conn1:
+ 0: 96 AMR/8000/1 octet-aligned=1 -> rc=0
+ 1: 0 PCMU/8000/1 -> rc=0
+ 2: 97 GSM-HR-08/8000/1 -> rc=0
+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96
+ - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112
+ - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0
+ - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0
+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97
+ - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111
+ - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22
+#1: different order and different payload type numbers
+ - add codecs on conn0:
+ 0: 0 PCMU/8000/1 -> rc=0
+ 1: 111 GSM-HR-08/8000/1 -> rc=0
+ 2: 112 AMR/8000/1 octet-aligned=1 -> rc=0
+ - add codecs on conn1:
+ 0: 97 GSM-HR-08/8000/1 -> rc=0
+ 1: 0 PCMU/8000/1 -> rc=0
+ 2: 96 AMR/8000/1 octet-aligned=1 -> rc=0
+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96
+ - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112
+ - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0
+ - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0
+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97
+ - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111
+ - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22
+#2: both sides have the same payload_type numbers assigned to conflicting codecs
+ - add codecs on conn0:
+ 0: 0 PCMU/8000/1 -> rc=0
+ 1: 96 GSM-HR-08/8000/1 -> rc=0
+ 2: 97 AMR/8000/1 octet-aligned=1 -> rc=0
+ - add codecs on conn1:
+ 0: 97 GSM-HR-08/8000/1 -> rc=0
+ 1: 0 PCMU/8000/1 -> rc=0
+ 2: 96 AMR/8000/1 octet-aligned=1 -> rc=0
+ - mgcp_codec_pt_translate(conn0, conn1, 96) -> 97
+ - mgcp_codec_pt_translate(conn1, conn0, 97) -> 96
+ - mgcp_codec_pt_translate(conn0, conn1, 97) -> 96
+ - mgcp_codec_pt_translate(conn1, conn0, 96) -> 97
+ - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0
+ - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0
+#3: conn0 has no codecs
+ - add codecs on conn0:
+ (none)
+ - add codecs on conn1:
+ 0: 96 AMR/8000/1 octet-aligned=1 -> rc=0
+ 1: 0 PCMU/8000/1 -> rc=0
+ 2: 97 GSM-HR-08/8000/1 -> rc=0
+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22
+ - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22
+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
+#4: conn1 has no codecs
+ - add codecs on conn0:
+ 0: 112 AMR/8000/1 octet-aligned=1 -> rc=0
+ 1: 0 PCMU/8000/1 -> rc=0
+ 2: 111 GSM-HR-08/8000/1 -> rc=0
+ - add codecs on conn1:
+ (none)
+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22
+ - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22
+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
+
Testing test_conn_id_matching
needle='23AB' found '000023AB'
needle='0023AB' found '000023AB'
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1
Gerrit-Change-Number: 15135
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190809/a2a007cd/attachment.htm>