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

Wait until the entire MOH buffer is full before pushing it out. 

This fixes sending many short packets over G.711.


git-svn-id: http://yate.null.ro/svn/yate/trunk@4956 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2012-03-05 17:16:20 +00:00
parent 6a19d73e58
commit 03e3154ab9
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/moh.cpp
View File

@ -243,8 +243,15 @@ void MOHSource::run()
u_int64_t tpos = Time::now();
m_time = tpos;
unsigned int pos = 0;
while ((r > 0) && looping()) {
r = (m_in >= 0) ? ::read(m_in,m_data.data(),m_data.length()) : m_data.length();
unsigned int len = m_data.length() - pos;
if (m_in >= 0) {
unsigned char* ptr = m_data.data(pos,len);
r = ptr ? ::read(m_in,ptr,len) : 0;
}
else
r = len;
if (r < 0) {
if (errno == EINTR) {
@ -253,8 +260,12 @@ void MOHSource::run()
}
break;
}
if (r < (int)m_data.length())
m_data.assign(m_data.data(),r);
pos += r;
if (pos < m_data.length()) {
if (!r)
Thread::yield();
continue;
}
if (m_swap) {
uint16_t* p = (uint16_t*)m_data.data();
for (int i = 0; i < r; i+= 2) {
@ -268,6 +279,7 @@ void MOHSource::run()
Thread::usleep((unsigned long)dly);
}
Forward(m_data);
pos = 0;
tpos += (r*1000000ULL/m_brate);
}
}