commit ff3b0b51f9e7b0f7f3767f73023c1d8f817deda0
parent 05a6c3114c186452c1d277fcdcf43e6d760f2be5
Author: Matt Demanett <matt@demanett.net>
Date: Wed, 5 Sep 2018 23:45:34 -0400
PRESOR: a compressor with features. #7
Diffstat:
10 files changed, 827 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -36,4 +36,5 @@ benchmark
testmain
*.gp
releasenote.md
+plot
plot.*
diff --git a/Makefile b/Makefile
@@ -41,4 +41,17 @@ testmain: $(TESTMAIN_OBJECTS)
testmain_clean:
rm -f testmain $(TESTMAIN_OBJECTS)
-clean: benchmark_clean testmain_clean
+PLOT_SOURCES = $(wildcard test/plot.cpp src/dsp/*cpp)
+PLOT_OBJECTS = $(patsubst %, build/%.o, $(PLOT_SOURCES))
+PLOT_DEPS = $(patsubst %, build/%.d, $(PLOT_SOURCES))
+-include $(PLOT_DEPS)
+plot: $(PLOT_OBJECTS)
+ $(CXX) -o $@ $^
+plotrun: plot
+ ./plot
+plotrungp: plot
+ ./plot > plot.tmp && gnuplot -e "set yrange [0:20]; plot 'plot.tmp' using 1:2 with lines"
+plot_clean:
+ rm -f plot $(PLOT_OBJECTS)
+
+clean: benchmark_clean testmain_clean plot_clean
diff --git a/benchmarks/signal_benchmark.cpp b/benchmarks/signal_benchmark.cpp
@@ -218,3 +218,13 @@ static void BM_Saturator(benchmark::State& state) {
}
}
BENCHMARK(BM_Saturator);
+
+static void BM_CompressorSoftKnee(benchmark::State& state) {
+ int i = 0;
+ Compressor c;
+ for (auto _ : state) {
+ i = ++i % 15;
+ benchmark::DoNotOptimize(c.compressionDb((float)(i + 5), 10.0f, 2.0f, true));
+ }
+}
+BENCHMARK(BM_CompressorSoftKnee);
diff --git a/res-src/Pressor-src.svg b/res-src/Pressor-src.svg
@@ -0,0 +1,430 @@
+<svg
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="225"
+ height="380"
+ viewBox="0 0 225 380"
+>
+ <style>
+ text {
+ fill: #333;
+ font-family: 'Roboto', sans-serif;
+ font-weight: bold;
+ }
+ text.title {
+ font-family: 'Comfortaa', sans-serif;
+ font-weight: normal;
+ }
+ text.brand {
+ font-family: 'Audiowide', sans-serif;
+ font-weight: bold;
+ }
+ </style>
+
+ <defs>
+ <symbol id="knob" viewBox="0 0 38px 38px">
+ <g transform="translate(19 19)">
+ <polyline points="-5,0 5,0" stroke-width="1" stroke="#00f" />
+ <polyline points="0,-5 0,5" stroke-width="1" stroke="#00f" />
+ <circle cx="0" cy="0" r="18.5" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knob-medium" viewBox="0 0 26px 26px">
+ <g transform="translate(13 13)">
+ <polyline points="-3,0 3,0" stroke-width="1" stroke="#00f" />
+ <polyline points="0,-3 0,3" stroke-width="1" stroke="#00f" />
+ <circle cx="0" cy="0" r="12.5" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-threshold" viewBox="0 0 70px 70px">
+ <g transform="translate(35 35)">
+ <text font-size="6.0pt" transform="rotate(-240) translate(25 0) rotate(240) translate(-10 2.5)">-24</text>
+ <polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(21 0)" />
+ <text font-size="6.0pt" transform="rotate(-180) translate(25 0) rotate(180) translate(-10 2.5)">-18</text>
+ <polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(21 0)" />
+ <text font-size="6.0pt" transform="rotate(-120) translate(25 0) rotate(120) translate(-10 2.5)">-12</text>
+ <polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" transform="rotate(-90) translate(21 0)" />
+ <text font-size="6.0pt" transform="rotate(-60) translate(25 0) rotate(60) translate(-2.3 2.5)">-6</text>
+ <polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(21 0)" />
+ <text font-size="6.0pt" transform="rotate(0) translate(25 0) rotate(0) translate(-2.3 2.5)">0</text>
+ <polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(21 0)" />
+ <text font-size="6.0pt" transform="rotate(60) translate(25 0) rotate(-60) translate(-2.3 2.5)">6</text>
+ <text font-size="6.0pt" transform="rotate(90) translate(29 0) rotate(-90) translate(-4.7 2.2)">dB</text>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-ratio" viewBox="0 0 70px 70px">
+ <g transform="translate(35 35)">
+ <text font-size="6.0pt" transform="rotate(-240) translate(25 0) rotate(240) translate(-2.5 2.5)">1</text>
+ <text font-size="6.0pt" transform="rotate(-193.72) translate(25 0) rotate(193.72) translate(-8 2.5)">1.1</text>
+ <text font-size="6.0pt" transform="rotate(-149.70) translate(25 0) rotate(149.70) translate(-9 2.5)">1.3</text>
+ <text font-size="6.0pt" transform="rotate(-108.93) translate(25 0) rotate(108.93) translate(-9 2.5)">1.6</text>
+ <text font-size="6.0pt" transform="rotate(-74.52) translate(25 0) rotate(74.52) translate(-2.3 2.5)">2</text>
+ <text font-size="6.0pt" transform="rotate(-47.12) translate(25 0) rotate(47.12) translate(-2.3 2.5)">2.5</text>
+ <text font-size="6.0pt" transform="rotate(-6.18) translate(25 0) rotate(6.18) translate(-2.3 2.5)">4</text>
+ <text font-size="6.0pt" transform="rotate(31.11) translate(25 0) rotate(-31.11) translate(-2.3 2.5)">9</text>
+ <text font-size="6.0pt" transform="rotate(60) translate(25 0) rotate(-60) translate(-4 2.2)">∞</text>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-attack" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(18 0) rotate(240) translate(-1.9 2.2)">0</text>
+ <polyline points="0,0 1.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-172.92) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(-145.13) translate(17 0) rotate(145.13) translate(-5.7 2.2)">50</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-75.68) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(-27.87) translate(17 0) rotate(27.87) translate(-2.2 2.2)">250</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(19.81) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(18 0) rotate(-60) translate(-1.9 2.2)">500</text>
+ <text font-size="5.0pt" transform="rotate(90) translate(22 0) rotate(-90) translate(-4.8 2.2)">ms</text>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-release" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(18 0) rotate(240) translate(-1.9 2.2)">0</text>
+ <polyline points="0,0 1.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-172.92) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(-145.13) translate(17 0) rotate(145.13) translate(-7.5 2.2)">0.2</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-75.68) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(-27.87) translate(17 0) rotate(27.87) translate(-2.2 2.2)">1</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(19.81) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(18 0) rotate(-60) translate(-1.9 2.2)">2</text>
+ <text font-size="5.0pt" transform="rotate(90) translate(22 0) rotate(-90) translate(-1.8 2.2)">s</text>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-outputgain" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(18 0) rotate(240) translate(-1.9 2.2)">0</text>
+ <polyline points="0,0 1.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-202.5) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(-165) translate(17 0) rotate(165) translate(-2 2.2)">6</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-127.5) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(-90) translate(17 0) rotate(90) translate(-4 2)">12</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-52.5) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(-15) translate(17 0) rotate(15) translate(-3.5 2.2)">18</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(22.5) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(18 0) rotate(-60) translate(-1.9 2.2)">24</text>
+ <text font-size="5.0pt" transform="rotate(90) translate(22 0) rotate(-90) translate(-4 2.2)">dB</text>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-inputgain" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(18 0) rotate(240) translate(-8 2.2)">-12</text>
+ <polyline points="0,0 1.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-202.5) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(-165) translate(17 0) rotate(165) translate(-4.5 2.2)">-6</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-127.5) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(-90) translate(17 0) rotate(90) translate(-1.9 2)">0</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-52.5) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(-15) translate(17 0) rotate(15) translate(-2 2.2)">6</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(22.5) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(18 0) rotate(-60) translate(-1.9 2.2)">12</text>
+ <text font-size="5.0pt" transform="rotate(90) translate(22 0) rotate(-90) translate(-4 2.2)">dB</text>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-outputmix" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(18 0) rotate(240) translate(-2.2 2.2)">D</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(15 0)" />
+ <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(-90) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(18 0) rotate(-60) translate(-2.9 2.5)">W</text>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-detectormix" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(18 0) rotate(240) translate(-4.2 2.2)">IN</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(15 0)" />
+ <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(-90) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(15 0)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(18 0) rotate(-60) translate(-2.1 2.5)">SD</text>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-attenuverter" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <g transform="rotate(-240) translate(15 0)">
+ <text font-size="9.0pt" transform="translate(3 0) rotate(240) translate(-2.2 3.6)">-</text>
+ </g>
+ <g transform="rotate(-210) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-180) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-150) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-120) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-90) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(2 0) rotate(90) translate(-2 2)">0</text>
+ </g>
+ <g transform="rotate(-60) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-30) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(0) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(30) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(60) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-2 2)">+</text>
+ </g>
+ </g>
+ </symbol>
+
+ <symbol id="compression" viewBox="0 0 11px 75px">
+ <!-- <rect width="11" height="75" x="0" y="0" rx="0" fill="#ccc" /> -->
+ <rect width="5" height="13" x="0" y="1" rx="0" fill="#aaa" transform="translate(3 0)" />
+ <rect width="5" height="13" x="0" y="1" rx="0" fill="#aaa" transform="translate(3 15)" />
+ <rect width="5" height="13" x="0" y="1" rx="0" fill="#aaa" transform="translate(3 30)" />
+ <rect width="5" height="13" x="0" y="1" rx="0" fill="#aaa" transform="translate(3 45)" />
+ <rect width="5" height="13" x="0" y="1" rx="0" fill="#aaa" transform="translate(3 60)" />
+ </symbol>
+
+ <symbol id="guide-compression" viewBox="0 0 20px 95px">
+ <g transform="translate(0 10)">
+ <g transform="translate(0 0)">
+ <polyline points="0,0 3,0" stroke="#333" fill="none" transform="translate(11 0)" />
+ <text font-size="6.0pt" transform="translate(7 0) rotate(-90) translate(-5.5 2.2)">30+</text>
+ </g>
+ <g transform="translate(0 15)">
+ <polyline points="0,0 3,0" stroke="#333" fill="none" transform="translate(11 0)" />
+ <text font-size="6.0pt" transform="translate(7 0) rotate(-90) translate(-4 2.2)">24</text>
+ </g>
+ <g transform="translate(0 30)">
+ <polyline points="0,0 3,0" stroke="#333" fill="none" transform="translate(11 0)" />
+ <text font-size="6.0pt" transform="translate(7 0) rotate(-90) translate(-4.5 2.2)">18</text>
+ </g>
+ <g transform="translate(0 45)">
+ <polyline points="0,0 3,0" stroke="#333" fill="none" transform="translate(11 0)" />
+ <text font-size="6.0pt" transform="translate(7 0) rotate(-90) translate(-4.5 2.2)">12</text>
+ </g>
+ <g transform="translate(0 60)">
+ <polyline points="0,0 3,0" stroke="#333" fill="none" transform="translate(11 0)" />
+ <text font-size="6.0pt" transform="translate(7 0) rotate(-90) translate(-2.5 2.2)">6</text>
+ </g>
+ <g transform="translate(0 75)">
+ <polyline points="0,0 3,0" stroke="#333" fill="none" transform="translate(11 0)" />
+ <text font-size="6.0pt" transform="translate(7 0) rotate(-90) translate(-2.5 2.2)">0</text>
+ </g>
+ </g>
+ </symbol>
+
+ <symbol id="switch" viewBox="0 0 14px 24px">
+ <rect width="14px" height="24px" stroke-width="1" stroke="#000" fill="#ddd" />
+ <rect width="14px" height="12px" stroke-width="0" fill="#000" />
+ </symbol>
+
+ <symbol id="input" viewBox="0 0 24px 24px">
+ <g transform="translate(12 12)">
+ <circle cx="0" cy="0" r="5" stroke-width="1" stroke="#0f0" fill="#0f0" />
+ <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#0f0" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="output" viewBox="0 0 24px 24px">
+ <g transform="translate(12 12)">
+ <circle cx="0" cy="0" r="5" stroke-width="1" stroke="#f00" fill="#f00" />
+ <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#f00" fill="none" />
+ </g>
+ </symbol>
+ </defs>
+
+ <rect width="100%" height="100%" fill="#ddd" />
+ <polyline points="1,1 224,1 224,379 1,379 1,1" stroke="#e4e4e4" stroke-width="0.5" fill="none" />
+ <polyline points="0.5,0.5 224.5,0.5 224.5,379.5 0.5,379.5 0.5,0.5" stroke="#ebebeb" stroke-width="0.8" fill="none" />
+ <polyline points="0,0 225,0 225,380 0,380 0,0" stroke="#f2f2f2" stroke-width="1" fill="none" />
+
+ <!-- <rect width="60" height="20" fill="#0f0" transform="translate(0 0)" /> -->
+ <!-- <rect width="60" height="20" fill="#0f0" transform="translate(165 0)" /> -->
+
+ <!-- <polyline points="0,0 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(10 0)" /> -->
+ <!-- <polyline points="0,0 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(215 0)" /> -->
+
+ <!-- <rect width="12" height="100" fill="#00f3" transform="translate(85 20)" /> -->
+ <!-- <rect width="12" height="100" fill="#00f3" transform="translate(174 20)" /> -->
+
+ <!-- <rect width="225" height="3" fill="#0f03" transform="translate(0 20)" /> -->
+ <!-- <rect width="225" height="30" fill="#f003" transform="translate(0 23)" /> -->
+ <!-- <rect width="225" height="50" fill="#f003" transform="translate(0 91)" /> -->
+ <!-- <rect width="225" height="50" fill="#f003" transform="translate(0 163)" /> -->
+ <!-- <rect width="225" height="30" fill="#f003" transform="translate(0 239)" /> -->
+
+ <text class="title" x="61" y="19" font-size="12pt" letter-spacing="4px">PRESSOR</text>
+ <g transform="translate(72.5 374)">
+ <text class="brand" font-size="8pt" letter-spacing="2px">BOGAUDIO</text>
+ <rect width="3.0" height="3" fill="#ddd" transform="translate(24 -5)" />
+ </g>
+
+ <g transform="translate(13 53)">
+ <!-- <polyline points="0,19 268,19" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <!-- <polyline points="40,-20 40,50" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <text font-size="8pt" letter-spacing="1.5px" transform="translate(4 55) rotate(270)">THRESHOLD</text>
+ <use id="THRESHOLD_PARAM" xlink:href="#knob" transform="translate(23 0)" />
+ <use xlink:href="#knobguide-threshold" transform="translate(7 -16)" />
+ </g>
+
+ <g transform="translate(102 53)">
+ <!-- <polyline points="0,19 68,19" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <!-- <polyline points="40,-20 40,50" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(4 40) rotate(270)">RATIO</text>
+ <use id="RATIO_PARAM" xlink:href="#knob" transform="translate(23 0)" />
+ <use xlink:href="#knobguide-ratio" transform="translate(7 -16)" />
+ </g>
+
+ <g transform="translate(207 35)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(-15 75) rotate(270)">COMPRESSION</text>
+ <use id="COMPRESSION_WIDGET" xlink:href="#compression" transform="translate(0 -1)" />
+ <use xlink:href="#guide-compression" transform="translate(-13 -11)" />
+ </g>
+
+ <g transform="translate(10 141)">
+ <g transform="translate(-1 0)">
+ <!-- <rect width="51" height="10" fill="#f003" transform="translate(8 -15)" /> -->
+ <!-- <polyline points="0,0 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(29 -100)" /> -->
+ <!-- <polyline points="0,13 270,13" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 35) rotate(270)">ATTACK</text>
+ <use id="ATTACK_PARAM" xlink:href="#knob-medium" transform="translate(19 0)" />
+ </g>
+ <use xlink:href="#knobguide-attack" transform="translate(8.5 -9.5)" />
+ <g transform="translate(58 0)">
+ <!-- <rect width="51" height="10" fill="#f003" transform="translate(8 -15)" /> -->
+ <!-- <polyline points="0,0 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(29 -100)" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 40) rotate(270)">RELEASE</text>
+ <use id="RELEASE_PARAM" xlink:href="#knob-medium" transform="translate(19 0)" />
+ </g>
+ <use xlink:href="#knobguide-release" transform="translate(67.5 -9.5)" />
+ <g transform="translate(117 0)">
+ <!-- <rect widtq2h="51" height="10" fill="#f003" transform="translate(8 -15)" /> -->
+ <!-- <polyline points="0,0 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(29 -100)" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 43) rotate(270)">OUT GAIN</text>
+ <use id="OUTPUT_GAIN_PARAM" xlink:href="#knob-medium" transform="translate(19 0)" />
+ </g>
+ <use xlink:href="#knobguide-outputgain" transform="translate(126.5 -9.5)" />
+ <g transform="translate(189 0)">
+ <!-- <rect width="5" height="24" fill="#0f0" transform="translate(-14 2)" /> -->
+ <text font-size="5pt" letter-spacing="1.5px" transform="translate(-8 30) rotate(270)">DETECT</text>
+ <text font-size="5pt" letter-spacing="2px" transform="translate(-2 -1)">RMS</text>
+ <use id="DECTECTOR_MODE_PARAM" xlink:href="#switch" transform="translate(0 2)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(-4 34)">PEAK</text>
+ </g>
+ </g>
+
+ <g transform="translate(10 213)">
+ <g transform="translate(-1 0)">
+ <!-- <rect width="51" height="10" fill="#f003" transform="translate(8 -15)" /> -->
+ <!-- <polyline points="0,0 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(29 -100)" /> -->
+ <!-- <polyline points="0,13 270,13" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 38) rotate(270)">IN GAIN</text>
+ <use id="INPUT_GAIN_PARAM" xlink:href="#knob-medium" transform="translate(19 0)" />
+ </g>
+ <use xlink:href="#knobguide-inputgain" transform="translate(8.5 -9.5)" />
+ <g transform="translate(58 0)">
+ <!-- <rect width="51" height="10" fill="#f003" transform="translate(8 -15)" /> -->
+ <!-- <polyline points="0,0 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(29 -100)" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 37) rotate(270)">IN/SIDE</text>
+ <use id="DETECTOR_MIX_PARAM" xlink:href="#knob-medium" transform="translate(19 0)" />
+ </g>
+ <use xlink:href="#knobguide-detectormix" transform="translate(67.5 -9.5)" />
+ <g transform="translate(117 0)">
+ <!-- <rect width="51" height="10" fill="#f003" transform="translate(8 -15)" /> -->
+ <!-- <polyline points="0,0 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(29 -100)" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 40) rotate(270)">DRY/WET</text>
+ <use id="OUTPUT_MIX_PARAM" xlink:href="#knob-medium" transform="translate(19 0)" />
+ </g>
+ <use xlink:href="#knobguide-outputmix" transform="translate(126.5 -9.5)" />
+ <g transform="translate(189 0)">
+ <!-- <rect width="5" height="24" fill="#0f0" transform="translate(-14 2)" /> -->
+ <text font-size="5pt" letter-spacing="2px" transform="translate(-8 25.5) rotate(270)">KNEE</text>
+ <text font-size="5pt" letter-spacing="2px" transform="translate(-4 -1)">SOFT</text>
+ <use id="KNEE_PARAM" xlink:href="#switch" transform="translate(0 2)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(-5 34)">HARD</text>
+ </g>
+ </g>
+
+ <g transform="translate(0 269)">
+ <rect width="205" height="91" rx="5" fill="#bbb" transform="translate(10 0)" />
+ <rect width="137" height="91" rx="5" fill="#fafafa" transform="translate(10 0)" />
+ <rect width="171" height="47" rx="5" fill="#fafafa" transform="translate(10 44)" />
+ <rect width="10" height="10" fill="#fafafa" transform="translate(137 0)" />
+ <rect width="10" height="10" fill="#fafafa" transform="translate(171 81)" />
+
+ <g transform="translate(10 0)">
+ <g transform="translate(3 0)">
+ <use id="LEFT_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(13 40)">L</text>
+ </g>
+ <g transform="translate(37 0)">
+ <use id="SIDECHAIN_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(3 40)">SIDE</text>
+ </g>
+ <g transform="translate(71 0)">
+ <use id="THRESHOLD_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(1.5 40)">TRSH</text>
+ </g>
+ <g transform="translate(105 0)">
+ <use id="RATIO_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(1.5 40)">RATIO</text>
+ </g>
+ <g transform="translate(139 0)">
+ <use id="ENVELOPE_OUTPUT" xlink:href="#output" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 40)">ENV</text>
+ </g>
+ <g transform="translate(173 0)">
+ <use id="LEFT_OUTPUT" xlink:href="#output" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(13 40)">L</text>
+ </g>
+ </g>
+
+ <g transform="translate(10 44)">
+ <g transform="translate(3 0)">
+ <use id="RIGHT_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(13 40)">R</text>
+ </g>
+ <g transform="translate(37 0)">
+ <use id="ATTACK_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 40)">ATT</text>
+ </g>
+ <g transform="translate(71 0)">
+ <use id="RELEASE_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.4 40)">REL</text>
+ </g>
+ <g transform="translate(105 0)">
+ <use id="OUTPUT_GAIN_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(5.3 40)">OGN</text>
+ </g>
+ <g transform="translate(139 0)">
+ <use id="OUTPUT_MIX_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5 40)">D/W</text>
+ </g>
+ <g transform="translate(173 0)">
+ <use id="RIGHT_OUTPUT" xlink:href="#output" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(12 40)">R</text>
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/res/Pressor.svg b/res/Pressor.svg
Binary files differ.
diff --git a/src/Pressor.cpp b/src/Pressor.cpp
@@ -0,0 +1,243 @@
+
+#include "Pressor.hpp"
+
+void Pressor::onReset() {
+ _modulationStep = modulationSteps;
+}
+
+void Pressor::onSampleRateChange() {
+ _detectorRMS.setSampleRate(engineGetSampleRate());
+ _modulationStep = modulationSteps;
+}
+
+void Pressor::step() {
+ if (!(
+ outputs[LEFT_OUTPUT].active ||
+ outputs[RIGHT_OUTPUT].active ||
+ outputs[ENVELOPE_OUTPUT].active ||
+ outputs[LEFT_INPUT].active ||
+ outputs[RIGHT_INPUT].active ||
+ outputs[SIDECHAIN_INPUT].active
+ )) {
+ return;
+ }
+
+ ++_modulationStep;
+ if (_modulationStep >= modulationSteps) {
+ _modulationStep = 0;
+
+ _thresholdDb = params[THRESHOLD_PARAM].value;
+ if (inputs[THRESHOLD_INPUT].active) {
+ _thresholdDb *= clamp(inputs[THRESHOLD_INPUT].value / 10.0f, 0.0f, 1.0f);
+ }
+ _thresholdDb *= 30.0f;
+ _thresholdDb -= 24.0f;
+
+ float ratio = params[RATIO_PARAM].value;
+ if (inputs[RATIO_INPUT].active) {
+ ratio *= clamp(inputs[RATIO_INPUT].value / 10.0f, 0.0f, 1.0f);
+ }
+ if (_ratioKnob != ratio) {
+ _ratioKnob = ratio;
+ _ratio = powf(_ratioKnob, 1.5f);
+ _ratio = 1.0f - _ratio;
+ _ratio *= M_PI;
+ _ratio *= 0.25f;
+ _ratio = tanf(_ratio);
+ _ratio = 1.0f / _ratio;
+ }
+
+ float sampleRate = engineGetSampleRate();
+ float attack = params[ATTACK_PARAM].value;
+ if (inputs[ATTACK_INPUT].active) {
+ attack *= clamp(inputs[ATTACK_INPUT].value / 10.0f, 0.0f, 1.0f);
+ }
+ attack *= attack;
+ _attackSL.setParams(sampleRate, attack * 500.0f);
+
+ float release = params[RELEASE_PARAM].value;
+ if (inputs[RELEASE_INPUT].active) {
+ release *= clamp(inputs[RELEASE_INPUT].value / 10.0f, 0.0f, 1.0f);
+ }
+ release *= release;
+ _releaseSL.setParams(sampleRate, release * 2000.0f);
+
+ float inGain = params[INPUT_GAIN_PARAM].value * 12.0f;
+ if (_inGain != inGain) {
+ _inGain = inGain;
+ _inLevel = decibelsToAmplitude(_inGain);
+ }
+
+ float outGain = params[OUTPUT_GAIN_PARAM].value;
+ if (inputs[OUTPUT_GAIN_INPUT].active) {
+ outGain = clamp(outGain + inputs[OUTPUT_GAIN_INPUT].value / 5.0f, 0.0f, 1.0f);
+ }
+ outGain *= 24.0f;
+ if (_outGain != outGain) {
+ _outGain = outGain;
+ _outLevel = decibelsToAmplitude(_outGain);
+ }
+
+ _detectorMix.setParams(params[DETECTOR_MIX_PARAM].value, 0.0f, true);
+
+ float outputMix = params[OUTPUT_MIX_PARAM].value;
+ if (inputs[OUTPUT_MIX_INPUT].active) {
+ outputMix *= clamp(inputs[OUTPUT_MIX_INPUT].value / 5.0f, -1.0f, 1.0f);
+ }
+ _outputMix.setParams(outputMix, 0.0f, true);
+
+ _rmsDetector = params[DECTECTOR_MODE_PARAM].value > 0.5f;
+
+ _softKnee = params[KNEE_PARAM].value > 0.5f;
+ }
+
+ float leftInput = inputs[LEFT_INPUT].value * _inLevel;
+ float rightInput = inputs[RIGHT_INPUT].value * _inLevel;
+ float env = leftInput + rightInput;
+ if (inputs[SIDECHAIN_INPUT].active) {
+ env = _detectorMix.next(env, inputs[SIDECHAIN_INPUT].value);
+ }
+ if (_rmsDetector) {
+ env = _detectorRMS.next(env);
+ }
+ else {
+ env = abs(env);
+ }
+ if (env > _lastEnv) {
+ env = _attackSL.next(env, _lastEnv);
+ }
+ else {
+ env = _releaseSL.next(env, _lastEnv);
+ }
+ _lastEnv = env;
+
+ float detectorDb = amplitudeToDecibels(env / 5.0f);
+ _compressionDb = _compressor.compressionDb(detectorDb, _thresholdDb, _ratio, _softKnee);
+ float compression = decibelsToAmplitude(-_compressionDb);
+ outputs[ENVELOPE_OUTPUT].value = env;
+ if (outputs[LEFT_OUTPUT].active) {
+ outputs[LEFT_OUTPUT].value = _saturator.next(_outputMix.next(leftInput, leftInput * compression * _outLevel));
+ }
+ if (outputs[RIGHT_OUTPUT].active) {
+ outputs[RIGHT_OUTPUT].value = _saturator.next(_outputMix.next(rightInput, rightInput * compression * _outLevel));
+ }
+}
+
+struct CompressionDisplay : OpaqueWidget {
+ struct Level {
+ float db;
+ NVGcolor color;
+ Level(float db, const NVGcolor& color) : db(db), color(color) {}
+ };
+
+ const NVGcolor bgColor = nvgRGBA(0xaa, 0xaa, 0xaa, 0xff);
+ Pressor* _module;
+ std::vector<Level> _levels;
+
+ CompressionDisplay(Pressor* module) : _module(module) {
+ auto color = nvgRGBA(0xff, 0xaa, 0x00, 0xff);
+ _levels.push_back(Level(30.0f, color));
+ for (int i = 1; i <= 15; ++i) {
+ float db = 30.0f - i*2.0f;
+ _levels.push_back(Level(db, color)); // decibelsToColor(db - 15.0f)));
+ }
+ }
+
+ void draw(NVGcontext* vg) override {
+ nvgSave(vg);
+ for (int i = 0; i < 80; i += 5) {
+ const Level& l = _levels.at(i / 5);
+
+ nvgBeginPath(vg);
+ nvgRect(vg, 3, i + 1, 5, 4);
+ nvgFillColor(vg, bgColor);
+ nvgFill(vg);
+ if (_module->_compressionDb > l.db) {
+ nvgFillColor(vg, l.color);
+ nvgFill(vg);
+ }
+ }
+ nvgRestore(vg);
+ }
+};
+
+struct PressorWidget : ModuleWidget {
+ static constexpr int hp = 15;
+
+ PressorWidget(Pressor* module) : ModuleWidget(module) {
+ box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT);
+
+ {
+ SVGPanel *panel = new SVGPanel();
+ panel->box.size = box.size;
+ panel->setBackground(SVG::load(assetPlugin(plugin, "res/Pressor.svg")));
+ addChild(panel);
+ }
+
+ {
+ auto display = new CompressionDisplay(module);
+ display->box.pos = Vec(208.0, 30.0 - 0.5);
+ display->box.size = Vec(18, 180);
+ addChild(display);
+ }
+
+ addChild(Widget::create<ScrewSilver>(Vec(15, 0)));
+ addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0)));
+ addChild(Widget::create<ScrewSilver>(Vec(15, 365)));
+ addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365)));
+
+ // generated by svg_widgets.rb
+ auto thresholdParamPosition = Vec(36.0, 53.0);
+ auto ratioParamPosition = Vec(125.0, 53.0);
+ auto attackParamPosition = Vec(28.0, 141.0);
+ auto releaseParamPosition = Vec(87.0, 141.0);
+ auto outputGainParamPosition = Vec(146.0, 141.0);
+ auto dectectorModeParamPosition = Vec(198.5, 142.5);
+ auto inputGainParamPosition = Vec(28.0, 213.0);
+ auto detectorMixParamPosition = Vec(87.0, 213.0);
+ auto outputMixParamPosition = Vec(146.0, 213.0);
+ auto kneeParamPosition = Vec(198.5, 214.5);
+
+ auto leftInputPosition = Vec(16.0, 274.0);
+ auto sidechainInputPosition = Vec(50.0, 274.0);
+ auto thresholdInputPosition = Vec(84.0, 274.0);
+ auto ratioInputPosition = Vec(118.0, 274.0);
+ auto rightInputPosition = Vec(16.0, 318.0);
+ auto attackInputPosition = Vec(50.0, 318.0);
+ auto releaseInputPosition = Vec(84.0, 318.0);
+ auto outputGainInputPosition = Vec(118.0, 318.0);
+ auto outputMixInputPosition = Vec(152.0, 318.0);
+
+ auto envelopeOutputPosition = Vec(152.0, 274.0);
+ auto leftOutputPosition = Vec(186.0, 274.0);
+ auto rightOutputPosition = Vec(186.0, 318.0);
+ // end generated by svg_widgets.rb
+
+ addParam(ParamWidget::create<Knob38>(thresholdParamPosition, module, Pressor::THRESHOLD_PARAM, 0.0, 1.0, 0.8));
+ addParam(ParamWidget::create<Knob38>(ratioParamPosition, module, Pressor::RATIO_PARAM, 0.0, 1.0, 0.552));
+ addParam(ParamWidget::create<Knob26>(attackParamPosition, module, Pressor::ATTACK_PARAM, 0.0, 1.0, 0.316));
+ addParam(ParamWidget::create<Knob26>(releaseParamPosition, module, Pressor::RELEASE_PARAM, 0.0, 1.0, 0.316));
+ addParam(ParamWidget::create<Knob26>(outputGainParamPosition, module, Pressor::OUTPUT_GAIN_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(outputMixParamPosition, module, Pressor::OUTPUT_MIX_PARAM, -1.0, 1.0, 1.0));
+ addParam(ParamWidget::create<Knob26>(inputGainParamPosition, module, Pressor::INPUT_GAIN_PARAM, -1.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(detectorMixParamPosition, module, Pressor::DETECTOR_MIX_PARAM, -1.0, 1.0, 0.0));
+ addParam(ParamWidget::create<SliderSwitch2State14>(dectectorModeParamPosition, module, Pressor::DECTECTOR_MODE_PARAM, 0.0, 1.0, 1.0));
+ addParam(ParamWidget::create<SliderSwitch2State14>(kneeParamPosition, module, Pressor::KNEE_PARAM, 0.0, 1.0, 1.0));
+
+ addInput(Port::create<Port24>(leftInputPosition, Port::INPUT, module, Pressor::LEFT_INPUT));
+ addInput(Port::create<Port24>(sidechainInputPosition, Port::INPUT, module, Pressor::SIDECHAIN_INPUT));
+ addInput(Port::create<Port24>(thresholdInputPosition, Port::INPUT, module, Pressor::THRESHOLD_INPUT));
+ addInput(Port::create<Port24>(ratioInputPosition, Port::INPUT, module, Pressor::RATIO_INPUT));
+ addInput(Port::create<Port24>(rightInputPosition, Port::INPUT, module, Pressor::RIGHT_INPUT));
+ addInput(Port::create<Port24>(attackInputPosition, Port::INPUT, module, Pressor::ATTACK_INPUT));
+ addInput(Port::create<Port24>(releaseInputPosition, Port::INPUT, module, Pressor::RELEASE_INPUT));
+ addInput(Port::create<Port24>(outputGainInputPosition, Port::INPUT, module, Pressor::OUTPUT_GAIN_INPUT));
+ addInput(Port::create<Port24>(outputMixInputPosition, Port::INPUT, module, Pressor::OUTPUT_MIX_INPUT));
+
+ addOutput(Port::create<Port24>(envelopeOutputPosition, Port::OUTPUT, module, Pressor::ENVELOPE_OUTPUT));
+ addOutput(Port::create<Port24>(leftOutputPosition, Port::OUTPUT, module, Pressor::LEFT_OUTPUT));
+ addOutput(Port::create<Port24>(rightOutputPosition, Port::OUTPUT, module, Pressor::RIGHT_OUTPUT));
+ }
+};
+
+Model* modelPressor = createModel<Pressor, PressorWidget>("Bogaudio-Pressor", "Pressor", "stereo compressor", COMPRESSOR_TAG, DYNAMICS_TAG, EFFECT_TAG);
diff --git a/src/Pressor.hpp b/src/Pressor.hpp
@@ -0,0 +1,86 @@
+#pragma once
+
+#include "bogaudio.hpp"
+#include "dsp/signal.hpp"
+
+using namespace bogaudio::dsp;
+
+extern Model* modelPressor;
+
+namespace bogaudio {
+
+struct Pressor : Module {
+ enum ParamsIds {
+ THRESHOLD_PARAM,
+ RATIO_PARAM,
+ ATTACK_PARAM,
+ RELEASE_PARAM,
+ OUTPUT_GAIN_PARAM,
+ OUTPUT_MIX_PARAM,
+ INPUT_GAIN_PARAM,
+ DETECTOR_MIX_PARAM,
+ DECTECTOR_MODE_PARAM,
+ KNEE_PARAM,
+ NUM_PARAMS
+ };
+
+ enum InputsIds {
+ LEFT_INPUT,
+ SIDECHAIN_INPUT,
+ THRESHOLD_INPUT,
+ RATIO_INPUT,
+ RIGHT_INPUT,
+ ATTACK_INPUT,
+ RELEASE_INPUT,
+ OUTPUT_GAIN_INPUT,
+ OUTPUT_MIX_INPUT,
+ NUM_INPUTS
+ };
+
+ enum OutputsIds {
+ ENVELOPE_OUTPUT,
+ LEFT_OUTPUT,
+ RIGHT_OUTPUT,
+ NUM_OUTPUTS
+ };
+
+ enum LightsIds {
+ NUM_LIGHTS
+ };
+
+ const int modulationSteps = 100;
+ int _modulationStep = 0;
+ float _thresholdDb = 0.0f;
+ float _ratio = 0.0f;
+ float _ratioKnob = -1.0f;
+ float _inGain = -1.0f;
+ float _inLevel = 0.0f;
+ float _outGain = -1.0f;
+ float _outLevel = 0.0f;
+ bool _rmsDetector = true;
+ bool _softKnee = true;
+ float _lastEnv = 0.0f;
+ float _compressionDb = 0.0f;
+
+ SlewLimiter _attackSL;
+ SlewLimiter _releaseSL;
+ CrossFader _detectorMix;
+ CrossFader _outputMix;
+ RootMeanSquare _detectorRMS;
+ Compressor _compressor;
+ Saturator _saturator;
+
+ Pressor()
+ : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS)
+ , _detectorRMS(1000.0f, 1.0f, 50.0f)
+ {
+ onReset();
+ onSampleRateChange();
+ }
+
+ void onReset() override;
+ void onSampleRateChange() override;
+ void step() override;
+};
+
+} // namespace bogaudio
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -27,6 +27,7 @@
#include "Noise.hpp"
#include "Offset.hpp"
#include "Pan.hpp"
+#include "Pressor.hpp"
#include "Reftone.hpp"
#include "SampleHold.hpp"
#include "Shaper.hpp"
@@ -103,6 +104,7 @@ void init(rack::Plugin *p) {
p->addModel(modelBool);
#ifdef EXPERIMENTAL
p->addModel(modelCmp);
+ p->addModel(modelPressor);
#endif
p->addModel(modelCVD);
p->addModel(modelFlipFlop);
diff --git a/src/dsp/signal.cpp b/src/dsp/signal.cpp
@@ -184,11 +184,11 @@ void SlewLimiter::setParams(float sampleRate, float milliseconds, float range) {
_delta = range / ((milliseconds / 1000.0f) * sampleRate);
}
-float SlewLimiter::next(float sample) {
- if (sample > _last) {
- return _last = std::min(_last + _delta, sample);
+float SlewLimiter::next(float sample, float last) {
+ if (sample > last) {
+ return std::min(last + _delta, sample);
}
- return _last = std::max(_last - _delta, sample);
+ return std::max(last - _delta, sample);
}
@@ -429,3 +429,30 @@ float Saturator::next(float sample) {
}
return saturation(x);
}
+
+
+float Compressor::compressionDb(float detectorDb, float thresholdDb, float ratio, bool softKnee) {
+ if (softKnee) {
+ float sDb = thresholdDb - softKneeDb;
+ if (detectorDb <= sDb) {
+ return 0.0f;
+ }
+
+ float ix = softKneeDb * std::min(ratio, 1000.0f) + thresholdDb;
+ float iy = softKneeDb + thresholdDb;
+ float t = (detectorDb - sDb) / (ix - thresholdDb);
+ float px = t * (ix - thresholdDb) + thresholdDb;
+ float py = t * (iy - thresholdDb) + thresholdDb;
+ float s = (py - sDb) / (px - sDb);
+ float compressionDb = detectorDb - sDb;
+ compressionDb -= s * (detectorDb - sDb);
+ return compressionDb;
+ }
+
+ if (detectorDb <= thresholdDb) {
+ return 0.0f;
+ }
+ float compressionDb = detectorDb - thresholdDb;
+ compressionDb -= compressionDb / ratio;
+ return compressionDb;
+}
diff --git a/src/dsp/signal.hpp b/src/dsp/signal.hpp
@@ -123,8 +123,11 @@ struct SlewLimiter {
setParams(sampleRate, milliseconds, range);
}
- void setParams(float sampleRate, float milliseconds = 1.0f, float range = 10.0f);
- float next(float sample);
+ void setParams(float sampleRate = 1000.0f, float milliseconds = 1.0f, float range = 10.0f);
+ inline float next(float sample) {
+ return _last = next(sample, _last);
+ }
+ float next(float sample, float last);
};
struct ShapedSlewLimiter {
@@ -225,5 +228,10 @@ struct Saturator {
float next(float sample);
};
+struct Compressor {
+ const float softKneeDb = 3.0f;
+ float compressionDb(float detectorDb, float thresholdDb, float ratio, bool softKnee);
+};
+
} // namespace dsp
} // namespace bogaudio
