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

Linear interpolate audio data when upsampling to reduce artifacts. 

git-svn-id: http://voip.null.ro/svn/yate@5187 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2012-07-06 12:28:05 +00:00
parent bca21af985
commit 53692fe085
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/DataFormat.cpp
View File

@ -189,10 +189,11 @@ class ResampTranslator : public DataTranslator
{
private:
int m_sRate, m_dRate;
short m_last;
public:
ResampTranslator(const DataFormat& sFormat, const DataFormat& dFormat)
: DataTranslator(sFormat,dFormat),
m_sRate(sFormat.sampleRate()), m_dRate(dFormat.sampleRate())
m_sRate(sFormat.sampleRate()), m_dRate(dFormat.sampleRate()), m_last(0)
{ }
virtual unsigned long Consume(const DataBlock& data, unsigned long tStamp, unsigned long flags)
{
@ -208,15 +209,15 @@ public:
DataBlock oblock;
if (m_dRate > m_sRate) {
int mul = m_dRate / m_sRate;
// repeat the sample an integer number of times
// linear interpolation between existing samples
delta *= mul;
oblock.assign(0,2*n*mul);
short* d = (short*) oblock.data();
while (n--) {
// TODO: smooth the data a little
short v = *s++;
for (int i = 0; i < mul; i++)
*d++ = v;
for (int i = 1; i <= mul; i++)
*d++ = ((m_last * (mul - i)) + (v * i)) / mul;
m_last = v;
}
}
else {
@ -227,7 +228,6 @@ public:
oblock.assign(0,2*n);
short* d = (short*) oblock.data();
while (n--) {
// TODO: interpolate
int v = 0;
for (int i = 0; i < div; i++)
v += *s++;