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

Properly match ilbc when handling formats set from routing. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@4366 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2011-05-11 17:11:25 +00:00
parent 8c5ca9bc71
commit 6e60f28f8c
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/yjinglechan.cpp
View File

@ -620,6 +620,33 @@ static inline void jingleAddParam(NamedList& list, const char* param, const char
copy->append(param,",");
}
// Replace 'ilbc' to used ilbc20/30
static void adjustUsedIlbc(String& fmts)
{
if (!fmts)
return;
ObjList* list = fmts.split(',',false);
ObjList* o = list->find("ilbc");
if (o) {
JGRtpMedia* m = 0;
plugin.lock();
for (ObjList* l = s_usedCodecs.skipNull(); l; l = l->skipNext()) {
m = static_cast<JGRtpMedia*>(l->get());
if (m->m_name == "iLBC")
break;
m = 0;
}
if (m)
*(static_cast<String*>(o->get())) = m->m_synonym;
else
o->remove();
plugin.unlock();
fmts.clear();
fmts.append(list,",");
}
TelEngine::destruct(list);
}
#ifdef DEBUG
// Utility function needed for debug: dump a candidate to a string
static void dumpCandidate(String& buf, JGRtpCandidate* c, char sep = ' ')
@ -791,7 +818,9 @@ YJGConnection::YJGConnection(Message& msg, const char* caller, const char* calle
if (null(file)) {
String audio = msg["formats"];
plugin.lock();
if (!(audio || s_usedCodecs.createList(audio,true)))
if (audio)
adjustUsedIlbc(audio);
else if (!s_usedCodecs.createList(audio,true))
audio = "alaw,mulaw";
m_audioFormats.setMedia(s_usedCodecs,audio);
plugin.unlock();