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/.
dexter gerrit-no-reply at lists.osmocom.orgdexter has uploaded this change for review. ( https://gerrit.osmocom.org/12979
Change subject: Add option to GSM HR frames to RFC5593 representation
......................................................................
Add option to GSM HR frames to RFC5593 representation
There are different specifications around on how a GSM-HR frame should
be encapsulated into an RTP packet. RFC5593 specifies a ToC (Table of
contents byte to be prepended in front of the payload data along with
some additional shuffeling of the actual payload data.
The two formates can be distinguished easyly by their length. Then the
data can be formatted into the corresponding opposite format and vice
versa.
- Add new VTY rtp-patch options
- Add conversion function
Change-Id: Iceef19e5619f8c92dfa7c8cdecb2e9b15f0a11a1
Related: OS#3807
---
M include/osmocom/mgcp/mgcp.h
M include/osmocom/mgcp/mgcp_internal.h
M src/libosmo-mgcp/mgcp_network.c
M src/libosmo-mgcp/mgcp_protocol.c
M src/libosmo-mgcp/mgcp_vty.c
5 files changed, 124 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/79/12979/1
diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h
index 7597af8..783cf1f 100644
--- a/include/osmocom/mgcp/mgcp.h
+++ b/include/osmocom/mgcp/mgcp.h
@@ -190,6 +190,7 @@
/* RTP patching */
int force_constant_ssrc; /* 0: don't, 1: once */
int force_aligned_timing;
+ int rfc5993_hr_convert;
/* spec handling */
int force_realloc;
diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h
index 14c5f11..89a4649 100644
--- a/include/osmocom/mgcp/mgcp_internal.h
+++ b/include/osmocom/mgcp/mgcp_internal.h
@@ -128,6 +128,7 @@
int force_constant_ssrc; /* -1: always, 0: don't, 1: once */
/* should we perform align_rtp_timestamp_offset() (1) or not (0) */
int force_aligned_timing;
+ int rfc5993_hr_convert;
/* Each end has a separate socket for RTP and RTCP */
struct osmo_fd rtp;
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index 2c86f8f..09302d8 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -43,6 +43,7 @@
#include <osmocom/mgcp/mgcp_endp.h>
#include <osmocom/mgcp/mgcp_codec.h>
#include <osmocom/mgcp/debug.h>
+#include <osmocom/codec/codec.h>
#define RTP_SEQ_MOD (1 << 16)
@@ -651,6 +652,73 @@
#endif
}
+/* This has been ported from openbsc.git, branch sylvain/32c3_codec,
+ * commit f198259f57f868bc85726cbac3df47b143b0300f, original author is
+ * Sylvain Munaut <tnt at 246tNt.com> */
+static void hr_jumble(uint8_t *dst, const uint8_t *src)
+{
+ const int p_unvoiced[] =
+ { 5, 11, 9, 8, 1, 2, 7, 7, 5, 7, 7, 5, 7, 7, 5, 7, 7, 5 };
+ const int p_voiced[] =
+ { 5, 11, 9, 8, 1, 2, 8, 9, 5, 4, 9, 5, 4, 9, 5, 4, 9, 5 };
+
+ int base, i, j, l, si, di;
+ int *p;
+
+ memset(dst, 0x00, 14);
+
+ p = (src[4] & 0x30) ? p_voiced : p_unvoiced;
+
+ base = 0;
+ for (i = 0; i < 18; i++) {
+ l = p[i];
+ for (j = 0; j < l; j++) {
+ si = base + j;
+ di = base + l - j - 1;
+
+ if (src[si >> 3] & (1 << (7 - (si & 7))))
+ dst[di >> 3] |= (1 << (7 - (di & 7)));
+ }
+
+ base += l;
+ }
+}
+
+/* There are different dialects used to format and transfer voice data. When
+ * the receiving end expects GSM-HR data to be formated after RFC 5993, this
+ * function is used to convert between RFC 5993 and TS 101318, which we normally
+ * use. */
+static void rfc5993_hr_convert(struct mgcp_rtp_end *rtp_end, char *data,
+ int *len)
+{
+ /* NOTE: *data has an overall length of RTP_BUF_SIZE, so there is
+ * plenty of space available to store the slightly larger, converted
+ * data */
+
+ struct rtp_hdr *rtp_hdr;
+ uint8_t buf[GSM_HR_BYTES];
+
+ if (!rtp_end->rfc5993_hr_convert)
+ return;
+
+ OSMO_ASSERT(*len >= sizeof(struct rtp_hdr));
+ rtp_hdr = (struct rtp_hdr *)data;
+
+ if (*len == GSM_HR_BYTES + sizeof(struct rtp_hdr)) {
+ /* TS 101318 encoding => RFC 5993 encoding */
+ memcpy(buf, rtp_hdr->data, GSM_HR_BYTES);
+ hr_jumble(rtp_hdr->data + 1, buf);
+ rtp_hdr->data[0] = 0x00;
+ (*len) += 1;
+
+ } else if (*len == GSM_HR_BYTES + sizeof(struct rtp_hdr) + 1) {
+ /* RFC 5993 encoding => TS 101318 encoding */
+ memcpy(buf, rtp_hdr->data + 1, GSM_HR_BYTES);
+ hr_jumble(rtp_hdr->data, buf);
+ (*len) -= 1;
+ }
+}
+
/* Forward data to a debug tap. This is debug function that is intended for
* debugging the voice traffic with tools like gstreamer */
static void forward_data(int fd, struct mgcp_rtp_tap *tap, const char *buf,
@@ -758,6 +826,9 @@
if (addr)
mgcp_patch_and_count(endp, rtp_state, rtp_end,
addr, buf, buflen);
+
+ rfc5993_hr_convert(rtp_end, buf, &buflen);
+
LOGP(DRTP, LOGL_DEBUG,
"endpoint:0x%x process/send to %s %s "
"rtp_port:%u rtcp_port:%u\n",
diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index 9f95ea4..82db02f 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -652,6 +652,7 @@
rtp->force_aligned_timing = tcfg->force_aligned_timing;
rtp->force_constant_ssrc = patch_ssrc ? 1 : 0;
+ rtp->rfc5993_hr_convert = tcfg->rfc5993_hr_convert;
LOGP(DLMGCP, LOGL_DEBUG,
"Configuring RTP endpoint: local port %d%s%s\n",
diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c
index ef63b04..c07018b 100644
--- a/src/libosmo-mgcp/mgcp_vty.c
+++ b/src/libosmo-mgcp/mgcp_vty.c
@@ -96,13 +96,17 @@
else
vty_out(vty, " no rtcp-omit%s", VTY_NEWLINE);
if (g_cfg->trunk.force_constant_ssrc
- || g_cfg->trunk.force_aligned_timing) {
+ || g_cfg->trunk.force_aligned_timing
+ || g_cfg->trunk.rfc5993_hr_convert) {
vty_out(vty, " %srtp-patch ssrc%s",
g_cfg->trunk.force_constant_ssrc ? "" : "no ",
VTY_NEWLINE);
vty_out(vty, " %srtp-patch timestamp%s",
g_cfg->trunk.force_aligned_timing ? "" : "no ",
VTY_NEWLINE);
+ vty_out(vty, " %srtp-patch rfc5993hr%s",
+ g_cfg->trunk.rfc5993_hr_convert ? "" : "no ",
+ VTY_NEWLINE);
} else
vty_out(vty, " no rtp-patch%s", VTY_NEWLINE);
if (g_cfg->trunk.audio_payload != -1)
@@ -722,11 +726,28 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_mgcp_patch_rtp_rfc5993hr,
+ cfg_mgcp_patch_rtp_rfc5993hr_cmd,
+ "rtp-patch rfc5993hr", RTP_PATCH_STR "Convert GSM-HR to rfc5993 and back\n")
+{
+ g_cfg->trunk.rfc5993_hr_convert = 1;
+ return CMD_SUCCESS;
+}
+
+DEFUN(cfg_mgcp_no_patch_rtp_rfc5993hr,
+ cfg_mgcp_no_patch_rtp_rfc5993hr_cmd,
+ "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR "Convert GSM-HR to rfc5993 and back\n")
+{
+ g_cfg->trunk.rfc5993_hr_convert = 1;
+ return CMD_SUCCESS;
+}
+
DEFUN(cfg_mgcp_no_patch_rtp,
cfg_mgcp_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR)
{
g_cfg->trunk.force_constant_ssrc = 0;
g_cfg->trunk.force_aligned_timing = 0;
+ g_cfg->trunk.rfc5993_hr_convert = 0;
return CMD_SUCCESS;
}
@@ -823,13 +844,17 @@
vty_out(vty, " rtcp-omit%s", VTY_NEWLINE);
else
vty_out(vty, " no rtcp-omit%s", VTY_NEWLINE);
- if (trunk->force_constant_ssrc || trunk->force_aligned_timing) {
+ if (trunk->force_constant_ssrc || trunk->force_aligned_timing
+ || g_cfg->trunk.rfc5993_hr_convert) {
vty_out(vty, " %srtp-patch ssrc%s",
trunk->force_constant_ssrc ? "" : "no ",
VTY_NEWLINE);
vty_out(vty, " %srtp-patch timestamp%s",
trunk->force_aligned_timing ? "" : "no ",
VTY_NEWLINE);
+ vty_out(vty, " %srtp-patch rfc5993hr%s",
+ trunk->rfc5993_hr_convert ? "" : "no ",
+ VTY_NEWLINE);
} else
vty_out(vty, " no rtp-patch%s", VTY_NEWLINE);
if (trunk->audio_fmtp_extra)
@@ -995,12 +1020,31 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_trunk_patch_rtp_rfc5993hr,
+ cfg_trunk_patch_rtp_rfc5993hr_cmd,
+ "rtp-patch rfc5993hr", RTP_PATCH_STR "Convert GSM-HR to rfc5993 and back\n")
+{
+ struct mgcp_trunk_config *trunk = vty->index;
+ trunk->rfc5993_hr_convert = 1;
+ return CMD_SUCCESS;
+}
+
+DEFUN(cfg_trunk_no_patch_rtp_rfc5993hr,
+ cfg_trunk_no_patch_rtp_rfc5993hr_cmd,
+ "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR "Convert GSM-HR to rfc5993 and back\n")
+{
+ struct mgcp_trunk_config *trunk = vty->index;
+ trunk->rfc5993_hr_convert = 0;
+ return CMD_SUCCESS;
+}
+
DEFUN(cfg_trunk_no_patch_rtp,
cfg_trunk_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR)
{
struct mgcp_trunk_config *trunk = vty->index;
trunk->force_constant_ssrc = 0;
trunk->force_aligned_timing = 0;
+ trunk->rfc5993_hr_convert = 0;
return CMD_SUCCESS;
}
@@ -1400,6 +1444,8 @@
install_element(MGCP_NODE, &cfg_mgcp_patch_rtp_ts_cmd);
install_element(MGCP_NODE, &cfg_mgcp_no_patch_rtp_ts_cmd);
install_element(MGCP_NODE, &cfg_mgcp_no_patch_rtp_cmd);
+ install_element(MGCP_NODE, &cfg_mgcp_patch_rtp_rfc5993hr_cmd);
+ install_element(MGCP_NODE, &cfg_mgcp_no_patch_rtp_rfc5993hr_cmd);
install_element(MGCP_NODE, &cfg_mgcp_sdp_fmtp_extra_cmd);
install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_send_ptime_cmd);
install_element(MGCP_NODE, &cfg_mgcp_no_sdp_payload_send_ptime_cmd);
@@ -1431,6 +1477,8 @@
install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_ssrc_cmd);
install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_ssrc_cmd);
install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_ts_cmd);
+ install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_rfc5993hr_cmd);
+ install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_rfc5993hr_cmd);
install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_ts_cmd);
install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_cmd);
install_element(TRUNK_NODE, &cfg_trunk_sdp_fmtp_extra_cmd);
--
To view, visit https://gerrit.osmocom.org/12979
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iceef19e5619f8c92dfa7c8cdecb2e9b15f0a11a1
Gerrit-Change-Number: 12979
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190220/e4b30b24/attachment.htm>