neels has submitted this change and it was merged. (
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, 76 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 2c1e690..460ea9b 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 differing 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 677cdc8..708e0c3 100644
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
@@ -1235,7 +1235,38 @@
- 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: conn0 has no codecs
+#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 differing 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:
@@ -1245,7 +1276,7 @@
- mgcp_codec_pt_translate(conn0, conn1, 112) -> -22
- mgcp_codec_pt_translate(conn0, conn1, 0) -> -22
- mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
-#2: conn1 has no codecs
+#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
--
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: 5
Gerrit-Owner: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilira...@gmail.com>
Gerrit-Reviewer: laforge <lafo...@gnumonks.org>
Gerrit-Reviewer: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
