12kHz LPF and bug fixes for LtRt matrixing

This commit is contained in:
Jack Andersen
2017-10-01 14:59:18 -10:00
parent 55d1a5bc93
commit db9a5953e6
4 changed files with 157 additions and 68 deletions

View File

@@ -87,7 +87,7 @@ void AudioSubmix::_zeroFill32()
void AudioSubmix::_zeroFillFlt()
{
if (m_scratchFlt.size())
std::fill(m_scratchFlt.begin(), m_scratchFlt.end(), 0);
std::fill(m_scratchFlt.begin(), m_scratchFlt.end(), 0.f);
}
int16_t* AudioSubmix::_getMergeBuf16(size_t frames)
@@ -134,7 +134,7 @@ size_t AudioSubmix::_pumpAndMix16(size_t frames)
if (m_redirect16)
{
if (m_cb && m_cb->canApplyEffect())
m_cb->applyEffect(m_redirect16, frames, chMap, m_root.clientMixInfo().m_sampleRate);
m_cb->applyEffect(m_redirect16, frames, chMap, m_root.mixInfo().m_sampleRate);
m_redirect16 += chanCount * frames;
}
else
@@ -143,7 +143,7 @@ size_t AudioSubmix::_pumpAndMix16(size_t frames)
if (m_scratch16.size() < sampleCount)
m_scratch16.resize(sampleCount);
if (m_cb && m_cb->canApplyEffect())
m_cb->applyEffect(m_scratch16.data(), frames, chMap, m_root.clientMixInfo().m_sampleRate);
m_cb->applyEffect(m_scratch16.data(), frames, chMap, m_root.mixInfo().m_sampleRate);
size_t curSlewFrame = m_slewFrames;
for (auto& smx : m_sendGains)
@@ -194,7 +194,7 @@ size_t AudioSubmix::_pumpAndMix32(size_t frames)
if (m_redirect32)
{
if (m_cb && m_cb->canApplyEffect())
m_cb->applyEffect(m_redirect32, frames, chMap, m_root.clientMixInfo().m_sampleRate);
m_cb->applyEffect(m_redirect32, frames, chMap, m_root.mixInfo().m_sampleRate);
m_redirect32 += chanCount * frames;
}
else
@@ -203,7 +203,7 @@ size_t AudioSubmix::_pumpAndMix32(size_t frames)
if (m_scratch32.size() < sampleCount)
m_scratch32.resize(sampleCount);
if (m_cb && m_cb->canApplyEffect())
m_cb->applyEffect(m_scratch32.data(), frames, chMap, m_root.clientMixInfo().m_sampleRate);
m_cb->applyEffect(m_scratch32.data(), frames, chMap, m_root.mixInfo().m_sampleRate);
size_t curSlewFrame = m_slewFrames;
for (auto& smx : m_sendGains)
@@ -254,7 +254,7 @@ size_t AudioSubmix::_pumpAndMixFlt(size_t frames)
if (m_redirectFlt)
{
if (m_cb && m_cb->canApplyEffect())
m_cb->applyEffect(m_redirectFlt, frames, chMap, m_root.clientMixInfo().m_sampleRate);
m_cb->applyEffect(m_redirectFlt, frames, chMap, m_root.mixInfo().m_sampleRate);
m_redirectFlt += chanCount * frames;
}
else
@@ -263,7 +263,7 @@ size_t AudioSubmix::_pumpAndMixFlt(size_t frames)
if (m_scratchFlt.size() < sampleCount)
m_scratchFlt.resize(sampleCount);
if (m_cb && m_cb->canApplyEffect())
m_cb->applyEffect(m_scratchFlt.data(), frames, chMap, m_root.clientMixInfo().m_sampleRate);
m_cb->applyEffect(m_scratchFlt.data(), frames, chMap, m_root.mixInfo().m_sampleRate);
size_t curSlewFrame = m_slewFrames;
for (auto& smx : m_sendGains)