neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28782 )
Change subject: in sdp logging: add payload type number like 'AMR#111' ......................................................................
in sdp logging: add payload type number like 'AMR#111'
Related: SYS#5066 Change-Id: Icbb4e89ce2947bf787c3ee14e3e115d406e43de2 --- M src/libmsc/sdp_msg.c M tests/sdp_msg/sdp_msg_test.ok 2 files changed, 15 insertions(+), 12 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve neels: Looks good to me, approved
diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c index 6f30113..08a2186 100644 --- a/src/libmsc/sdp_msg.c +++ b/src/libmsc/sdp_msg.c @@ -509,8 +509,11 @@ { 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 0b11c51..5f84ddd 100644 --- a/tests/sdp_msg/sdp_msg_test.ok +++ b/tests/sdp_msg/sdp_msg_test.ok @@ -566,25 +566,25 @@ 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