Native audio buffer

Author: ladvoc

livekit-uniffi/generated/kotlin/uniffi/livekit_uniffi/livekit_uniffi.kt

@@ -832,7 +832,7 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) {
     if (lib.uniffi_livekit_uniffi_checksum_method_resampler_flush() != 32136.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_livekit_uniffi_checksum_method_resampler_push() != 59438.toShort()) {
+    if (lib.uniffi_livekit_uniffi_checksum_method_resampler_push() != 58546.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
     if (lib.uniffi_livekit_uniffi_checksum_constructor_resampler_new() != 65134.toShort()) {
@@ -1363,7 +1363,7 @@ public interface ResamplerInterface {
      * and output rates, and returns any resampled data that is available after processing the input.
 
      */
-    fun `push`(`input`: List<kotlin.Short>): List<kotlin.Short>
+    fun `push`(`input`: NativeAudioBuffer): List<kotlin.Short>
 
     companion object
 }
@@ -1504,13 +1504,13 @@ open class Resampler: Disposable, AutoCloseable, ResamplerInterface
      * and output rates, and returns any resampled data that is available after processing the input.
 
      */
-    @Throws(ResamplerException::class)override fun `push`(`input`: List<kotlin.Short>): List<kotlin.Short> {
+    @Throws(ResamplerException::class)override fun `push`(`input`: NativeAudioBuffer): List<kotlin.Short> {
             return FfiConverterSequenceShort.lift(
     callWithHandle {
     uniffiRustCallWithError(ResamplerException) { _status ->
     UniffiLib.uniffi_livekit_uniffi_fn_method_resampler_push(
         it,
-        FfiConverterSequenceShort.lower(`input`),_status)
+        FfiConverterTypeNativeAudioBuffer.lower(`input`),_status)
 }
     }
     )
@@ -1731,6 +1731,45 @@ public object FfiConverterTypeLogForwardEntry: FfiConverterRustBuffer<LogForward
 
 
 
+/**
+ * A buffer owned by and whose lifetime is managed by the foreign language.
+ */
+data class NativeAudioBuffer (
+    var `ptr`: kotlin.ULong
+    , 
+    var `len`: kotlin.ULong
+    
+){
+    
+
+    
+    companion object
+}
+
+/**
+ * @suppress
+ */
+public object FfiConverterTypeNativeAudioBuffer: FfiConverterRustBuffer<NativeAudioBuffer> {
+    override fun read(buf: ByteBuffer): NativeAudioBuffer {
+        return NativeAudioBuffer(
+            FfiConverterULong.read(buf),
+            FfiConverterULong.read(buf),
+        )
+    }
+
+    override fun allocationSize(value: NativeAudioBuffer) = (
+            FfiConverterULong.allocationSize(value.`ptr`) +
+            FfiConverterULong.allocationSize(value.`len`)
+    )
+
+    override fun write(value: NativeAudioBuffer, buf: ByteBuffer) {
+            FfiConverterULong.write(value.`ptr`, buf)
+            FfiConverterULong.write(value.`len`, buf)
+    }
+}
+
+
+
 data class ResamplerSettings (
     var `inputRate`: kotlin.Double
     , 

livekit-uniffi/generated/python/livekit_uniffi.py

@@ -493,7 +493,7 @@ def _uniffi_check_api_checksums(lib):
         raise InternalError("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     if lib.uniffi_livekit_uniffi_checksum_method_resampler_flush() != 32136:
         raise InternalError("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
-    if lib.uniffi_livekit_uniffi_checksum_method_resampler_push() != 59438:
+    if lib.uniffi_livekit_uniffi_checksum_method_resampler_push() != 58546:
         raise InternalError("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
 
 # A ctypes library to expose the extern-C FFI definitions.
@@ -1500,6 +1500,45 @@ def write(value, buf):
         _UniffiFfiConverterOptionalUInt32.write(value.line, buf)
         _UniffiFfiConverterString.write(value.message, buf)
 
+@dataclass
+class NativeAudioBuffer:
+    """
+    A buffer owned by and whose lifetime is managed by the foreign language.
+"""
+    def __init__(self, *, ptr:int, len:int):
+        self.ptr = ptr
+        self.len = len
+        
+        
+
+    
+    def __str__(self):
+        return "NativeAudioBuffer(ptr={}, len={})".format(self.ptr, self.len)
+    def __eq__(self, other):
+        if self.ptr != other.ptr:
+            return False
+        if self.len != other.len:
+            return False
+        return True
+
+class _UniffiFfiConverterTypeNativeAudioBuffer(_UniffiConverterRustBuffer):
+    @staticmethod
+    def read(buf):
+        return NativeAudioBuffer(
+            ptr=_UniffiFfiConverterUInt64.read(buf),
+            len=_UniffiFfiConverterUInt64.read(buf),
+        )
+
+    @staticmethod
+    def check_lower(value):
+        _UniffiFfiConverterUInt64.check_lower(value.ptr)
+        _UniffiFfiConverterUInt64.check_lower(value.len)
+
+    @staticmethod
+    def write(value, buf):
+        _UniffiFfiConverterUInt64.write(value.ptr, buf)
+        _UniffiFfiConverterUInt64.write(value.len, buf)
+
 class _UniffiFfiConverterFloat64(_UniffiConverterPrimitiveFloat):
     @staticmethod
     def read(buf):
@@ -2121,7 +2160,7 @@ def flush(self, ) -> typing.List[int]:
 
 """
         raise NotImplementedError
-    def push(self, input: typing.List[int]) -> typing.List[int]:
+    def push(self, input: NativeAudioBuffer) -> typing.List[int]:
         """
         Push audio data into the resampler and retrieve any available resampled data.
 
@@ -2188,7 +2227,7 @@ def flush(self, ) -> typing.List[int]:
             *_uniffi_lowered_args,
         )
         return _uniffi_lift_return(_uniffi_ffi_result)
-    def push(self, input: typing.List[int]) -> typing.List[int]:
+    def push(self, input: NativeAudioBuffer) -> typing.List[int]:
         """
         Push audio data into the resampler and retrieve any available resampled data.
 
@@ -2197,10 +2236,10 @@ def push(self, input: typing.List[int]) -> typing.List[int]:
 
 """
 
-        _UniffiFfiConverterSequenceInt16.check_lower(input)
+        _UniffiFfiConverterTypeNativeAudioBuffer.check_lower(input)
         _uniffi_lowered_args = (
             self._uniffi_clone_handle(),
-            _UniffiFfiConverterSequenceInt16.lower(input),
+            _UniffiFfiConverterTypeNativeAudioBuffer.lower(input),
         )
         _uniffi_lift_return = _UniffiFfiConverterSequenceInt16.lift
         _uniffi_error_converter = _UniffiFfiConverterTypeResamplerError
@@ -2419,6 +2458,7 @@ def verify_token(token: str,credentials: typing.Optional[ApiCredentials]) -> Cla
     "SipGrants",
     "Claims",
     "LogForwardEntry",
+    "NativeAudioBuffer",
     "ResamplerSettings",
     "TokenOptions",
     "build_version",

livekit-uniffi/generated/swift/livekit_uniffi.swift

@@ -594,7 +594,7 @@ public protocol ResamplerProtocol: AnyObject, Sendable {
      * and output rates, and returns any resampled data that is available after processing the input.
 
      */
-    func push(input: [Int16]) throws  -> [Int16]
+    func push(input: NativeAudioBuffer) throws  -> [Int16]
 
 }
 open class Resampler: ResamplerProtocol, @unchecked Sendable {
@@ -678,11 +678,11 @@ open func flush()throws  -> [Int16]  {
      * and output rates, and returns any resampled data that is available after processing the input.
 
      */
-open func push(input: [Int16])throws  -> [Int16]  {
+open func push(input: NativeAudioBuffer)throws  -> [Int16]  {
     return try  FfiConverterSequenceInt16.lift(try rustCallWithError(FfiConverterTypeResamplerError_lift) {
     uniffi_livekit_uniffi_fn_method_resampler_push(
             self.uniffiCloneHandle(),
-        FfiConverterSequenceInt16.lower(input),$0
+        FfiConverterTypeNativeAudioBuffer_lower(input),$0
     )
 })
 }
@@ -945,6 +945,61 @@ public func FfiConverterTypeLogForwardEntry_lower(_ value: LogForwardEntry) -> R
 }
 
 
+/**
+ * A buffer owned by and whose lifetime is managed by the foreign language.
+ */
+public struct NativeAudioBuffer: Equatable, Hashable {
+    public var ptr: UInt64
+    public var len: UInt64
+
+    // Default memberwise initializers are never public by default, so we
+    // declare one manually.
+    public init(ptr: UInt64, len: UInt64) {
+        self.ptr = ptr
+        self.len = len
+    }
+
+    
+}
+
+#if compiler(>=6)
+extension NativeAudioBuffer: Sendable {}
+#endif
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public struct FfiConverterTypeNativeAudioBuffer: FfiConverterRustBuffer {
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> NativeAudioBuffer {
+        return
+            try NativeAudioBuffer(
+                ptr: FfiConverterUInt64.read(from: &buf), 
+                len: FfiConverterUInt64.read(from: &buf)
+        )
+    }
+
+    public static func write(_ value: NativeAudioBuffer, into buf: inout [UInt8]) {
+        FfiConverterUInt64.write(value.ptr, into: &buf)
+        FfiConverterUInt64.write(value.len, into: &buf)
+    }
+}
+
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterTypeNativeAudioBuffer_lift(_ buf: RustBuffer) throws -> NativeAudioBuffer {
+    return try FfiConverterTypeNativeAudioBuffer.lift(buf)
+}
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterTypeNativeAudioBuffer_lower(_ value: NativeAudioBuffer) -> RustBuffer {
+    return FfiConverterTypeNativeAudioBuffer.lower(value)
+}
+
+
 public struct ResamplerSettings: Equatable, Hashable {
     public var inputRate: Double
     public var outputRate: Double
@@ -2127,7 +2182,7 @@ private let initializationResult: InitializationResult = {
     if (uniffi_livekit_uniffi_checksum_method_resampler_flush() != 32136) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_livekit_uniffi_checksum_method_resampler_push() != 59438) {
+    if (uniffi_livekit_uniffi_checksum_method_resampler_push() != 58546) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_livekit_uniffi_checksum_constructor_resampler_new() != 65134) {

livekit-uniffi/src/audio.rs

@@ -17,6 +17,23 @@ use livekit_audio::resampler::{
 };
 use std::sync::Mutex;
 
+/// A buffer owned by and whose lifetime is managed by the foreign language.
+#[derive(uniffi::Record)]
+pub struct NativeAudioBuffer {
+    ptr: u64,
+    len: u64,
+}
+
+impl NativeAudioBuffer {
+    /// Forms a read-only slice to the underlying memory owned by the foreign language.
+    unsafe fn as_slice(&self) -> &[i16] {
+        if self.ptr == 0 {
+            panic!("Foreign language passed a null pointer")
+        }
+        std::slice::from_raw_parts(self.ptr as *const i16, self.len as usize)
+    }
+}
+
 #[uniffi::remote(Error)]
 pub enum ResamplerError {
     Initialization(String),
@@ -58,9 +75,10 @@ impl Resampler {
     /// This method accepts audio data, resamples it according to the configured input
     /// and output rates, and returns any resampled data that is available after processing the input.
     ///
-    pub fn push(&self, input: &[i16]) -> Result<Vec<i16>, ResamplerError> {
+    pub fn push(&self, input: NativeAudioBuffer) -> Result<Vec<i16>, ResamplerError> {
         let mut inner = self.inner.lock().unwrap();
-        Ok(inner.push(input)?.to_vec())
+        let slice = unsafe { input.as_slice() };
+        Ok(inner.push(slice)?.to_vec())
     }
 
     /// Flush any remaining audio data through the resampler and retrieve the resampled data.