Restore code structure.

cloudwebrtc · cloudwebrtc · commit 7c36b47df45d · 2026-01-13T10:58:09.000+08:00
diff --git a/examples/local_audio/src/main.rs b/examples/local_audio/src/main.rs
@@ -12,7 +12,7 @@ use cpal::traits::{DeviceTrait, HostTrait};
 use cpal::{Device, SampleRate, StreamConfig};
 use db_meter::display_dual_db_meters;
 use futures_util::StreamExt;
-use libwebrtc::apm::AudioProcessingModule;
+use libwebrtc::native::apm::AudioProcessingModule;
 use livekit::{
     options::TrackPublishOptions,
     track::{LocalAudioTrack, LocalTrack, TrackSource},
diff --git a/examples/save_to_disk/src/main.rs b/examples/save_to_disk/src/main.rs
@@ -1,8 +1,8 @@
 use bytes::{BufMut, BytesMut};
 use futures::StreamExt;
 use livekit::prelude::*;
-use livekit::webrtc::audio_resampler;
 use livekit::webrtc::audio_stream::native::NativeAudioStream;
+use livekit::webrtc::native::audio_resampler;
 use std::env;
 use tokio::fs::File;
 use tokio::io::{AsyncWriteExt, BufWriter};
diff --git a/examples/screensharing/src/lib.rs b/examples/screensharing/src/lib.rs
@@ -4,15 +4,15 @@ mod test {
     use livekit::options::{TrackPublishOptions, VideoCodec};
     use livekit::prelude::*;
     use livekit::track::{LocalTrack, LocalVideoTrack, TrackSource};
-    use livekit::webrtc::desktop_capturer::{
+    use livekit::webrtc::native::desktop_capturer::{
         CaptureError, DesktopCaptureSourceType, DesktopCapturer, DesktopCapturerOptions,
         DesktopFrame,
     };
-    use livekit::webrtc::yuv_helper;
     use livekit::webrtc::prelude::{
         I420Buffer, RtcVideoSource, VideoBuffer, VideoFrame, VideoResolution, VideoRotation,
     };
     use livekit::webrtc::video_source::native::NativeVideoSource;
+    use livekit::webrtc::native::yuv_helper;
     use livekit_api::access_token;
     use std::env;
     use std::sync::mpsc::{self, RecvTimeoutError, Sender};
@@ -185,7 +185,7 @@ mod test {
         let callback = {
             let mut frame_buffer = VideoFrame {
                 rotation: VideoRotation::VideoRotation0,
-                buffer: Box::new(I420Buffer::new(1, 1)),
+                buffer: I420Buffer::new(1, 1),
                 timestamp_us: 0,
             };
             move |result: Result<DesktopFrame, CaptureError>| {
@@ -218,13 +218,12 @@ mod test {
 
                 let buffer_width = frame_buffer.buffer.width() as i32;
                 let buffer_height = frame_buffer.buffer.height() as i32;
-                let i420_buffer = I420Buffer::new(width as u32, height as u32);
                 if buffer_width != width || buffer_height != height {
-                    frame_buffer.buffer = Box::new(i420_buffer);
+                    frame_buffer.buffer = I420Buffer::new(width as u32, height as u32);
                 }
 
-                let (stride_y, stride_u, stride_v) = i420_buffer.strides();
-                let (y_plane, u_plane, v_plane) = i420_buffer.data_mut();
+                let (stride_y, stride_u, stride_v) = frame_buffer.buffer.strides();
+                let (y_plane, u_plane, v_plane) = frame_buffer.buffer.data_mut();
                 yuv_helper::argb_to_i420(
                     data, stride, y_plane, stride_y, u_plane, stride_u, v_plane, stride_v, width,
                     height,
diff --git a/examples/wgpu_room/src/logo_track.rs b/examples/wgpu_room/src/logo_track.rs
@@ -6,9 +6,9 @@ use livekit::prelude::*;
 use livekit::webrtc::video_source::RtcVideoSource;
 use livekit::webrtc::video_source::VideoResolution;
 use livekit::webrtc::{
-    yuv_helper,
     video_frame::{I420Buffer, VideoFrame, VideoRotation},
     video_source::native::NativeVideoSource,
+    native::yuv_helper,
 };
 use parking_lot::Mutex;
 use std::sync::Arc;
diff --git a/examples/wgpu_room/src/video_renderer.rs b/examples/wgpu_room/src/video_renderer.rs
@@ -1,7 +1,7 @@
 use futures::StreamExt;
-use livekit::webrtc::yuv_helper;
 use livekit::webrtc::prelude::*;
-use livekit::webrtc::video_stream::NativeVideoStream;
+use livekit::webrtc::video_stream::native::NativeVideoStream;
+use livekit::webrtc::native::yuv_helper;
 use parking_lot::Mutex;
 use std::{ops::DerefMut, sync::Arc};
 
diff --git a/libwebrtc/src/lib.rs b/libwebrtc/src/lib.rs
@@ -41,8 +41,6 @@ pub struct RtcError {
 
 pub mod audio_frame;
 //pub mod audio_mixer;
-pub mod apm;
-pub mod audio_resampler;
 pub mod audio_source;
 pub mod audio_stream;
 pub mod audio_track;
@@ -54,6 +52,7 @@ pub mod frame_cryptor;
 pub mod ice_candidate;
 pub mod media_stream;
 pub mod media_stream_track;
+pub mod native;
 pub mod peer_connection;
 pub mod peer_connection_factory;
 pub mod prelude;
@@ -70,15 +69,6 @@ pub mod video_frame_builder;
 pub mod video_source;
 pub mod video_stream;
 pub mod video_track;
-pub mod yuv_helper;
-
-#[cfg(not(target_arch = "wasm32"))]
-pub mod native {
-    pub fn create_random_uuid() -> String {
-        use uuid::Uuid;
-        Uuid::new_v4().to_string()
-    }
-}
 
 #[cfg(target_os = "android")]
 pub mod android {
diff --git a/libwebrtc/src/native/apm.rs b/libwebrtc/src/native/apm.rs
@@ -14,8 +14,7 @@
 
 use crate::impl_thread_safety;
 use crate::sys;
-use crate::RtcError;
-use crate::RtcErrorType;
+use crate::{RtcError, RtcErrorType};
 
 pub struct AudioProcessingModule {
     ffi: sys::RefCounted<sys::lkAudioProcessingModule>,
diff --git a/libwebrtc/src/native/audio_resampler.rs b/libwebrtc/src/native/audio_resampler.rs
diff --git a/libwebrtc/src/native/mod.rs b/libwebrtc/src/native/mod.rs
@@ -0,0 +1,13 @@
+pub mod apm;
+pub mod audio_resampler;
+pub mod yuv_helper;
+
+pub use apm::*;
+pub use audio_resampler::*;
+pub use yuv_helper::*;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub fn create_random_uuid() -> String {
+    use uuid::Uuid;
+    Uuid::new_v4().to_string()
+}
diff --git a/libwebrtc/src/native/yuv_helper.rs b/libwebrtc/src/native/yuv_helper.rs
@@ -738,7 +738,7 @@ pub fn i010_to_argb(
     argb_assert_safety(dst_argb, dst_stride_argb, width, height);
 
     unsafe {
-        yuv_sys::rs_I010ToARGB (
+        yuv_sys::rs_I010ToARGB(
             src_y.as_ptr(),
             src_stride_y as i32,
             src_u.as_ptr(),
diff --git a/libwebrtc/src/peer_connection_factory.rs b/libwebrtc/src/peer_connection_factory.rs
@@ -222,8 +222,8 @@ mod tests {
         audio_source::{native::NativeAudioSource, AudioSourceOptions},
         audio_stream::native::NativeAudioStream,
         peer_connection_factory::native::PeerConnectionFactoryExt,
-        video_stream::NativeVideoStream,
         video_frame::{I420Buffer, VideoFrame, VideoRotation},
+        video_stream::native::NativeVideoStream,
     };
 
     #[tokio::test]
@@ -274,7 +274,7 @@ mod tests {
         let mut stream = NativeVideoStream::new(track.clone());
         let video_frame = VideoFrame {
             buffer: I420Buffer::new(640, 480),
-            rotation:  VideoRotation::VideoRotation90,
+            rotation: VideoRotation::VideoRotation90,
             timestamp_us: 0,
         };
         source.capture_frame(&video_frame);
diff --git a/libwebrtc/src/rtp_parameters.rs b/libwebrtc/src/rtp_parameters.rs
@@ -83,7 +83,7 @@ pub enum RtcpFeedbackType {
     Lntf,
     Nack,
     Remb,
-    TransportCC
+    TransportCC,
 }
 
 #[derive(Debug, Clone)]
diff --git a/libwebrtc/src/video_frame.rs b/libwebrtc/src/video_frame.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use crate::impl_thread_safety;
-use crate::{sys, yuv_helper, video_frame::internal::BufferSealed};
+use crate::{native::yuv_helper, sys, video_frame::internal::BufferSealed};
 use std::fmt::Debug;
 use thiserror::Error;
 
diff --git a/libwebrtc/src/video_frame_builder.rs b/libwebrtc/src/video_frame_builder.rs
@@ -1,7 +1,7 @@
 use crate::sys;
 
-use crate::video_frame::{VideoRotation};
-use crate::video_frame_buffer::{NativeVideoFrame};
+use crate::video_frame::VideoRotation;
+use crate::video_frame_buffer::NativeVideoFrame;
 
 pub struct VideoFrameBuilder {
     pub ffi: sys::RefCounted<sys::lkRefCountedObject>,
@@ -15,10 +15,7 @@ pub fn new_video_frame_builder() -> VideoFrameBuilder {
 impl VideoFrameBuilder {
     pub fn set_video_frame_buffer_ptr(&mut self, ffi: sys::RefCounted<sys::lkRefCountedObject>) {
         unsafe {
-            sys::lkVideoFrameBuilderSetVideoFrameBuffer(
-                self.ffi.as_ptr(),
-                ffi.as_ptr(),
-            );
+            sys::lkVideoFrameBuilderSetVideoFrameBuffer(self.ffi.as_ptr(), ffi.as_ptr());
         }
     }
 
diff --git a/libwebrtc/src/video_stream.rs b/libwebrtc/src/video_stream.rs
@@ -12,65 +12,69 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{
-    pin::Pin,
-    sync::Arc,
-    task::{Context, Poll},
-};
-
-use livekit_runtime::Stream;
 use tokio::sync::mpsc;
 
 use crate::{
-    prelude::I420Buffer,
     video_frame::{BoxVideoFrame, VideoFrame},
-    video_frame_buffer::{new_video_frame_buffer, NativeVideoFrame, VideoFrameBuffer},
-    video_source::{
-        native::{NativeVideoSink, VideoSink},
-        VideoTrackSourceConstraints,
-    },
-    video_track::RtcVideoTrack,
+    video_frame_buffer::{new_video_frame_buffer, NativeVideoFrame},
+    video_source::{native::VideoSink, VideoTrackSourceConstraints},
 };
 
-pub struct NativeVideoStream {
-    native_sink: Arc<NativeVideoSink>,
-    pub video_track: RtcVideoTrack,
-    pub frame_rx: mpsc::UnboundedReceiver<BoxVideoFrame>,
-}
+pub mod native {
+    use tokio::sync::mpsc;
+    use tokio_stream::Stream;
 
-impl NativeVideoStream {
-    pub fn new(video_track: RtcVideoTrack) -> Self {
-        let (frame_tx, frame_rx) = mpsc::unbounded_channel();
-        let native_sink = Arc::new(NativeVideoSink::new(Arc::new(VideoTrackObserver { frame_tx })));
-        video_track.add_sink(native_sink.clone());
-        Self { native_sink, video_track, frame_rx }
-    }
+    use crate::{
+        prelude::{BoxVideoFrame, RtcVideoTrack},
+        video_source::native::NativeVideoSink,
+        video_stream::VideoTrackObserver,
+    };
+    use std::{
+        pin::Pin,
+        sync::Arc,
+        task::{Context, Poll},
+    };
 
-    pub fn track(&self) -> RtcVideoTrack {
-        self.video_track.clone()
+    pub struct NativeVideoStream {
+        native_sink: Arc<NativeVideoSink>,
+        pub video_track: RtcVideoTrack,
+        pub frame_rx: mpsc::UnboundedReceiver<BoxVideoFrame>,
     }
 
-    pub fn close(&mut self) {
-        self.video_track.remove_sink(self.native_sink.clone());
+    impl NativeVideoStream {
+        pub fn new(video_track: RtcVideoTrack) -> Self {
+            let (frame_tx, frame_rx) = mpsc::unbounded_channel();
+            let native_sink =
+                Arc::new(NativeVideoSink::new(Arc::new(VideoTrackObserver { frame_tx })));
+            video_track.add_sink(native_sink.clone());
+            Self { native_sink, video_track, frame_rx }
+        }
+
+        pub fn track(&self) -> RtcVideoTrack {
+            self.video_track.clone()
+        }
 
-        self.frame_rx.close();
+        pub fn close(&mut self) {
+            self.video_track.remove_sink(self.native_sink.clone());
+
+            self.frame_rx.close();
+        }
     }
-}
 
-impl Drop for NativeVideoStream {
-    fn drop(&mut self) {
-        self.close();
+    impl Drop for NativeVideoStream {
+        fn drop(&mut self) {
+            self.close();
+        }
     }
-}
 
-impl Stream for NativeVideoStream {
-    type Item = BoxVideoFrame;
+    impl Stream for NativeVideoStream {
+        type Item = BoxVideoFrame;
 
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
-        self.frame_rx.poll_recv(cx)
+        fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
+            self.frame_rx.poll_recv(cx)
+        }
     }
 }
-
 pub struct VideoTrackObserver {
     pub frame_tx: mpsc::UnboundedSender<BoxVideoFrame>,
 }
diff --git a/livekit-ffi/build_ios_framework.sh b/livekit-ffi/build_ios_framework.sh
@@ -0,0 +1,15 @@
+export LK_CUSTOM_WEBRTC=`pwd`/webrtc-sys/libwebrtc/ios-device-arm64-release
+cargo build --release --target aarch64-apple-ios
+export LK_CUSTOM_WEBRTC=`pwd`/webrtc-sys/libwebrtc/ios-simulator-arm64-release
+cargo build --release --target aarch64-apple-ios-sim
+
+xcodebuild -create-xcframework \
+  -library ../target/aarch64-apple-ios/release/liblivekit_ffi.a \
+  -library ../webrtc-sys/libwebrtc/ios-device-arm64-release/lib/libwebrtc.a \
+  -headers ./include/ \
+  -library ../target/aarch64-apple-ios-sim/release/liblivekit_ffi.a \
+  -library ../webrtc-sys/libwebrtc/ios-simulator-arm64-release/lib/libwebrtc.a \
+  -headers ./include/ \
+  -output ios/LiveKitFFI.xcframework
+
+#export LK_CUSTOM_WEBRTC=`pwd`/webrtc-sys/libwebrtc/ios-device-arm64-release
diff --git a/livekit-ffi/src/server/mod.rs b/livekit-ffi/src/server/mod.rs
@@ -25,7 +25,7 @@ use std::{
 use dashmap::{mapref::one::MappedRef, DashMap};
 use downcast_rs::{impl_downcast, Downcast};
 use livekit::webrtc::{
-    apm::AudioProcessingModule, audio_resampler::AudioResampler, prelude::*,
+    native::apm::AudioProcessingModule, native::audio_resampler::AudioResampler, prelude::*,
 };
 use parking_lot::{deadlock, Mutex};
 use tokio::{sync::oneshot, task::JoinHandle};
diff --git a/livekit-ffi/src/server/requests.rs b/livekit-ffi/src/server/requests.rs
@@ -18,7 +18,7 @@ use colorcvt::cvtimpl;
 use livekit::{
     prelude::*,
     register_audio_filter_plugin,
-    webrtc::{apm, audio_resampler, prelude::*},
+    webrtc::{native::apm, native::audio_resampler, prelude::*},
     AudioFilterPlugin,
 };
 use parking_lot::Mutex;
diff --git a/livekit-ffi/src/server/video_stream.rs b/livekit-ffi/src/server/video_stream.rs
@@ -15,7 +15,7 @@
 use futures_util::StreamExt;
 use livekit::{
     prelude::Track,
-    webrtc::{prelude::*, video_stream::NativeVideoStream},
+    webrtc::{prelude::*, video_stream::native::NativeVideoStream},
 };
 use tokio::sync::{broadcast, mpsc, oneshot};
 
