Soundship
/
Loopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #226 from georgkrause/smoothing 

Smoothing, thanks @georgkrause
main
Harry van Haaren 2018-06-23 15:35:47 +01:00 committed by GitHub
parent 754ecd458d 9849918565
commit 4328296257
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 69 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/config.hxx
View File

@ -69,6 +69,9 @@
#define LUPPP_RETURN_WARNING 1
#define LUPPP_RETURN_ERROR 2
// Smoothing value
#define SMOOTHING_CONST 0.05
/// debug.hxx for printing convienience
#include "debug.hxx"

6
src/jack.cxx
View File

@ -265,7 +265,7 @@ Jack::Jack( std::string name ) :
inputVol = 1.0f;
masterVol = 0.75f;
masterVolLag =0.75f;
masterVolDiff =0.0f;
masterMeter = new DBMeter( buffers.samplerate );
inputMeter = new DBMeter( buffers.samplerate );
@ -566,8 +566,7 @@ void Jack::processFrames(int nframes)
buffers.audio[Buffers::SIDECHAIN_SIGNAL_R][i] += inputR * inputToXSideVol;
//compute master volume lag;
if(fabs(masterVol-masterVolLag)>=fabs(masterVolDiff/10.0))
masterVolLag+=masterVolDiff/10.0;
masterVolLag += SMOOTHING_CONST * (masterVol - masterVolLag);
/// mixdown returns into master buffers
buffers.audio[Buffers::JACK_MASTER_OUT_L][i] = (L + returnL*returnVol) * masterVolLag;
buffers.audio[Buffers::JACK_MASTER_OUT_R][i] = (R + returnR*returnVol) * masterVolLag;
@ -673,7 +672,6 @@ void Jack::clearInternalBuffers(int nframes)
void Jack::masterVolume(float vol)
{
masterVol = vol;
masterVolDiff=masterVol-masterVolLag;
}
void Jack::returnVolume(float vol)

1
src/jack.hxx
View File

@ -163,7 +163,6 @@ private:
/// This prohibits audible jumps when rapidly changing the volume
float masterVol;
float masterVolLag;
float masterVolDiff;
float returnVol;
float inputToMixVol;

85
src/trackoutput.cxx
View File

