Commit a2dcc443010f1a4bed6c0d9ec00e296d53cebaa2
2020-02-11T15:31:05
Butterworth hipass fifth order filter
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268
diff --git a/Makefile.am b/Makefile.am
index 098b223..d68670e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,6 +95,7 @@ librtbuf_signal_la_SOURCES = \
rtbuf_signal_hipass2.c \
rtbuf_signal_hipass3.c \
rtbuf_signal_hipass4.c \
+ rtbuf_signal_hipass5.c \
rtbuf_signal_lowpass.c \
rtbuf_signal_lowpass2.c \
rtbuf_signal_lowpass3.c \
diff --git a/rtbuf_signal.c b/rtbuf_signal.c
index d3150a4..ffeaa10 100644
--- a/rtbuf_signal.c
+++ b/rtbuf_signal.c
@@ -81,7 +81,7 @@ s_rtbuf_lib_proc_out g_rtbuf_signal_hipass2_out[] = {
s_rtbuf_lib_proc_in g_rtbuf_signal_hipass3_in[] = {
{ "signal", RTBUF_SIGNAL_TYPE, 0.0, -1.0, 1.0 },
- { "cutoff", RTBUF_SIGNAL_TYPE, 200.0, 0.0, RTBUF_SIGNAL_SAMPLERATE / 2.0 },
+ { "cutoff", RTBUF_SIGNAL_TYPE, 8000.0, 0.0, RTBUF_SIGNAL_SAMPLERATE / 2.0 },
{ 0, 0, 0.0, 0.0, 0.0 } };
s_rtbuf_lib_proc_out g_rtbuf_signal_hipass3_out[] = {
@@ -96,7 +96,7 @@ s_rtbuf_lib_proc_out g_rtbuf_signal_hipass3_out[] = {
s_rtbuf_lib_proc_in g_rtbuf_signal_hipass4_in[] = {
{ "signal", RTBUF_SIGNAL_TYPE, 0.0, -1.0, 1.0 },
- { "cutoff", RTBUF_SIGNAL_TYPE, 400.0, 0.0, RTBUF_SIGNAL_SAMPLERATE / 2.0 },
+ { "cutoff", RTBUF_SIGNAL_TYPE, 8000.0, 0.0, RTBUF_SIGNAL_SAMPLERATE / 2.0 },
{ 0, 0, 0.0, 0.0, 0.0 } };
s_rtbuf_lib_proc_out g_rtbuf_signal_hipass4_out[] = {
@@ -111,6 +111,25 @@ s_rtbuf_lib_proc_out g_rtbuf_signal_hipass4_out[] = {
{ "y4", RTBUF_SIGNAL_SAMPLE_TYPE },
{ 0, 0 } };
+s_rtbuf_lib_proc_in g_rtbuf_signal_hipass5_in[] = {
+ { "signal", RTBUF_SIGNAL_TYPE, 0.0, -1.0, 1.0 },
+ { "cutoff", RTBUF_SIGNAL_TYPE, 400.0, 0.0, RTBUF_SIGNAL_SAMPLERATE / 2.0 },
+ { 0, 0, 0.0, 0.0, 0.0 } };
+
+s_rtbuf_lib_proc_out g_rtbuf_signal_hipass5_out[] = {
+ { "signal", RTBUF_SIGNAL_TYPE },
+ { "x1", RTBUF_SIGNAL_SAMPLE_TYPE },
+ { "x2", RTBUF_SIGNAL_SAMPLE_TYPE },
+ { "x3", RTBUF_SIGNAL_SAMPLE_TYPE },
+ { "x4", RTBUF_SIGNAL_SAMPLE_TYPE },
+ { "x5", RTBUF_SIGNAL_SAMPLE_TYPE },
+ { "y1", RTBUF_SIGNAL_SAMPLE_TYPE },
+ { "y2", RTBUF_SIGNAL_SAMPLE_TYPE },
+ { "y3", RTBUF_SIGNAL_SAMPLE_TYPE },
+ { "y4", RTBUF_SIGNAL_SAMPLE_TYPE },
+ { "y5", RTBUF_SIGNAL_SAMPLE_TYPE },
+ { 0, 0 } };
+
s_rtbuf_lib_proc_in g_rtbuf_signal_lowpass_in[] = {
{ "signal", RTBUF_SIGNAL_TYPE, 0.0, -1.0, 1.0 },
{ "cutoff", RTBUF_SIGNAL_TYPE, 400.0, 0.0, RTBUF_SIGNAL_SAMPLERATE / 2.0 },
@@ -222,6 +241,8 @@ s_rtbuf_lib_proc rtbuf_lib_proc[] = {
g_rtbuf_signal_hipass3_in, g_rtbuf_signal_hipass3_out },
{ "hipass4", rtbuf_signal_hipass4, rtbuf_signal_hipass4_start, 0,
g_rtbuf_signal_hipass4_in, g_rtbuf_signal_hipass4_out },
+ { "hipass5", rtbuf_signal_hipass5, rtbuf_signal_hipass5_start, 0,
+ g_rtbuf_signal_hipass5_in, g_rtbuf_signal_hipass5_out },
{ "lowpass", rtbuf_signal_lowpass, rtbuf_signal_lowpass_start, 0,
g_rtbuf_signal_lowpass_in, g_rtbuf_signal_lowpass_out },
{ "lowpass2", rtbuf_signal_lowpass2, rtbuf_signal_lowpass2_start, 0,
diff --git a/rtbuf_signal.h b/rtbuf_signal.h
index cbafec5..60b06ba 100644
--- a/rtbuf_signal.h
+++ b/rtbuf_signal.h
@@ -181,6 +181,27 @@ typedef struct rtbuf_signal_hipass4_data {
int rtbuf_signal_hipass4 (s_rtbuf *rtb);
int rtbuf_signal_hipass4_start (s_rtbuf *rtb);
+/* butterworth hipass filter, fifth order */
+
+#pragma pack(push,1)
+typedef struct rtbuf_signal_hipass5_data {
+ t_rtbuf_signal signal;
+ t_rtbuf_signal_sample x1;
+ t_rtbuf_signal_sample x2;
+ t_rtbuf_signal_sample x3;
+ t_rtbuf_signal_sample x4;
+ t_rtbuf_signal_sample x5;
+ t_rtbuf_signal_sample y1;
+ t_rtbuf_signal_sample y2;
+ t_rtbuf_signal_sample y3;
+ t_rtbuf_signal_sample y4;
+ t_rtbuf_signal_sample y5;
+} s_rtbuf_signal_hipass5_data;
+#pragma pack(pop)
+
+int rtbuf_signal_hipass5 (s_rtbuf *rtb);
+int rtbuf_signal_hipass5_start (s_rtbuf *rtb);
+
/* butterworth lowpass filter, first order */
#pragma pack(push,1)
diff --git a/rtbuf_signal_hipass5.c b/rtbuf_signal_hipass5.c
new file mode 100644
index 0000000..81c7a3e
--- /dev/null
+++ b/rtbuf_signal_hipass5.c
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2020 Thomas de Grivel <thoxdg@gmail.com> +33614550127
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+/* Butterworth hipass fifth order filter
+a: (sqrt(5)-1)/2 $
+b: (sqrt(5)+1)/2 $
+s: 2*F*(1-z)/(1+z) $
+B5:(w/s+1)*((w/s)^2+a*(w/s)+1)*((w/s)^2+b*w/s+1) $
+H: 1/B5 $
+ratsimp(H);
+ 5 5 5 4 5 3 5 2 5 5
+- (32 F z - 160 F z + 320 F z - 320 F z + 160 F z - 32 F )
+ 5 4 2 3
+/((w + ((- 2 sqrt(5)) - 2) F w + (4 sqrt(5) + 12) F w
+ 3 2 4 5 5
+ + ((- 8 sqrt(5)) - 24) F w + (16 sqrt(5) + 16) F w - 32 F ) z
+ 5 4 2 3
+ + (5 w + ((- 6 sqrt(5)) - 6) F w + (4 sqrt(5) + 12) F w
+ 3 2 4 5 4
+ + (8 sqrt(5) + 24) F w + ((- 48 sqrt(5)) - 48) F w + 160 F ) z
+ 5 4 2 3
+ + (10 w + ((- 4 sqrt(5)) - 4) F w + ((- 8 sqrt(5)) - 24) F w
+ 3 2 4 5 3
+ + (16 sqrt(5) + 48) F w + (32 sqrt(5) + 32) F w - 320 F ) z
+ 5 4 2 3
+ + (10 w + (4 sqrt(5) + 4) F w + ((- 8 sqrt(5)) - 24) F w
+ 3 2 4 5 2
+ + ((- 16 sqrt(5)) - 48) F w + (32 sqrt(5) + 32) F w + 320 F ) z
+ 5 4 2 3
+ + (5 w + (6 sqrt(5) + 6) F w + (4 sqrt(5) + 12) F w
+ 3 2 4 5
+ + ((- 8 sqrt(5)) - 24) F w + ((- 48 sqrt(5)) - 48) F w - 160 F ) z
+ 5 4 2 3
+ + w + (2 sqrt(5) + 2) F w + (4 sqrt(5) + 12) F w
+ 3 2 4 5
+ + (8 sqrt(5) + 24) F w + (16 sqrt(5) + 16) F w + 32 F )
+
+a: w5 + (r5 + 1)( 2)(f w4 + 8 f4 w) + (4 r5 + 12) (f2 w3 + 2 f3 w2) + 32 f5; z
+b: 5 w5 + (r5 + 1)( 6)(f w4 - 8 f4 w) + (4 r5 + 12) (f2 w3 - 2 f3 w2) - 160 f5; z1
+c: 10 w5 + (r5 + 1)( 4)(f w4 + 8 f4 w) + (4 r5 + 12)(-2)(f2 w3 + 2 f3 w2) + 320 f5; z2
+d: 10 w5 + (r5 + 1)(-4)(f w4 - 8 f4 w) + (4 r5 + 12)(-2)(f2 w3 - 2 f3 w2) - 320 f5; z3
+e: 5 w5 + (r5 + 1)(-6)(f w4 + 8 f4 w) + (4 r5 + 12) (f2 w3 + 2 f3 w2) + 160 f5; z4
+f: w5 + (r5 + 1)(-2)(f w4 - 8 f4 w) + (4 r5 + 12) (f2 w3 - 2 f3 w2) - 32 f5; z5
+
+y: (f5 (32 (x - x5) + 160 (x4 - x1) + 320 (x2 - x3)) - (b y1 + c y2 + d y3 + e y4 + f y5)) / a;
+
+*/
+#include <math.h>
+#include "rtbuf.h"
+#include "rtbuf_signal.h"
+
+int rtbuf_signal_hipass5_start (s_rtbuf *rtb)
+{
+ s_rtbuf_signal_hipass5_data *data;
+ assert(rtb->proc->out_bytes == sizeof(*data));
+ data = (s_rtbuf_signal_hipass5_data*) rtb->data;
+ data->x1 = 0.0;
+ data->x2 = 0.0;
+ data->x3 = 0.0;
+ data->x4 = 0.0;
+ data->x5 = 0.0;
+ data->y1 = 0.0;
+ data->y2 = 0.0;
+ data->y3 = 0.0;
+ data->y4 = 0.0;
+ data->y5 = 0.0;
+ return 0;
+}
+
+int rtbuf_signal_hipass5 (s_rtbuf *rtb)
+{
+ s_rtbuf_signal_fun in;
+ s_rtbuf_signal_fun cutoff;
+ s_rtbuf_signal_hipass5_data *data;
+ unsigned int i = 0;
+ const double r5_1 = sqrt(5.0) + 1.0;
+ const double _4r5_12 = 4.0 * sqrt(5.0) + 12.0;
+ const double f = RTBUF_SIGNAL_SAMPLERATE;
+ const double f2 = f * f;
+ const double f3 = f2 * f;
+ const double f4 = f2 * f2;
+ const double f5 = f2 * f3;
+ const double _32f5 = 32.0 * f5;
+ const double _160f5 = 160.0 * f5;
+ const double _320f5 = 320.0 * f5;
+ rtbuf_signal_fun(rtb, RTBUF_SIGNAL_HIPASS_IN_SIGNAL, &in);
+ rtbuf_signal_fun(rtb, RTBUF_SIGNAL_HIPASS_IN_CUTOFF, &cutoff);
+ data = (s_rtbuf_signal_hipass5_data*) rtb->data;
+ while (i < RTBUF_SIGNAL_SAMPLES) {
+ const double x = in.sample_fun(in.signal, i);
+ const double fc = cutoff.sample_fun(cutoff.signal, i);
+ const double w = 2.0 * M_PI * fc;
+ const double _8f4w = 8.0 * f4 * w;
+ const double w2 = w * w;
+ const double _2f3w2 = 2.0 * f3 * w2;
+ const double w3 = w2 * w;
+ const double f2w3 = f2 * w3;
+ const double f2w3p2f3w2 = f2w3 + _2f3w2;
+ const double f2w3m2f3w2 = f2w3 - _2f3w2;
+ const double w4 = w2 * w2;
+ const double fw4 = f * w4;
+ const double fw4p8f4w = (fw4 + _8f4w);
+ const double fw4m8f4w = (fw4 - _8f4w);
+ const double w5 = w2 * w3;
+ const double _5w5 = 5.0 * w5;
+ const double _10w5 = 10.0 * w5;
+ const double a = w5 + r5_1 * 2.0 * fw4p8f4w + _4r5_12 * f2w3p2f3w2 + _32f5;
+ const double b = _5w5 + r5_1 * 6.0 * fw4m8f4w + _4r5_12 * f2w3m2f3w2 - _160f5;
+ const double c = _10w5 + r5_1 * 4.0 * fw4p8f4w + _4r5_12 * -2.0 * f2w3p2f3w2 + _320f5;
+ const double d = _10w5 + r5_1 * -4.0 * fw4m8f4w + _4r5_12 * -2.0 * f2w3m2f3w2 - _320f5;
+ const double e = _5w5 + r5_1 * -6.0 * fw4p8f4w + _4r5_12 * f2w3p2f3w2 + _160f5;
+ const double f = w5 + r5_1 * -2.0 * fw4m8f4w + _4r5_12 * f2w3m2f3w2 - _32f5;
+ data->signal[i] = (f5 * (32.0 * (x - data->x5)
+ + 160.0 * (data->x4
+ - data->x1)
+ + 320.0 * (data->x2
+ - data->x3))
+ - (b * data->y1
+ + c * data->y2
+ + d * data->y3
+ + e * data->y4
+ + f * data->y5)) / a;
+ data->x5 = data->x4;
+ data->x4 = data->x3;
+ data->x3 = data->x2;
+ data->x2 = data->x1;
+ data->x1 = x;
+ data->y5 = data->y4;
+ data->y4 = data->y3;
+ data->y3 = data->y2;
+ data->y2 = data->y1;
+ data->y1 = data->signal[i];
+ i++;
+ }
+ return 0;
+}
diff --git a/test_synth b/test_synth
index 2c1c539..1f6c4b6 100644
--- a/test_synth
+++ b/test_synth
@@ -27,7 +27,7 @@ bind LP00 signal Limiter00 signal
set Flanger01 = new signal flanger
bind Synth00 signal Flanger01 signal
-set HP01 = new signal hipass4
+set HP01 = new signal hipass5
bind Flanger01 signal HP01 signal
set Limiter01 = new dynamic limiter