Merge branch 'livekit:main' into http-client-dispatcher

livekit · Nov 15, 2024 · 66e3d78 · 66e3d78
2 parents 1c33b48 + b41861c
commit 66e3d78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/livekit-ffi/Cargo.toml b/livekit-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "livekit-ffi"
-version = "0.12.2"
+version = "0.12.3"
 edition = "2021"
 license = "Apache-2.0"
 description = "FFI interface for bindings in other languages"

diff --git a/livekit-ffi/src/server/resampler.rs b/livekit-ffi/src/server/resampler.rs
@@ -127,6 +127,13 @@ impl SoxResampler {
             return Err(error_msg.to_string_lossy().to_string());
         }
 
+        let error = unsafe { soxr_sys::soxr_clear(self.soxr_ptr) };
+
+        if !error.is_null() {
+            let error_msg = unsafe { std::ffi::CStr::from_ptr(error) };
+            return Err(error_msg.to_string_lossy().to_string());
+        }
+
         Ok(&self.out_buf[..odone])
     }
 }