@ -35,11 +35,20 @@ TrackOutput::TrackOutput(int t, AudioProcessor* ap) :
_toMaster = 0.8;
_toMasterLag = 0.8;
_toMasterDiff = 0;
_toMasterPan = 0.f;
_toReverb = 0.0;
_panL = 1.0f;
_panR = 1.0f;
_panLLag = 1.0f;
_panRLag = 1.0f;
_toSend = 0.0;
_toSendLag = 0.0;
// TODO this is unused and can be removed
_toSidechain = 0.0;
_toPostSidechain = 0.0;
_toPostSidechain = 0.0;
_toPostSidechainLag = 0.0;
_toPostfaderActive = 0;
_toKeyActive = 0;
@ -52,7 +61,6 @@ void TrackOutput::setMaster(float value)
if(value < 0.01)
value = 0.f;
_toMaster = value;
_toMasterDiff=_toMaster-_toMasterLag;
}
float TrackOutput::getMaster()
@ -89,14 +97,24 @@ void TrackOutput::setSendActive( int send, bool a )
void TrackOutput::setPan( float pan )
{
_toMasterPan = pan;
/* Trial + Error leads to this algo - its cheap and cheerful */
if (pan <= 0)
{
// pan to left channel, lower right one
_panR = pan + 1.0f;
}
else
{
// pan to right channel, lower left one
_panL = (pan * -1) + 1.0f;
}
}
void TrackOutput::setSend( int send, float value )
{
switch( send ) {
case SEND_POSTFADER:
_toReverb = value;
_toSend = value;
break;
case SEND_KEY:
// setSendActive() handles on/off for this send
@ -114,8 +132,8 @@ void TrackOutput::process(unsigned int nframes, Buffers* buffers)
int trackoffset = track * NCHANNELS;
//compute master volume lag;
if(fabs(_toMaster-_toMasterLag)>=fabs(_toMasterDiff/100.0))
_toMasterLag+=_toMasterDiff/10.0;
_toMasterLag += SMOOTHING_CONST * (_toMaster - _toMasterLag);
// get & zero track buffer
float* trackBufferL = buffers->audio[Buffers::RETURN_TRACK_0_L + trackoffset];
float* trackBufferR = buffers->audio[Buffers::RETURN_TRACK_0_R + trackoffset];
@ -138,9 +156,9 @@ void TrackOutput::process(unsigned int nframes, Buffers* buffers)
uiUpdateCounter += nframes;
// copy audio data into reverb / sidechain / master buffers
float* reverbL = buffers->audio[Buffers::SEND_L];
float* reverbR = buffers->audio[Buffers::SEND_R];
// copy audio data into send / sidechain / master buffers
float* sendL = buffers->audio[Buffers::SEND_L];
float* sendR = buffers->audio[Buffers::SEND_R];
float* sidechainL = buffers->audio[Buffers::SIDECHAIN_KEY_L];
float* sidechainR = buffers->audio[Buffers::SIDECHAIN_KEY_R];
float* postSidechainL = buffers->audio[Buffers::SIDECHAIN_SIGNAL_L];
@ -153,37 +171,40 @@ void TrackOutput::process(unsigned int nframes, Buffers* buffers)
float* jackoutputL = buffers->audio[Buffers::JACK_TRACK_0_L + trackoffset];
float* jackoutputR = buffers->audio[Buffers::JACK_TRACK_0_R + trackoffset];
/* Trial + Error leads to this algo - its cheap and cheerful */
float pan_l = 1.0f;
float pan_r = 1.0f;
if(_toMasterPan <= 0) {
// pan to left channel, lower right one
pan_r = _toMasterPan + 1.0f;
} else {
// pan to right channel, lower left one
pan_l = (_toMasterPan * -1) + 1.0f;
}
for(unsigned int i = 0; i < nframes; i++) {
//compute master volume lag;
_toMasterLag += SMOOTHING_CONST * (_toMaster - _toMasterLag);
// compute pan lag:
_panLLag += SMOOTHING_CONST * (_panL - _panLLag);
_panRLag += SMOOTHING_CONST * (_panR - _panRLag);
// compute send volume lag:
_toSendLag += SMOOTHING_CONST * (_toSend - _toSendLag);
// compute sidechain signal lag
_toPostSidechainLag += SMOOTHING_CONST * (_toPostSidechain - _toPostSidechainLag);
// * master for "post-fader" sends
float tmpL = trackBufferL[i];
float tmpR = trackBufferR[i];
float tmpR = trackBufferR[i];
// post-sidechain *moves* signal between "before/after" ducking, not add!
masterL[i] += tmpL * _toMasterLag * (1-_toPostSidechain) * pan_l;
masterR[i] += tmpR * _toMasterLag * (1-_toPostSidechain) * pan_r;
masterL[i] += tmpL * _toMasterLag * (1-_toPostSidechainLag) * _panLLag;
masterR[i] += tmpR * _toMasterLag * (1-_toPostSidechainLag) * _panRLag;
if(jackoutputL)
jackoutputL[i] = tmpL * _toMasterLag * (1-_toPostSidechain);
jackoutputL[i] = tmpL * _toMasterLag * (1-_toPostSidechainLag);
if(jackoutputR)
jackoutputR[i] = tmpR * _toMasterLag * (1-_toPostSidechain);
jackoutputR[i] = tmpR * _toMasterLag * (1-_toPostSidechainLag);
if ( _toPostfaderActive ) {
reverbL[i] += tmpL * _toReverb * _toMasterLag;
reverbR[i] += tmpR * _toReverb * _toMasterLag;
sendL[i] += tmpL * _toSendLag * _toMasterLag;
sendR[i] += tmpR * _toSendLag * _toMasterLag;
}
if ( _toXSideActive ) {
postSidechainL[i] += tmpL * _toPostSidechain * _toMasterLag;
postSidechainR[i] += tmpR * _toPostSidechain * _toMasterLag;
postSidechainL[i] += tmpL * _toPostSidechainLag * _toMasterLag;
postSidechainR[i] += tmpR * _toPostSidechainLag * _toMasterLag;
}
// turning down an element in the mix should *NOT* influence sidechaining

17
src/trackoutput.hxx
View File

@ -62,17 +62,22 @@ private:
int track;
bool _recordArm;
/// _toMasterLag is a volume that lags behind _toMaster when setMaster() is called
/// This prohibits audible jumps when rapidly changing the volume
// the *Lag values lag behind the corresponding values to avoid audible jumps in volume
float _toMaster;
float _toMasterLag;
float _toMasterDiff;
/* -1 indicates 100% left, 0 is centered, 1 indicates right */
float _toMasterPan;
float _toReverb;
float _panL;
float _panR;
float _panLLag;
float _panRLag;
float _toSend;
float _toSendLag;
float _toSidechain;
float _toPostSidechain;
float _toPostSidechainLag;
bool _toPostfaderActive;
bool _toKeyActive;