A kinda hacky stereo linking implementation

core/Cargo.toml

@@ -21,7 +21,7 @@ simdeez = "2.0.0-dev3"
 proc-macro2 = "1.0.63"
 
 [dev-dependencies]
-midi-toolkit-rs = { git = "https://github.com/arduano/midi-toolkit-rs", rev = "a54f198" }
+midi-toolkit-rs = { git = "https://github.com/arduano/midi-toolkit-rs", rev = "26747a3" }
 rand = "0.8.5"
 criterion = "0.4.0"
 

core/src/soundfont/mod.rs

@@ -26,7 +26,7 @@ use crate::{
     AudioStreamParams, ChannelCount,
 };
 
-use soundfonts::{FilterType, LoopMode};
+use soundfonts::{convert_sample_index, FilterType, LoopMode};
 
 pub mod audio;
 mod voice_spawners;
@@ -182,10 +182,6 @@ pub enum LoadSfError {
     Unsupported,
 }
 
-fn convert_sample_index(idx: u32, old_sample_rate: u32, new_sample_rate: u32) -> u32 {
-    (new_sample_rate as f32 * idx as f32 / old_sample_rate as f32).round() as u32
-}
-
 impl SampleSoundfont {
     pub fn new(
         path: impl Into<PathBuf>,
@@ -412,29 +408,15 @@ impl SampleSoundfont {
 
                         let pan = ((region.pan as f32 / 500.0) + 1.0) / 2.0;
 
-                        let sample_rate = region.sample_rate;
-
                         let loop_params = LoopParams {
                             mode: if region.loop_start == region.loop_end {
                                 LoopMode::NoLoop
                             } else {
                                 region.loop_mode
                             },
-                            offset: convert_sample_index(
-                                region.offset,
-                                sample_rate,
-                                stream_params.sample_rate,
-                            ),
-                            start: convert_sample_index(
-                                region.loop_start,
-                                sample_rate,
-                                stream_params.sample_rate,
-                            ),
-                            end: convert_sample_index(
-                                region.loop_end,
-                                sample_rate,
-                                stream_params.sample_rate,
-                            ),
+                            offset: region.offset,
+                            start: region.loop_start,
+                            end: region.loop_end,
                         };
 
                         let mut region_samples = region.sample.clone();
@@ -444,7 +426,6 @@ impl SampleSoundfont {
                             region_samples =
                                 Arc::new([region_samples[0].clone(), region_samples[0].clone()]);
                         }
-                        // FIXME: Stereo linked samples
 
                         let spawner_params = Arc::new(SampleVoiceSpawnerParams {
                             pan,

realtime/Cargo.toml

@@ -18,7 +18,7 @@ wav = "1.0.0"
 core = { path = "../core", package = "xsynth-core" }
 
 [dev-dependencies]
-midi-toolkit-rs = { git = "https://github.com/arduano/midi-toolkit-rs.git", rev = "a54f198" }
+midi-toolkit-rs = { git = "https://github.com/arduano/midi-toolkit-rs.git", rev = "26747a3" }
 gen-iter = { git = "https://github.com/arduano/gen-iter.git", rev = "64e28bc" }
 
 [build-dependencies]

render/Cargo.toml

@@ -10,7 +10,7 @@ core = { path = "../core", package = "xsynth-core" }
 crossbeam-channel = "0.5.1"
 hound = "3.5.0"
 rayon = "1.5.3"
-midi-toolkit-rs = { git = "https://github.com/arduano/midi-toolkit-rs", rev = "a54f198" }
+midi-toolkit-rs = { git = "https://github.com/arduano/midi-toolkit-rs", rev = "26747a3" }
 spin_sleep = "1.0.0"
 atomic_float = "0.1.0"
 thiserror = "1.0.31"

soundfonts/src/lib.rs

@@ -19,3 +19,7 @@ pub enum LoopMode {
     LoopContinuous,
     LoopSustain,
 }
+
+pub fn convert_sample_index(idx: u32, old_sample_rate: u32, new_sample_rate: u32) -> u32 {
+    (new_sample_rate as f32 * idx as f32 / old_sample_rate as f32).round() as u32
+}

soundfonts/src/resample.rs

@@ -9,27 +9,27 @@ pub fn resample_vecs(
     new_sample_rate: f32,
 ) -> Arc<[Arc<[f32]>]> {
     vecs.into_iter()
-        .map(|samples| {
-            let params = SincInterpolationParameters {
-                sinc_len: 32,
-                f_cutoff: 0.95,
-                interpolation: SincInterpolationType::Linear,
-                oversampling_factor: 128,
-                window: WindowFunction::BlackmanHarris2,
-            };
-
-            let len = samples.len();
-            let mut resampler = SincFixedIn::<f32>::new(
-                new_sample_rate as f64 / sample_rate as f64,
-                2.0,
-                params,
-                len,
-                1,
-            )
-            .unwrap();
-            resampler.process(&[samples], None).unwrap()[0]
-                .clone()
-                .into()
-        })
+        .map(|samples| resample_vec(samples, sample_rate, new_sample_rate))
         .collect()
 }
+
+pub fn resample_vec(vec: Vec<f32>, sample_rate: f32, new_sample_rate: f32) -> Arc<[f32]> {
+    let params = SincInterpolationParameters {
+        sinc_len: 32,
+        f_cutoff: 0.95,
+        interpolation: SincInterpolationType::Linear,
+        oversampling_factor: 128,
+        window: WindowFunction::BlackmanHarris2,
+    };
+
+    let len = vec.len();
+    let mut resampler = SincFixedIn::<f32>::new(
+        new_sample_rate as f64 / sample_rate as f64,
+        2.0,
+        params,
+        len,
+        1,
+    )
+    .unwrap();
+    resampler.process(&[vec], None).unwrap()[0].clone().into()
+}

soundfonts/src/sf2/mod.rs

@@ -40,6 +40,7 @@ struct Sf2Zone {
     pub root_override: Option<i16>,
 }
 
+#[derive(Clone)]
 pub struct Sf2Region {
     pub sample: Arc<[Arc<[f32]>]>,
     pub sample_rate: u32,
@@ -95,5 +96,6 @@ pub fn load_soundfont(
         sample_data,
         instruments,
         presets,
+        sample_rate,
     ))
 }