tuxmain/HexoDSP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

I think the reverb is now mostly done!

Browse source
This commit is contained in:
Weird Constructor 2021-08-08 13:43:51 +02:00
parent 79c11cd45b
commit dae7c512eb
2 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/dsp/dattorro.rs
View file

@ -50,20 +50,20 @@ const DAT_LEFT_TAPS_TIME_MS : [f64; 7] = [
]; ];
const DAT_RIGHT_TAPS_TIME_MS : [f64; 7] = [ const DAT_RIGHT_TAPS_TIME_MS : [f64; 7] = [
266.0 / DAT_SAMPLES_PER_MS, // 266.0 / DAT_SAMPLES_PER_MS,
2974.0 / DAT_SAMPLES_PER_MS, // 2974.0 / DAT_SAMPLES_PER_MS,
1913.0 / DAT_SAMPLES_PER_MS, // 1913.0 / DAT_SAMPLES_PER_MS,
1996.0 / DAT_SAMPLES_PER_MS, // 1996.0 / DAT_SAMPLES_PER_MS,
1990.0 / DAT_SAMPLES_PER_MS, // 1990.0 / DAT_SAMPLES_PER_MS,
187.0 / DAT_SAMPLES_PER_MS, // 187.0 / DAT_SAMPLES_PER_MS,
1066.0 / DAT_SAMPLES_PER_MS, // 1066.0 / DAT_SAMPLES_PER_MS,
// 353.0 / DAT_SAMPLES_PER_MS, 353.0 / DAT_SAMPLES_PER_MS,
// 3627.0 / DAT_SAMPLES_PER_MS, 3627.0 / DAT_SAMPLES_PER_MS,
// 1228.0 / DAT_SAMPLES_PER_MS, 1228.0 / DAT_SAMPLES_PER_MS,
// 2673.0 / DAT_SAMPLES_PER_MS, 2673.0 / DAT_SAMPLES_PER_MS,
// 2111.0 / DAT_SAMPLES_PER_MS, 2111.0 / DAT_SAMPLES_PER_MS,
// 335.0 / DAT_SAMPLES_PER_MS, 335.0 / DAT_SAMPLES_PER_MS,
// 121.0 / DAT_SAMPLES_PER_MS, 121.0 / DAT_SAMPLES_PER_MS,
]; ];
const DAT_LFO_FREQS_HZ : [f64; 4] = [ 0.1, 0.15, 0.12, 0.18 ]; const DAT_LFO_FREQS_HZ : [f64; 4] = [ 0.1, 0.15, 0.12, 0.18 ];
@ -414,21 +414,21 @@ impl DattorroReverb {
let left = self.apf2[0].0.next(left_apf2_delay_ms, self.apf2[0].2, left); let left = self.apf2[0].0.next(left_apf2_delay_ms, self.apf2[0].2, left);
let left = self.delay2[0].0.next_cubic(self.delay2[0].1, left); let left = self.delay2[0].0.next_cubic(self.delay2[0].1, left);
if self.dbg_count % 48 == 0 { // if self.dbg_count % 48 == 0 {
println!("APFS dcy={:8.6}; {:8.6} {:8.6} {:8.6} {:8.6} | {:8.6} {:8.6} {:8.6} {:8.6}", // println!("APFS dcy={:8.6}; {:8.6} {:8.6} {:8.6} {:8.6} | {:8.6} {:8.6} {:8.6} {:8.6}",
decay, // decay,
self.apf1[0].2, // self.apf1[0].2,
self.apf1[1].2, // self.apf1[1].2,
self.apf2[0].2, // self.apf2[0].2,
self.apf2[1].2, // self.apf2[1].2,
left_apf1_delay_ms, right_apf1_delay_ms, // left_apf1_delay_ms, right_apf1_delay_ms,
left_apf2_delay_ms, right_apf2_delay_ms); // left_apf2_delay_ms, right_apf2_delay_ms);
println!("DELY1/2 {:8.6} / {:8.6} | {:8.6} / {:8.6}", // println!("DELY1/2 {:8.6} / {:8.6} | {:8.6} / {:8.6}",
self.delay1[0].1, // self.delay1[0].1,
self.delay2[0].1, // self.delay2[0].1,
self.delay1[1].1, // self.delay1[1].1,
self.delay2[1].1); // self.delay2[1].1);
} // }
// Right Sum => APF1 => Delay1 => LPF => HPF => APF2 => Delay2 // Right Sum => APF1 => Delay1 => LPF => HPF => APF2 => Delay2

3
src/dsp/helpers.rs
View file

@ -810,8 +810,7 @@ impl<F: Flt> DelayBuffer<F> {
let x0 = data[i % len]; let x0 = data[i % len];
let x1 = data[(i + 1) % len]; let x1 = data[(i + 1) % len];
let fract = fract as F; x0 + fract * (x1 - x0)
x0 * (f::<F>(1.0) - fract) + x1 * fract
} }
/// Fetch a sample from the delay buffer at the given time. /// Fetch a sample from the delay buffer at the given time.