retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Add new clearmode codec support for data calls #2

Merged
laforge merged 1 commits from Manawyrm/yate:manawyrm-clearmode into master 2023-09-19 16:20:18 +00:00
Conversation 4 Commits 1 Files Changed 7 +28 -7
7 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf.d/ysipchan.conf.sample
View File

@ -449,6 +449,9 @@
; alaw: bool: Companded-only G711 a-law (PCMU/8000) ; alaw: bool: Companded-only G711 a-law (PCMU/8000)
;alaw=default ;alaw=default
; clearmode: bool: Transparent 64kbit/s B channel (RFC4040)
;clearmode=default
; gsm: bool: European GSM 06.10 (GSM/8000) ; gsm: bool: European GSM 06.10 (GSM/8000)
;gsm=default ;gsm=default

1
engine/DataFormat.cpp
View File

@ -44,6 +44,7 @@ static const FormatInfo s_formats[] = {
FormatInfo("ilbc30", 50, 30000), FormatInfo("ilbc30", 50, 30000),
// FormatInfo("speex", 0), // FormatInfo("speex", 0),
FormatInfo("g729", 10, 10000), FormatInfo("g729", 10, 10000),
FormatInfo("clearmode", 80, 20000, "data", 0, 1, false),
FormatInfo("plain", 0, 0, "text", 0), FormatInfo("plain", 0, 0, "text", 0),
FormatInfo("raw", 0, 0, "data", 0), FormatInfo("raw", 0, 0, "data", 0),
}; };

2
libs/ysdp/parser.cpp
View File

@ -30,6 +30,7 @@ namespace TelEngine {
const TokenDict SDPParser::s_payloads[] = { const TokenDict SDPParser::s_payloads[] = {
{ "mulaw", 0 }, { "mulaw", 0 },
{ "alaw", 8 }, { "alaw", 8 },
{ "clearmode", 97 },
{ "gsm", 3 }, { "gsm", 3 },
{ "lpc10", 7 }, { "lpc10", 7 },
{ "2*slin", 10 }, { "2*slin", 10 },
@ -91,6 +92,7 @@ const TokenDict SDPParser::s_rtpmap[] = {
{ "MPA/90000", 14 }, { "MPA/90000", 14 },
{ "iLBC/8000", 98 }, { "iLBC/8000", 98 },
{ "AMR/8000", 96 }, { "AMR/8000", 96 },
{ "CLEARMODE/8000", 97 },
{ "AMR-WB/16000", 99 }, { "AMR-WB/16000", 99 },
{ "SPEEX/8000", 102 }, { "SPEEX/8000", 102 },
{ "SPEEX/16000", 103 }, { "SPEEX/16000", 103 },

18
libs/ysig/q931.cpp
View File

@ -1665,9 +1665,21 @@ bool ISDNQ931Call::sendSetup(SignallingMessage* sigMsg)
m_data.m_transferCapability = sigMsg->params().getValue(YSTRING("transfer-cap"), "speech"); m_data.m_transferCapability = sigMsg->params().getValue(YSTRING("transfer-cap"), "speech");
m_data.m_transferMode = "circuit"; m_data.m_transferMode = "circuit";
m_data.m_transferRate = "64kbit"; m_data.m_transferRate = "64kbit";
m_data.m_format = sigMsg->params().getValue(YSTRING("format"),q931()->format());
if (0xffff == lookup(m_data.m_format,Q931Parser::s_dict_bearerProto1,0xffff)) const char *formats = sigMsg->params().getValue(YSTRING("formats"), "");
m_data.m_format = "alaw";
if (formats && strcmp(formats, "clearmode") == 0)
{
m_data.m_format = "clearmode";
m_data.m_transferCapability = "udi";
}
else
{
m_data.m_format = sigMsg->params().getValue(YSTRING("format"),q931()->format());
if (0xffff == lookup(m_data.m_format,Q931Parser::s_dict_bearerProto1,0xffff))
m_data.m_format = "alaw";
}
m_data.processBearerCaps(msg,true); m_data.processBearerCaps(msg,true);
// ChannelID // ChannelID
if (!m_circuit) if (!m_circuit)

1
modules/server/ysigchan.cpp
View File

@ -1225,6 +1225,7 @@ bool SigChannel::startCall(Message& msg, SigTrunk* trunk)
sigMsg->params().addParam("callername",msg.getValue("callername")); sigMsg->params().addParam("callername",msg.getValue("callername"));
sigMsg->params().copyParam(msg,"circuits"); sigMsg->params().copyParam(msg,"circuits");
sigMsg->params().copyParam(msg,"format"); sigMsg->params().copyParam(msg,"format");
sigMsg->params().copyParam(msg,"formats");
sigMsg->params().copyParam(msg,"callernumtype"); sigMsg->params().copyParam(msg,"callernumtype");
sigMsg->params().copyParam(msg,"callernumplan"); sigMsg->params().copyParam(msg,"callernumplan");
if (msg.getValue("privacy") && msg.getBoolValue("privacy",true)) if (msg.getValue("privacy") && msg.getBoolValue("privacy",true))

9
modules/server/zapcard.cpp
View File

@ -981,10 +981,11 @@ static TokenDict s_types[] = {
#undef MAKE_NAME #undef MAKE_NAME
static TokenDict s_formats[] = { static TokenDict s_formats[] = {
{"slin", ZapDevice::Slin}, {"slin", ZapDevice::Slin},
{"default", ZapDevice::Default}, {"default", ZapDevice::Default},
{"mulaw", ZapDevice::Mulaw}, {"mulaw", ZapDevice::Mulaw},
{"alaw", ZapDevice::Alaw}, {"alaw", ZapDevice::Alaw},
{"clearmode", ZapDevice::Alaw},
{0,0} {0,0}
}; };
#ifdef HAVE_ZAP #ifdef HAVE_ZAP

1
modules/yrtpchan.cpp
View File

@ -38,6 +38,7 @@ namespace { // anonymous
static TokenDict dict_payloads[] = { static TokenDict dict_payloads[] = {
{ "mulaw", 0 }, { "mulaw", 0 },
{ "alaw", 8 }, { "alaw", 8 },
{ "clearmode", 97 },
{ "gsm", 3 }, { "gsm", 3 },
{ "lpc10", 7 }, { "lpc10", 7 },
{ "2*slin", 10 }, { "2*slin", 10 },