fix(playback): output sample count of resampler may vary

Author: Yesterday17

Cargo.lock

@@ -8,7 +8,7 @@ repository.workspace = true
 license = "LGPL-3.0"
 
 [dependencies]
-cpal = "0.15.2"
+cpal = "0.15.3"
 reqwest = { workspace = true, features = [
     "blocking",
     "rustls-tls",
@@ -22,7 +22,7 @@ symphonia = { version = "0.5.4", default-features = false, features = [
 ] }
 symphonia-core = "0.5.4"
 crossbeam = { version = "0.8.2", features = ["crossbeam-channel"] }
-rubato = "0.14.1"
+rubato = "0.14.0"
 rangemap = "1.3.0"
 arrayvec = "0.7.2"
 ebur128 = "0.1.7"

anni-playback/Cargo.toml

@@ -248,7 +248,7 @@ impl CpalOutput {
             sample_buffer,
             resampler,
             normalizer: Normalizer::new(spec.channels.count(), sample_rate),
-            controls: controls,
+            controls,
         }
     }
 
@@ -266,7 +266,7 @@ impl CpalOutput {
                 resampler.resample(decoded).unwrap_or(&[])
             }
             _ => {
-                // no resampler, or the target sampe rate is the same as the input
+                // no resampler, or the target sample rate is the same as the input
                 self.sample_buffer.copy_interleaved_ref(decoded);
                 self.sample_buffer.samples()
             }

anni-playback/src/cpal_output.rs

@@ -22,22 +22,24 @@ where
     T: Sample + FromSample<f32> + IntoSample<f32>,
 {
     fn resample_inner(&mut self) -> &[T] {
-        {
+        let output_size = {
             let mut input: arrayvec::ArrayVec<&[f32], 32> = Default::default();
 
             for channel in self.input.iter() {
                 input.push(&channel[..self.duration]);
             }
 
             // Resample.
-            rubato::Resampler::process_into_buffer(
+            let (_, output_size) = rubato::Resampler::process_into_buffer(
                 &mut self.resampler,
                 &input,
                 &mut self.output,
                 None,
             )
             .unwrap();
-        }
+
+            output_size
+        };
 
         // Remove consumed samples from the input buffer.
         for channel in self.input.iter_mut() {
@@ -47,8 +49,7 @@ where
         // Interleave the planar samples from Rubato.
         let num_channels = self.output.len();
 
-        self.interleaved
-            .resize(num_channels * self.output[0].len(), T::MID);
+        self.interleaved.resize(num_channels * output_size, T::MID);
 
         for (i, frame) in self.interleaved.chunks_exact_mut(num_channels).enumerate() {
             for (ch, s) in frame.iter_mut().enumerate() {