aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2022-01-13 19:04:59 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2022-07-25 14:24:48 +0200
commit99ab7c57dabde2bb6936eac9c8eabf2d4a11fc5d (patch)
tree4de28386e06b8ef3d66437c6673dc3f2d0759a7e
parent9a515e5db055265227079c157e4b7e6ae8642145 (diff)
in sdp logging: add payload type number like 'AMR#111'
-rw-r--r--src/libmsc/sdp_msg.c3
-rw-r--r--tests/sdp_msg/sdp_msg_test.ok24
2 files changed, 15 insertions, 12 deletions
diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c
index 6f30113c6..08a2186c4 100644
--- a/src/libmsc/sdp_msg.c
+++ b/src/libmsc/sdp_msg.c
@@ -509,8 +509,11 @@ int sdp_audio_codec_to_str_buf(char *buf, size_t buflen, const struct sdp_audio_
{
struct osmo_strbuf sb = { .buf = buf, .len = buflen };
OSMO_STRBUF_PRINTF(sb, "%s", codec->subtype_name);
+ if (codec->rate != 8000)
+ OSMO_STRBUF_PRINTF(sb, "/%u", codec->rate);
if (codec->fmtp[0])
OSMO_STRBUF_PRINTF(sb, ":%s", codec->fmtp);
+ OSMO_STRBUF_PRINTF(sb, "#%d", codec->payload_type);
return sb.chars_needed;
}
diff --git a/tests/sdp_msg/sdp_msg_test.ok b/tests/sdp_msg/sdp_msg_test.ok
index 0b11c51fc..5f84ddd57 100644
--- a/tests/sdp_msg/sdp_msg_test.ok
+++ b/tests/sdp_msg/sdp_msg_test.ok
@@ -566,25 +566,25 @@ sdp_msg_intersection(a,b): a=ptime:20\r\n
test_select
[0]
-SDP: AMR:octet-align=1,GSM,GSM-HR-08,GSM-EFR
-Select: AMR:octet-align=1
-SDP: AMR:octet-align=1,GSM,GSM-HR-08,GSM-EFR
+SDP: AMR:octet-align=1#112,GSM#3,GSM-HR-08#111,GSM-EFR#110
+Select: AMR:octet-align=1#112
+SDP: AMR:octet-align=1#112,GSM#3,GSM-HR-08#111,GSM-EFR#110
[0] ok
[1]
-SDP: AMR:octet-align=1,GSM,GSM-HR-08,GSM-EFR
-Select: GSM
-SDP: GSM,AMR:octet-align=1,GSM-HR-08,GSM-EFR
+SDP: AMR:octet-align=1#112,GSM#3,GSM-HR-08#111,GSM-EFR#110
+Select: GSM#3
+SDP: GSM#3,AMR:octet-align=1#112,GSM-HR-08#111,GSM-EFR#110
[1] ok
[2]
-SDP: AMR:octet-align=1,GSM,GSM-HR-08,GSM-EFR
-Select: GSM-HR-08
-SDP: GSM-HR-08,AMR:octet-align=1,GSM,GSM-EFR
+SDP: AMR:octet-align=1#112,GSM#3,GSM-HR-08#111,GSM-EFR#110
+Select: GSM-HR-08#111
+SDP: GSM-HR-08#111,AMR:octet-align=1#112,GSM#3,GSM-EFR#110
[2] ok
[3]
-SDP: AMR:octet-align=1,GSM,GSM-HR-08,GSM-EFR
-Select: GSM-EFR
-SDP: GSM-EFR,AMR:octet-align=1,GSM,GSM-HR-08
+SDP: AMR:octet-align=1#112,GSM#3,GSM-HR-08#111,GSM-EFR#110
+Select: GSM-EFR#110
+SDP: GSM-EFR#110,AMR:octet-align=1#112,GSM#3,GSM-HR-08#111
[3] ok