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

Fixed downsampler - correct signedness in averaging. 

Fixed timestamp transformation in resampler.
Reference: first 2 issues of bug report #60 by mikma.


git-svn-id: http://voip.null.ro/svn/yate@1117 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2006-11-24 14:51:21 +00:00
parent f36c54ed98
commit b8edd7a4d1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/DataFormat.cpp
View File

@ -178,16 +178,17 @@ public:
if (!n || (n & 1) || !m_sRate || !m_dRate || !ref())
return;
n /= 2;
if (getTransSource()) {
DataSource* src = getTransSource();
if (src) {
long delta = tStamp - m_timestamp;
unsigned short* s = (unsigned short*) data.data();
short* s = (short*) data.data();
DataBlock oblock;
if (m_dRate > m_sRate) {
int mul = m_dRate / m_sRate;
// repeat the sample an integer number of times
delta *= mul;
oblock.assign(0,2*n*mul);
unsigned short* d = (unsigned short*) oblock.data();
short* d = (short*) oblock.data();
while (n--) {
// TODO: smooth the data a little
short v = *s++;
@ -201,7 +202,7 @@ public:
delta /= div;
n /= div;
oblock.assign(0,2*n);
unsigned short* d = (unsigned short*) oblock.data();
short* d = (short*) oblock.data();
while (n--) {
// TODO: interpolate
int v = 0;
@ -216,7 +217,9 @@ public:
*d++ = v;
}
}
getTransSource()->Forward(oblock, m_timestamp + delta);
if (src->timeStamp() != invalidStamp())
delta += src->timeStamp();
src->Forward(oblock, delta);
}
deref();
}