neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15136
Change subject: differentiate AMR octet-aligned=0 vs =1
......................................................................
differentiate AMR octet-aligned=0 vs =1
Add corresponding tests in mgcp_test.c
Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124
---
M src/libosmo-mgcp/mgcp_codec.c
M tests/mgcp/mgcp_test.c
M tests/mgcp/mgcp_test.ok
3 files changed, 95 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/36/15136/1
diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c
index b27c60d..ead1412 100644
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -358,6 +358,16 @@
return -EINVAL;
}
+/* Default to octet-aligned=0, i.e. bandwidth-efficient mode */
+static bool amr_is_octet_aligned(const struct mgcp_rtp_codec *codec)
+{
+ if (!codec->param_present)
+ return false;
+ if (!codec->param.amr_octet_aligned_present)
+ return false;
+ return codec->param.amr_octet_aligned;
+}
+
/* Compare two codecs, all parameters must match up, except for the payload
type
* number. */
static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec
*codec_b)
@@ -374,6 +384,10 @@
return false;
if (strcmp(codec_a->subtype_name, codec_b->subtype_name))
return false;
+ if (!strcmp(codec_a->subtype_name, "AMR")) {
+ if (amr_is_octet_aligned(codec_a) !=
amr_is_octet_aligned(codec_b))
+ return false;
+ }
return true;
}
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 44e8234..5d4267f 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -1716,7 +1716,6 @@
.amr_octet_aligned = true,
};
-#if 0
static const struct mgcp_codec_param amr_param_octet_aligned_false = {
.amr_octet_aligned_present = true,
.amr_octet_aligned = false,
@@ -1725,7 +1724,6 @@
static const struct mgcp_codec_param amr_param_octet_aligned_unset = {
.amr_octet_aligned_present = false,
};
-#endif
struct testcase_mgcp_codec_pt_translate_codec {
int payload_type;
@@ -1850,6 +1848,58 @@
{ .end = true },
},
},
+ {
+ .descr = "test AMR with differing octet-aligned settings",
+ .codecs = {
+ {
+ { 111, "AMR/8000",
&amr_param_octet_aligned_true, },
+ { 112, "AMR/8000",
&amr_param_octet_aligned_false, },
+ },
+ {
+ { 122, "AMR/8000",
&amr_param_octet_aligned_false, },
+ { 121, "AMR/8000",
&amr_param_octet_aligned_true, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {111, 121}, },
+ { .payload_type_map = {112, 122} },
+ { .end = true },
+ },
+ },
+ {
+ .descr = "test AMR with missing octet-aligned settings
(defaults to 0)",
+ .codecs = {
+ {
+ { 111, "AMR/8000",
&amr_param_octet_aligned_true, },
+ { 112, "AMR/8000",
&amr_param_octet_aligned_false, },
+ },
+ {
+ { 122, "AMR/8000",
&amr_param_octet_aligned_unset, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {111, -EINVAL}, },
+ { .payload_type_map = {112, 122} },
+ { .end = true },
+ },
+ },
+ {
+ .descr = "test AMR with NULL param (defaults to 0)",
+ .codecs = {
+ {
+ { 111, "AMR/8000",
&amr_param_octet_aligned_true, },
+ { 112, "AMR/8000",
&amr_param_octet_aligned_false, },
+ },
+ {
+ { 122, "AMR/8000", NULL, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {111, -EINVAL}, },
+ { .payload_type_map = {112, 122} },
+ { .end = true },
+ },
+ },
};
static void test_mgcp_codec_pt_translate(void)
diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok
index 13d1870..35ca92b 100644
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
@@ -1286,6 +1286,35 @@
- mgcp_codec_pt_translate(conn0, conn1, 112) -> -22
- mgcp_codec_pt_translate(conn0, conn1, 0) -> -22
- mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
+#5: test AMR with differing octet-aligned settings
+ - add codecs on conn0:
+ 0: 111 AMR/8000 octet-aligned=1 -> rc=0
+ 1: 112 AMR/8000 octet-aligned=0 -> rc=0
+ - add codecs on conn1:
+ 0: 122 AMR/8000 octet-aligned=0 -> rc=0
+ 1: 121 AMR/8000 octet-aligned=1 -> rc=0
+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> 121
+ - mgcp_codec_pt_translate(conn1, conn0, 121) -> 111
+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122
+ - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112
+#6: test AMR with missing octet-aligned settings (defaults to 0)
+ - add codecs on conn0:
+ 0: 111 AMR/8000 octet-aligned=1 -> rc=0
+ 1: 112 AMR/8000 octet-aligned=0 -> rc=0
+ - add codecs on conn1:
+ 0: 122 AMR/8000 octet-aligned=unset -> rc=0
+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122
+ - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112
+#7: test AMR with NULL param (defaults to 0)
+ - add codecs on conn0:
+ 0: 111 AMR/8000 octet-aligned=1 -> rc=0
+ 1: 112 AMR/8000 octet-aligned=0 -> rc=0
+ - add codecs on conn1:
+ 0: 122 AMR/8000 -> rc=0
+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122
+ - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112
Testing test_conn_id_matching
needle='23AB' found '000023AB'
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124
Gerrit-Change-Number: 15136
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofm...@sysmocom.de>
Gerrit-MessageType: newchange
