more wip

tote-bag-labs · Aug 18, 2024 · 5489e7e · 5489e7e
1 parent a86dca7
commit 5489e7e
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 12 deletions.
diff --git a/libs/tote_bag/dsp/Compressor.cpp b/libs/tote_bag/dsp/Compressor.cpp
@@ -62,7 +62,8 @@ void Compressor::setOversampleMultiplier (const int o)
     overSampleMultiplier = o - 1;
 }
 
-inline void Compressor::makeMonoSidechain (const juce::dsp::AudioBlock<float>& inAudio, juce::AudioBuffer<float>& scSignal)
+inline void Compressor::makeMonoSidechain (const juce::dsp::AudioBlock<float>& inAudio,
+                                           juce::AudioBuffer<float>& scSignal)
 {
     scSignal.clear();
     auto* scWritePointer = scSignal.getWritePointer (0);
@@ -101,7 +102,9 @@ inline float Compressor::calculateGain (float inputSample)
 
         else if (abs (doubleOvershoot) <= W)
         {
-            cvOutput = inputSample + ((1.0f / R - 1.0f) * powf (overshoot + W / 2.0f, 2)) / (2.0f * W);
+            cvOutput =
+                inputSample
+                + ((1.0f / R - 1.0f) * powf (overshoot + W / 2.0f, 2)) / (2.0f * W);
         }
         else
         {
@@ -121,9 +124,18 @@ inline float Compressor::getMakeupGain()
     return -threshold.get() * (1.0f / ratio.get() - 1.0f) / 2.0f;
 }
 
-void Compressor::process (juce::dsp::AudioBlock<float>& inAudio)
+void Compressor::process (juce::dsp::AudioBlock<float>& inAudio,
+                          juce::dsp::AudioBlock<float>* SChain)
 {
-    makeMonoSidechain (inAudio, analysisSignal);
+    if (SChain)
+    {
+        makeMonoSidechain (*SChain, analysisSignal);
+    }
+    else
+    {
+        makeMonoSidechain (inAudio, analysisSignal);
+    }
+
     auto numSamples = inAudio.getNumSamples();
     auto numChannels = inAudio.getNumChannels();
 
@@ -132,7 +144,8 @@ void Compressor::process (juce::dsp::AudioBlock<float>& inAudio)
     {
         auto controlVoltage = juce::Decibels::gainToDecibels (abs (sidechain[sample]));
         // TODO: level detector methods should be float or templated
-        controlVoltage = static_cast<float> (levelDetector.processSampleDecoupledBranched (controlVoltage));
+        controlVoltage = static_cast<float> (
+            levelDetector.processSampleDecoupledBranched (controlVoltage));
 
         controlVoltage = calculateGain (controlVoltage);
         controlVoltage = juce::Decibels::decibelsToGain (controlVoltage);

diff --git a/libs/tote_bag/dsp/Compressor.h b/libs/tote_bag/dsp/Compressor.h
@@ -35,7 +35,7 @@ class Compressor
 
     float calculateGain (float analysisSample);
 
-    void process (juce::dsp::AudioBlock<float>& inAudio);
+    void process (juce::dsp::AudioBlock<float>& inAudio, juce::dsp::AudioBlock<float>* sidechain = nullptr);
 
     float getMakeupGain();
 

diff --git a/src/PluginProcessor.cpp b/src/PluginProcessor.cpp
@@ -84,6 +84,9 @@ ValentineAudioProcessor::ValentineAudioProcessor()
     , presetManager (this)
     , processedDelayLine (32)
     , cleanDelayLine (32)
+    , sidechainOversampler (2,
+                            detail::kOversampleFactor,
+                            Oversampling::filterHalfBandPolyphaseIIR)
 #endif
 {
     initializeDSP();
@@ -254,6 +257,8 @@ void ValentineAudioProcessor::prepareToPlay (double sampleRate, int samplesPerBl
 
     oversampler->reset();
     oversampler->initProcessing (static_cast<size_t> (samplesPerBlock));
+    sidechainOversampler.reset();
+    sidechainOversampler.initProcessing (static_cast<size_t> (samplesPerBlock));
 
     saturator->reset (sampleRate);
     boundedSaturator->reset (sampleRate);
@@ -311,7 +316,7 @@ void ValentineAudioProcessor::processBlock (juce::AudioBuffer<float>& buffer,
     auto totalNumOutputChannels = getTotalNumOutputChannels();
 
     auto inputOutputBuffer = getBusBuffer (buffer, true, 0);
-    const auto sideChainBuffer = getBusBuffer (buffer, true, 1);
+    auto sideChainBuffer = getBusBuffer (buffer, true, 1);
 
     const auto numMainInputChannels = inputOutputBuffer.getNumChannels();
 
@@ -364,16 +369,41 @@ void ValentineAudioProcessor::processBlock (juce::AudioBuffer<float>& buffer,
     }
 
     auto g = compressValue.get();
-    for (int i = 0; i < totalNumOutputChannels; ++i)
-        processBuffer.applyGainRamp (i, 0, bufferSize, currentGain, g);
+
+    if (sideChainBuffer.getNumChannels() > 0)
+    {
+        for (int i = 0; i < totalNumOutputChannels; ++i)
+        {
+            sideChainBuffer.applyGainRamp (i, 0, bufferSize, currentGain, g);
+        }
+    }
+    else
+    {
+        for (int i = 0; i < totalNumOutputChannels; ++i)
+            processBuffer.applyGainRamp (i, 0, bufferSize, currentGain, g);
+    }
+
+    // for (int i = 0; i < totalNumOutputChannels; ++i)
+    //     processBuffer.applyGainRamp (i, 0, bufferSize, currentGain, g);
+
     currentGain = g;
 
     // Upsample then do non-linear processing
     juce::dsp::AudioBlock<float> processBlock (processBuffer);
     juce::dsp::AudioBlock<float> highSampleRateBlock =
         oversampler->processSamplesUp (processBlock);
 
-    ffCompressor->process (highSampleRateBlock);
+    if (sideChainBuffer.getNumChannels() > 0)
+    {
+        juce::dsp::AudioBlock<float> sidechain (sideChainBuffer);
+        juce::dsp::AudioBlock<float> highSampleRateSideChain =
+            sidechainOversampler.processSamplesUp (sideChainBuffer);
+        ffCompressor->process (highSampleRateBlock, &highSampleRateSideChain);
+    }
+    else
+    {
+        ffCompressor->process (highSampleRateBlock);
+    }
 
     if (saturateOn.get())
     {

diff --git a/src/PluginProcessor.h b/src/PluginProcessor.h
@@ -199,8 +199,8 @@ class ValentineAudioProcessor : public juce::AudioProcessor,
         FFCompParameterDefaults[static_cast<size_t> (VParameter::outputClipEnable)]
         > 0.5f};
     bool clipOnState = clipOn.get();
-    juce::Atomic<bool> saturateOn = FFCompParameterDefaults[static_cast<size_t> (VParameter::saturateEnable)]
-        > 0.5f;
+    juce::Atomic<bool> saturateOn =
+        FFCompParameterDefaults[static_cast<size_t> (VParameter::saturateEnable)] > 0.5f;
     bool saturateOnState = saturateOn.get();
 
     // This is used for, yes you guessed it, processing
@@ -209,6 +209,7 @@ class ValentineAudioProcessor : public juce::AudioProcessor,
     // DSP objects
     std::unique_ptr<tote_bag::audio_helpers::SimpleOnePole<float>> dryWetFilter;
     std::unique_ptr<Oversampling> oversampler;
+    Oversampling sidechainOversampler;
     std::unique_ptr<Compressor> ffCompressor;
     std::unique_ptr<Saturation> saturator;
     std::unique_ptr<Saturation> boundedSaturator;