Separate lifetimes for input and output

Author: HEnquist

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rubato"
-version = "2.0.0"
+version = "3.0.0"
 rust-version = "1.85"
 authors = ["HEnquist <henrik.enquist@gmail.com>"]
 description = "Asynchronous resampling library intended for audio data"

README.md

@@ -313,6 +313,8 @@ Many audio editors, for example Audacity, are also able to directly import and e
 The `rubato` crate requires rustc version 1.85 or newer.
 
 ## Changelog
+- v3.0.0
+  - Use separate lifetimes for `buffer_in` and `buffer_out` in `process_into_buffer`.
 - v2.0.0
   - Update to `audioadapter` 3.0.
   - Add re-export of `audioadapter-buffers`.

src/asynchro.rs

@@ -445,10 +445,10 @@ impl<T> Resampler<T> for Async<T>
 where
     T: Sample,
 {
-    fn process_into_buffer<'a>(
+    fn process_into_buffer<'a, 'b>(
         &mut self,
         buffer_in: &dyn Adapter<'a, T>,
-        buffer_out: &mut dyn AdapterMut<'a, T>,
+        buffer_out: &mut dyn AdapterMut<'b, T>,
         indexing: Option<&Indexing>,
     ) -> ResampleResult<(usize, usize)> {
         // read the optional indexing struct

src/lib.rs

@@ -164,10 +164,10 @@ where
     /// Both input and output are allowed to be longer than required.
     /// The number of input samples consumed and the number output samples written
     /// per channel is returned in a tuple, `(input_frames, output_frames)`.
-    fn process_into_buffer<'a>(
+    fn process_into_buffer<'a, 'b>(
         &mut self,
         buffer_in: &dyn Adapter<'a, T>,
-        buffer_out: &mut dyn AdapterMut<'a, T>,
+        buffer_out: &mut dyn AdapterMut<'b, T>,
         indexing: Option<&Indexing>,
     ) -> ResampleResult<(usize, usize)>;
 
@@ -186,10 +186,10 @@ where
     /// [process_into_buffer](Resampler::process_into_buffer).
     ///
     /// Returns the lengths of the original input and the resampled output.
-    fn process_all_into_buffer<'a>(
+    fn process_all_into_buffer<'a, 'b>(
         &mut self,
         buffer_in: &dyn Adapter<'a, T>,
-        buffer_out: &mut dyn AdapterMut<'a, T>,
+        buffer_out: &mut dyn AdapterMut<'b, T>,
         input_len: usize,
         active_channels_mask: Option<&[bool]>,
     ) -> ResampleResult<(usize, usize)> {
@@ -341,9 +341,9 @@ where
     }
 }
 
-pub(crate) fn validate_buffers<'a, T: 'a>(
+pub(crate) fn validate_buffers<'a, 'b, T: 'a + 'b>(
     wave_in: &dyn Adapter<'a, T>,
-    wave_out: &dyn AdapterMut<'a, T>,
+    wave_out: &dyn AdapterMut<'b, T>,
     mask: &[bool],
     channels: usize,
     min_input_len: usize,

src/synchro.rs

@@ -401,10 +401,10 @@ impl<T> Resampler<T> for Fft<T>
 where
     T: Sample,
 {
-    fn process_into_buffer<'a>(
+    fn process_into_buffer<'a, 'b>(
         &mut self,
         buffer_in: &dyn Adapter<'a, T>,
-        buffer_out: &mut dyn AdapterMut<'a, T>,
+        buffer_out: &mut dyn AdapterMut<'b, T>,
         indexing: Option<&Indexing>,
     ) -> ResampleResult<(usize, usize)> {
         // read the optional indexing struct