mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-01-21 12:58:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1315 from diizy/stable-1.1

Browse Source 
Add class RmsHelper to help with RMS
This commit is contained in:
Vesa V
2014-11-17 12:59:57 +02:00
parent 26415cd53e 415652ad25
commit c42ae751fa
3 changed files with 123 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/dynamics_processor/dynamics_processor.cpp
View File

@@ -58,7 +58,10 @@ dynProcEffect::dynProcEffect( Model * _parent,
m_dpControls( this )
{
m_currentPeak[0] = m_currentPeak[1] = DYN_NOISE_FLOOR;
m_needsUpdate = true;
m_rms[0] = new RmsHelper( 64 * engine::mixer()->processingSampleRate() / 44100 );
m_rms[1] = new RmsHelper( 64 * engine::mixer()->processingSampleRate() / 44100 );
calcAttack();
calcRelease();
}
@@ -66,6 +69,8 @@ dynProcEffect::dynProcEffect( Model * _parent,
dynProcEffect::~dynProcEffect()
{
delete m_rms[0];
delete m_rms[1];
}
@@ -110,15 +115,25 @@ bool dynProcEffect::processAudioBuffer( sampleFrame * _buf,
// debug code
// qDebug( "peaks %f %f", m_currentPeak[0], m_currentPeak[1] );
if( m_dpControls.m_attackModel.isValueChanged() || m_needsUpdate )
if( m_needsUpdate )
{
m_rms[0]->setSize( 64 * engine::mixer()->processingSampleRate() / 44100 );
m_rms[1]->setSize( 64 * engine::mixer()->processingSampleRate() / 44100 );
calcAttack();
}
if( m_dpControls.m_releaseModel.isValueChanged() || m_needsUpdate )
{
calcRelease();
m_needsUpdate = false;
}
else
{
if( m_dpControls.m_attackModel.isValueChanged() )
{
calcAttack();
}
if( m_dpControls.m_releaseModel.isValueChanged() )
{
calcRelease();
}
}
m_needsUpdate = false;
for( fpp_t f = 0; f < _frames; ++f )
{
@@ -131,14 +146,15 @@ bool dynProcEffect::processAudioBuffer( sampleFrame * _buf,
// update peak values
for ( i=0; i <= 1; i++ )
{
if( qAbs( s[i] ) > m_currentPeak[i] )
const double t = m_rms[i]->update( s[i] );
if( t > m_currentPeak[i] )
{
m_currentPeak[i] = qMin( m_currentPeak[i] * m_attCoeff, qAbs( s[i] ) );
m_currentPeak[i] = qMin( m_currentPeak[i] * m_attCoeff, t );
}
else
if( qAbs( s[i] ) < m_currentPeak[i] )
if( t < m_currentPeak[i] )
{
m_currentPeak[i] = qMax( m_currentPeak[i] * m_relCoeff, qAbs( s[i] ) );
m_currentPeak[i] = qMax( m_currentPeak[i] * m_relCoeff, t );
}
m_currentPeak[i] = qBound( DYN_NOISE_FLOOR, m_currentPeak[i], 10.0f );