32x oversampling + enable high-quality oversampling (#90)

* Add 32x oversampling
* Enable high-quality oversampling
* Bump minor version and update docs

Author: vvvar

.vscode/tasks.json

@@ -14,7 +14,11 @@
       "problemMatcher": [
         "$gcc"
       ],
-      "command": "just build"
+      "command": "just build",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
     },
     {
       "label": "Run",
@@ -39,6 +43,6 @@
         "$gcc"
       ],
       "command": "just test"
-    },
+    }
   ]
 }

README.md

@@ -118,7 +118,7 @@ You can read more about the difference between Hard and Soft clipping [here](htt
 
 <img src="assets/screenshots/screenshot-oversample.png" alt="oversample" height="100"/>
 
-Choose between 2x, 4x, 8x, and 16x oversampling to avoid signal aliasing. You can also turn off oversampling.
+Choose between 2x, 4x, 8x, 16x and 32x oversampling to avoid signal aliasing. You can also turn off oversampling.
 
 > **Note** High values of oversampling may hurt CPU performance.
 

assets/screenshots/screenshot-oversample.png

@@ -5,7 +5,7 @@
 
 class PeakEater(ConanFile):
     name = "peakeater"
-    version = "0.6.5"
+    version = "0.7.0"
     user = "vvvar"
     channel = "testing"
     company = "T-Audio"

conanfile.py

@@ -24,8 +24,8 @@ BreakBeforeBraces: Allman
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 BreakStringLiterals: false
-ColumnLimit: 150
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ColumnLimit: 120
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: false
@@ -62,7 +62,7 @@ Language: ObjC
 BasedOnStyle: Chromium
 AlignTrailingComments: true
 BreakBeforeBraces: Allman
-ColumnLimit: 150
+ColumnLimit: 120
 IndentWidth: 4
 KeepEmptyLinesAtTheStartOfBlocks: false
 ObjCSpaceAfterProperty: true

config/.clang-format

@@ -33,7 +33,8 @@ namespace controller
     public:
         //==============================================================================
         WaveShaperController()
-            : waveShaper(), previousLinkInOut (false), previousInputGain (0.0f), previousOutputGain (0.0f), previousCeiling (0.0f), previousClippingType (0), previousOversampleRate (0)
+            : waveShaper(), previousLinkInOut (false), previousInputGain (0.0f), previousOutputGain (0.0f),
+              previousCeiling (0.0f), previousClippingType (0), previousOversampleRate (0)
         {
         }
 
@@ -53,10 +54,7 @@ namespace controller
             waveShaper.onPostOutputGain (handler);
         }
 
-        void unsubscribeFromAll()
-        {
-            waveShaper.unsubscribeFromAll();
-        }
+        void unsubscribeFromAll() { waveShaper.unsubscribeFromAll(); }
 
         void handleParametersChange (WaveShaperPrameters parameters) noexcept
         {
@@ -104,25 +102,13 @@ namespace controller
             waveShaper.setOutputGain (previousOutputGain);
         }
 
-        void process (juce::AudioBuffer<T>& buffer)
-        {
-            waveShaper.process (buffer);
-        }
+        void process (juce::AudioBuffer<T>& buffer) { waveShaper.process (buffer); }
 
-        void reset()
-        {
-            waveShaper.reset();
-        }
+        void reset() { waveShaper.reset(); }
 
-        float getPreviousInputGain() const
-        {
-            return previousInputGain;
-        }
+        float getPreviousInputGain() const { return previousInputGain; }
 
-        float getPreviousOutputGain() const
-        {
-            return previousOutputGain;
-        }
+        float getPreviousOutputGain() const { return previousOutputGain; }
 
     private:
         //==============================================================================
@@ -174,6 +160,8 @@ namespace controller
                     return OversamplingRate::X8;
                 case 4:
                     return OversamplingRate::X16;
+                case 5:
+                    return OversamplingRate::X32;
                 default:
                     return OversamplingRate::X1;
             }

source/Controller/WaveShaperController.h

@@ -34,13 +34,11 @@ namespace dsp
 
             //==============================================================================
             OversampledClipper (const unsigned int factor = 1) noexcept
-                : oversampler (2, factor, Oversampling::filterHalfBandPolyphaseIIR, false)
+                : oversampler (2, factor, Oversampling::filterHalfBandPolyphaseIIR, true)
             {
             }
 
-            ~OversampledClipper() override
-            {
-            }
+            ~OversampledClipper() override {}
 
             //==============================================================================
             /** Inheritet implemented methods */
@@ -53,7 +51,8 @@ namespace dsp
                 const auto oversampledSpec = createOversampledSpec (spec);
 
                 /** Setup pre-filter*/
-                *preFilter.state = *juce::dsp::IIR::Coefficients<T>::makeLowPass (oversampledSpec.sampleRate, calculateCutoff (oversampledSpec.sampleRate));
+                *preFilter.state = *juce::dsp::IIR::Coefficients<T>::makeLowPass (
+                    oversampledSpec.sampleRate, calculateCutoff (oversampledSpec.sampleRate));
                 preFilter.prepare (oversampledSpec);
 
                 /** Setup clipper*/
@@ -62,7 +61,8 @@ namespace dsp
                 setClippingType (DEFAULT_CLIPPING_TYPE);
 
                 /** Setup post-filter*/
