implement settings (Parameter::BiquadBank) for BiquadBank

SamiPerttu · Sep 5, 2024 · 5cec556 · 5cec556
1 parent 5c763b8
commit 5cec556
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/src/biquad_bank.rs b/src/biquad_bank.rs
@@ -1,10 +1,12 @@
 use core::marker::PhantomData;
 use core::ops::Neg;
+use hacker::Parameter;
 use wide::{f32x8, f64x4};
 
 use super::audionode::*;
 use super::prelude::{U4, U8};
 use super::*;
+use crate::setting::Setting;
 use numeric_array::ArrayLength;
 
 pub trait Realx<Size: ArrayLength>: Num + Sized + Neg<Output = Self> {
@@ -15,6 +17,7 @@ pub trait Realx<Size: ArrayLength>: Num + Sized + Neg<Output = Self> {
     fn sqrt(self) -> Self;
     fn reduce_add(self) -> f32;
     fn to_frame(self) -> Frame<f32, Size>;
+    fn set(&mut self, index: usize, value: f32);
 }
 
 impl Realx<U8> for f32x8 {
@@ -41,6 +44,10 @@ impl Realx<U8> for f32x8 {
     fn to_frame(self) -> Frame<f32, U8> {
         f32x8::to_array(self).into()
     }
+    #[inline(always)]
+    fn set(&mut self, index: usize, value: f32) {
+        self.as_array_mut()[index] = value;
+    }
 }
 
 impl Realx<U4> for f64x4 {
@@ -69,6 +76,10 @@ impl Realx<U4> for f64x4 {
         let array_f32: [f32; 4] = array_f64.map(|x| x as f32);
         array_f32.into()
     }
+    #[inline(always)]
+    fn set(&mut self, index: usize, value: f32) {
+        self.as_array_mut()[index] = value as f64;
+    }
 }
 
 /// BiquadBank coefficients in normalized form using SIMD.
@@ -169,16 +180,19 @@ where
             ..Default::default()
         }
     }
+
     pub fn with_coefs(coefs: BiquadCoefsBank<F, Size>) -> Self {
         Self {
             coefs,
             sample_rate: DEFAULT_SR,
             ..Default::default()
         }
     }
+
     pub fn coefs(&self) -> &BiquadCoefsBank<F, Size> {
         &self.coefs
     }
+
     pub fn set_coefs(&mut self, coefs: BiquadCoefsBank<F, Size>) {
         self.coefs = coefs;
     }
@@ -217,11 +231,16 @@ where
         y0.to_frame()
     }
 
-    //fn set(&mut self, setting: Setting) {
-    //    if let Parameter::BiquadBank(a1, a2, b0, b1, b2) = setting.parameter() {
-    //        self.set_coefs(BiquadCoefsBank::arbitrary(*a1, *a2, *b0, *b1, *b2));
-    //    }
-    //}
+    fn set(&mut self, setting: Setting) {
+        if let Parameter::BiquadBank(index, a1, a2, b0, b1, b2) = setting.parameter() {
+            let mut coefs = self.coefs;
+            coefs.a1.set(*index, *a1);
+            coefs.a2.set(*index, *a2);
+            coefs.b0.set(*index, *b0);
+            coefs.b1.set(*index, *b1);
+            coefs.b2.set(*index, *b2);
+        }
+    }
 
     //fn route(&mut self, input: &SignalFrame, frequency: f64) -> SignalFrame {
     //    let mut output = SignalFrame::new(self.outputs());

diff --git a/src/setting.rs b/src/setting.rs
@@ -28,6 +28,11 @@ pub enum Parameter {
     Coefficient(f32),
     /// Set biquad parameters `(a1, a2, b0, b1, b2)`.
     Biquad(f32, f32, f32, f32, f32),
+    /// Set biquadbank parameters `(index, a1, a2, b0, b1, b2)`.
+    /// `index` range:
+    /// - 0-3 for a f64x4 based BiquadBank
+    /// - 0-7 for a f32x8 based BiquadBank
+    BiquadBank(usize, f32, f32, f32, f32, f32),
     /// Set delay.
     Delay(f32),
     /// Set response time.