more changes.

Author: cloudwebrtc

webrtc-sys/Cargo.toml

@@ -14,9 +14,12 @@ static = []
 [dependencies]
 livekit-runtime = { workspace = true }
 log = "0.4"
+parking_lot = "0.12.5"
 serde = "1.0.228"
+serde_derive = "1.0.228"
 thiserror = "2.0.17"
 tokio = { version = "1", features = ["full"] }
+tokio-stream = "0.1.17"
 
 [build-dependencies]
 webrtc-sys-build = { workspace = true }

webrtc-sys/libwebrtc/src/livekit_rtc/BUILD.gn

@@ -32,8 +32,10 @@ lk_sources = [
   "media_stream_track.cc",
   "rtc_error.cc",
   "audio_resampler.cc",
+  #"rtp_sender.cc",
   #"desktop_capturer.cc",
   "yuv_helper.cc",
+  "rtp_parameters.cc",
 ]
 
 if (is_mac) {

webrtc-sys/libwebrtc/src/livekit_rtc/desktop_capturer.h

@@ -27,10 +27,10 @@ class DesktopCapturerOptions;
 class Source;
 }  // namespace livekit
 
-
 namespace livekit {
 
-class DesktopCapturer : public webrtc::DesktopCapturer::Callback, public webrtc::RefCountInterface {
+class DesktopCapturer : public webrtc::DesktopCapturer::Callback,
+                        public webrtc::RefCountInterface {
  public:
   explicit DesktopCapturer(std::unique_ptr<webrtc::DesktopCapturer> capturer)
       : capturer(std::move(capturer)), callback(std::nullopt) {}
@@ -48,9 +48,10 @@ class DesktopCapturer : public webrtc::DesktopCapturer::Callback, public webrtc:
   std::optional<rust::Box<DesktopCapturerCallbackWrapper>> callback;
 };
 
-class DesktopFrame {
+class DesktopFrame : public webrtc::RefCountInterface {
  public:
-  DesktopFrame(std::unique_ptr<webrtc::DesktopFrame> frame) : frame(std::move(frame)) {}
+  DesktopFrame(std::unique_ptr<webrtc::DesktopFrame> frame)
+      : frame(std::move(frame)) {}
   int32_t width() const { return frame->size().width(); }
 
   int32_t height() const { return frame->size().height(); }
@@ -67,5 +68,6 @@ class DesktopFrame {
   std::unique_ptr<webrtc::DesktopFrame> frame;
 };
 
-webrtc::scoped_refptr<DesktopCapturer> new_desktop_capturer(DesktopCapturerOptions options);
+webrtc::scoped_refptr<DesktopCapturer> new_desktop_capturer(
+    DesktopCapturerOptions options);
 }  // namespace livekit

webrtc-sys/libwebrtc/src/livekit_rtc/peer.cc

@@ -228,7 +228,8 @@ webrtc::scoped_refptr<Peer> PeerFactory::CreatePeer(
     return nullptr;
   }
 
-  return webrtc::make_ref_counted<Peer>(res.value(), obs);
+  return webrtc::make_ref_counted<Peer>(
+      webrtc::scoped_refptr<PeerFactory>(this), res.value(), obs);
 }
 
 lkRtcVideoTrack* PeerFactory::CreateVideoTrack(const char* id,

webrtc-sys/libwebrtc/src/livekit_rtc/peer.h

@@ -10,6 +10,8 @@
 
 namespace livekit {
 
+class PeerFactory;
+
 webrtc::PeerConnectionInterface::RTCConfiguration toNativeConfig(
     const lkRtcConfiguration& config);
 
@@ -48,9 +50,10 @@ class PeerObserver : public webrtc::PeerConnectionObserver,
 
 class Peer : public webrtc::RefCountInterface {
  public:
-  Peer(webrtc::scoped_refptr<webrtc::PeerConnectionInterface> pc,
+  Peer(webrtc::scoped_refptr<PeerFactory> pc_factory,
+       webrtc::scoped_refptr<webrtc::PeerConnectionInterface> pc,
        webrtc::scoped_refptr<PeerObserver> observer)
-      : observer_(observer), peer_connection_(pc) {}
+      : pc_factory_(pc_factory), observer_(observer), peer_connection_(pc) {}
 
   webrtc::scoped_refptr<DataChannel> CreateDataChannel(
       const char* label, const lkDataChannelInit* init);
@@ -80,9 +83,9 @@ class Peer : public webrtc::RefCountInterface {
   void RestartIce();
 
   lkRtpSender* AddTrack(lkMediaStreamTrack* track,
-                         lkString** streamIds,
-                         int streamIdCount,
-                         lkRtcError** error);
+                        lkString** streamIds,
+                        int streamIdCount,
+                        lkRtcError** error);
 
   lkPeerState GetPeerState() const {
     return static_cast<lkPeerState>(peer_connection_->peer_connection_state());
@@ -108,6 +111,7 @@ class Peer : public webrtc::RefCountInterface {
   bool Close();
 
  private:
+  webrtc::scoped_refptr<PeerFactory> pc_factory_;
   webrtc::scoped_refptr<PeerObserver> observer_;
   webrtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
 };