finish proto of livekit-ffi (#36)

* ffi req * handle req_id * remaining room events * fix * Update ffi.proto * use sid instead of info * state -> stream_state * "s" * participant is optional on data received * add ReleaseHandleRequest * Update ffi.proto * add DataPacketKind * VideoSinkInfo * append info It looks nicer on the FFI languages * wip * keep it simple * Update ffi.proto * update server to latest proto * to_i420 * i420_to_abgr * to_argb * add publications to ParticipantInfo It'll be used when we join a Room * cleanup + DisposeRequest * fix compilation * send the whole buffer info with to_i420
2023-02-06 00:57:43 +01:00
parent 1610f86316
commit e023b34fd1
14 changed files with 832 additions and 239 deletions
@@ -1,43 +1,98 @@
-use std::convert::TryInto;
+use thiserror::Error;

 use webrtc_sys::yuv_helper as yuv_sys;

-pub fn i420_to_abgr(
+#[derive(Error, Debug)]
+pub enum ConvertError {
+    #[error("conversion failed: {0}")]
+    Convert(&'static str),
+}
+
+fn i420_safety(
    src_y: &[u8],
    src_stride_y: i32,
    src_u: &[u8],
    src_stride_u: i32,
    src_v: &[u8],
    src_stride_v: i32,
-    dst_abgr: &mut [u8],
-    dst_stride_abgr: i32,
-    width: i32,
+    dst: &mut [u8],
+    dst_stride: i32,
+    _width: i32,
    height: i32,
-) {
-    // Assert minimum capacity for safety
-    let chroma_height = (height + 1) / 2; // the buffer should be padded?
-    let min_y: usize = (src_stride_y * height).try_into().unwrap();
-    let min_u: usize = (src_stride_u * chroma_height).try_into().unwrap();
-    let min_v: usize = (src_stride_v * chroma_height).try_into().unwrap();
-    let min_abgr: usize = (dst_stride_abgr * height).try_into().unwrap();
+) -> Result<(), ConvertError> {
+    let chroma_height = (height + 1) / 2;
+    let min_y = (src_stride_y * height) as usize;
+    let min_u = (src_stride_u * chroma_height) as usize;
+    let min_v = (src_stride_v * chroma_height) as usize;
+    let min_dst = (dst_stride * height) as usize;

-    assert!(src_y.len() >= min_y);
-    assert!(src_u.len() >= min_u);
-    assert!(src_v.len() >= min_v);
-    assert!(dst_abgr.len() >= min_abgr);
-
-    unsafe {
-        yuv_sys::ffi::i420_to_abgr(
-            src_y.as_ptr(),
-            src_stride_y,
-            src_u.as_ptr(),
-            src_stride_u,
-            src_v.as_ptr(),
-            src_stride_v,
-            dst_abgr.as_mut_ptr(),
-            dst_stride_abgr,
-            width,
-            height,
-        );
+    if src_y.len() < min_y {
+        return Err(ConvertError::Convert("src_y isn't large enough"));
    }
+
+    if src_u.len() < min_u {
+        return Err(ConvertError::Convert("src_u isn't large enough"));
+    }
+
+    if src_v.len() < min_v {
+        return Err(ConvertError::Convert("src_v isn't large enough"));
+    }
+
+    if dst.len() < min_dst {
+        return Err(ConvertError::Convert("dst isn't large enough"));
+    }
+
+    Ok(())
 }
+
+macro_rules! i420_to_x {
+    ($x:ident) => {
+        pub fn $x(
+            src_y: &[u8],
+            src_stride_y: i32,
+            src_u: &[u8],
+            src_stride_u: i32,
+            src_v: &[u8],
+            src_stride_v: i32,
+            dst: &mut [u8],
+            dst_stride: i32,
+            width: i32,
+            height: i32,
+        ) -> Result<(), ConvertError> {
+            i420_safety(
+                src_y,
+                src_stride_y,
+                src_u,
+                src_stride_u,
+                src_v,
+                src_stride_v,
+                dst,
+                dst_stride,
+                width,
+                height,
+            )?;
+
+            unsafe {
+                yuv_sys::ffi::$x(
+                    src_y.as_ptr(),
+                    src_stride_y,
+                    src_u.as_ptr(),
+                    src_stride_u,
+                    src_v.as_ptr(),
+                    src_stride_v,
+                    dst.as_mut_ptr(),
+                    dst_stride,
+                    width,
+                    height,
+                );
+            }
+
+            Ok(())
+        }
+    };
+}
+
+i420_to_x!(i420_to_argb);
+i420_to_x!(i420_to_bgra);
+i420_to_x!(i420_to_abgr);
+i420_to_x!(i420_to_rgba);