-                *postFilter.state = *juce::dsp::IIR::Coefficients<T>::makeLowPass (oversampledSpec.sampleRate, calculateCutoff (oversampledSpec.sampleRate));
+                *postFilter.state = *juce::dsp::IIR::Coefficients<T>::makeLowPass (
+                    oversampledSpec.sampleRate, calculateCutoff (oversampledSpec.sampleRate));
                 postFilter.prepare (oversampledSpec);
             }
 
@@ -88,15 +88,9 @@ namespace dsp
 
             // ==============================================================================
             /** Public interface */
-            void setCeiling (float ceilingDbValue) noexcept
-            {
-                clipper.setThreshold (ceilingDbValue);
-            }
+            void setCeiling (float ceilingDbValue) noexcept { clipper.setThreshold (ceilingDbValue); }
 
-            void setClippingType (ClippingType clippingType) noexcept
-            {
-                clipper.setClippingType (clippingType);
-            }
+            void setClippingType (ClippingType clippingType) noexcept { clipper.setClippingType (clippingType); }
 
         private:
             //==============================================================================

source/DSP/OversampledClipper.h

@@ -26,7 +26,8 @@ namespace dsp
             X2 = 0,
             X4 = 1,
             X8 = 2,
-            X16 = 3
+            X16 = 3,
+            X32 = 4
         };
 
         using OversampledWaveShaperEventHandler = std::function<void (juce::AudioBuffer<float>&)>;
@@ -45,13 +46,11 @@ namespace dsp
 
             //==============================================================================
             OversampledWaveShaper() noexcept
-                : clipper2x (1), clipper4x (2), clipper8x (3), clipper16x (4), clipper (&clipper2x)
+                : clipper2x (1), clipper4x (2), clipper8x (3), clipper16x (4), clipper32x (5), clipper (&clipper2x)
             {
             }
 
-            ~OversampledWaveShaper() override
-            {
-            }
+            ~OversampledWaveShaper() override {}
 
             //==============================================================================
             /** Inheritet implemented methods */
@@ -68,6 +67,7 @@ namespace dsp
                 clipper4x.prepare (spec);
                 clipper8x.prepare (spec);
                 clipper16x.prepare (spec);
+                clipper32x.prepare (spec);
 
                 /** Setup output gain */
                 outputGain.prepare (spec);
@@ -83,6 +83,7 @@ namespace dsp
                 clipper4x.reset();
                 clipper8x.reset();
                 clipper16x.reset();
+                clipper32x.reset();
                 outputGain.reset();
             }
 
@@ -120,15 +121,9 @@ namespace dsp
 
             // ==============================================================================
             /** Public interface */
-            void onPostInputGain (OversampledWaveShaperEventHandler const& handler)
-            {
-                mPostInputGainHandler = handler;
-            }
+            void onPostInputGain (OversampledWaveShaperEventHandler const& handler) { mPostInputGainHandler = handler; }
 
-            void onPostCeiling (OversampledWaveShaperEventHandler const& handler)
-            {
-                mPostCeilingHandler = handler;
-            }
+            void onPostCeiling (OversampledWaveShaperEventHandler const& handler) { mPostCeilingHandler = handler; }
 
             void onPostOutputGain (OversampledWaveShaperEventHandler const& handler)
             {
@@ -142,15 +137,9 @@ namespace dsp
                 mPostOutputGainHandler = nullptr;
             }
 
-            void setInputGain (float gainDbValue) noexcept
-            {
-                inputGain.setGainDecibels (gainDbValue);
-            }
+            void setInputGain (float gainDbValue) noexcept { inputGain.setGainDecibels (gainDbValue); }
 
-            void setOutputGain (float gainDbValue) noexcept
-            {
-                outputGain.setGainDecibels (gainDbValue);
-            }
+            void setOutputGain (float gainDbValue) noexcept { outputGain.setGainDecibels (gainDbValue); }
 
             void setCeiling (float ceilingDbValue) noexcept
             {
@@ -159,6 +148,7 @@ namespace dsp
                 clipper4x.setCeiling (ceilingDbValue);
                 clipper8x.setCeiling (ceilingDbValue);
                 clipper16x.setCeiling (ceilingDbValue);
+                clipper32x.setCeiling (ceilingDbValue);
             }
 
             void setClippingType (ClippingType clippingType) noexcept
@@ -168,6 +158,7 @@ namespace dsp
                 clipper4x.setClippingType (clippingType);
                 clipper8x.setClippingType (clippingType);
                 clipper16x.setClippingType (clippingType);
+                clipper32x.setClippingType (clippingType);
             }
 
             void setOversamplingRate (OversamplingRate oversamplingRate) noexcept
@@ -189,6 +180,9 @@ namespace dsp
                     case X16:
                         clipper = &clipper16x;
                         break;
+                    case X32:
+                        clipper = &clipper32x;
+                        break;
                     default:
                         clipper = &clipper1x;
                         break;
@@ -211,6 +205,7 @@ namespace dsp
             OversampledClipper<T> clipper4x;
             OversampledClipper<T> clipper8x;
             OversampledClipper<T> clipper16x;
+            OversampledClipper<T> clipper32x;
             juce::dsp::ProcessorBase* clipper; // Current clipper
 
             //==============================================================================