Started Room, publisher negotiation, add RTCRuntime dependencies across webrtc instances

crates/livekit-webrtc/libwebrtc-sys/include/livekit/data_channel.h

@@ -10,6 +10,7 @@
 #include "api/data_channel_interface.h"
 #include "rust/cxx.h"
 #include "rust_types.h"
+#include "webrtc.h"
 
 namespace livekit {
 using NativeDataChannelInit = webrtc::DataChannelInit;
@@ -18,15 +19,18 @@ class NativeDataChannelObserver;
 class DataChannel {
  public:
   explicit DataChannel(
+      std::shared_ptr<RTCRuntime> rtc_runtime,
       rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel);
 
   void register_observer(NativeDataChannelObserver& observer);
   void unregister_observer();
   bool send(const DataBuffer& buffer);
   rust::String label() const;
+  DataState state() const;
   void close();
 
  private:
+  std::shared_ptr<RTCRuntime> rtc_runtime_;
   rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel_;
 };
 

crates/livekit-webrtc/libwebrtc-sys/include/livekit/jsep.h

@@ -18,7 +18,11 @@ class IceCandidate {
  public:
   explicit IceCandidate(
       std::unique_ptr<webrtc::IceCandidateInterface> ice_candidate);
-
+  
+  rust::String sdp_mid() const;
+  int sdp_mline_index() const;
+  rust::String candidate() const; // TODO(theomonnom) Return livekit::Candidate instead of rust::String
+  
   rust::String stringify() const;
   std::unique_ptr<webrtc::IceCandidateInterface> release();
 

crates/livekit-webrtc/libwebrtc-sys/include/livekit/peer_connection.h

@@ -12,6 +12,7 @@
 #include "jsep.h"
 #include "rust/cxx.h"
 #include "rust_types.h"
+#include "webrtc.h"
 
 namespace livekit {
 class NativeAddIceCandidateObserver;
@@ -19,6 +20,7 @@ class NativeAddIceCandidateObserver;
 class PeerConnection {
  public:
   explicit PeerConnection(
+      std::shared_ptr<RTCRuntime> rtc_runtime,
       rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection);
 
   void create_offer(NativeCreateSdpObserverHandle& observer,
@@ -38,9 +40,11 @@ class PeerConnection {
   std::unique_ptr<SessionDescription> remote_description() const;
   SignalingState signaling_state() const;
   IceGatheringState ice_gathering_state() const;
+  IceConnectionState ice_connection_state() const;
   void close();
 
  private:
+  std::shared_ptr<RTCRuntime> rtc_runtime_;
   rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
 };
 
@@ -65,7 +69,7 @@ create_native_add_ice_candidate_observer(
 
 class NativePeerConnectionObserver : public webrtc::PeerConnectionObserver {
  public:
-  explicit NativePeerConnectionObserver(
+  explicit NativePeerConnectionObserver(std::shared_ptr<RTCRuntime> rtc_runtime,
       rust::Box<PeerConnectionObserverWrapper> observer);
 
   void OnSignalingChange(
@@ -126,11 +130,13 @@ class NativePeerConnectionObserver : public webrtc::PeerConnectionObserver {
   void OnInterestingUsage(int usage_pattern) override;
 
  private:
+  std::shared_ptr<RTCRuntime> rtc_runtime_;
   rust::Box<PeerConnectionObserverWrapper> observer_;
 };
 
 std::unique_ptr<NativePeerConnectionObserver>
 create_native_peer_connection_observer(
+    std::shared_ptr<RTCRuntime> rtc_runtime,
     rust::Box<PeerConnectionObserverWrapper> observer);
 }  // namespace livekit
 

crates/livekit-webrtc/libwebrtc-sys/include/livekit/peer_connection_factory.h

@@ -8,6 +8,7 @@
 #include "api/peer_connection_interface.h"
 #include "peer_connection.h"
 #include "rust_types.h"
+#include "webrtc.h"
 
 namespace livekit {
 using NativeRTCConfiguration =
@@ -15,21 +16,19 @@ using NativeRTCConfiguration =
 
 class PeerConnectionFactory {
  public:
-  PeerConnectionFactory();
+  explicit PeerConnectionFactory(std::shared_ptr<RTCRuntime> rtc_runtime);
+  ~PeerConnectionFactory();
 
   std::unique_ptr<PeerConnection> create_peer_connection(
       std::unique_ptr<NativeRTCConfiguration> config,
       NativePeerConnectionObserver& observer) const;
 
  private:
-  std::unique_ptr<rtc::Thread> network_thread_;
-  std::unique_ptr<rtc::Thread> worker_thread_;
-  std::unique_ptr<rtc::Thread> signaling_thread_;
-
+  std::shared_ptr<RTCRuntime> rtc_runtime_;
   rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> peer_factory_;
 };
 
-std::unique_ptr<PeerConnectionFactory> create_peer_connection_factory();
+std::unique_ptr<PeerConnectionFactory> create_peer_connection_factory(std::shared_ptr<RTCRuntime> rtc_runtime);
 std::unique_ptr<NativeRTCConfiguration> create_rtc_configuration(
     RTCConfiguration conf);
 }  // namespace livekit

crates/livekit-webrtc/libwebrtc-sys/include/livekit/rust_types.h

@@ -22,6 +22,7 @@ enum class SignalingState;
 enum class IceConnectionState;
 enum class IceGatheringState;
 enum class SdpType;
+enum class DataState;
 struct SdpParseError;
 struct RTCOfferAnswerOptions;
 struct RTCError;

crates/livekit-webrtc/libwebrtc-sys/include/livekit/webrtc.h

@@ -22,13 +22,20 @@ class RTCRuntime {
   RTCRuntime(const RTCRuntime&) = delete;
   RTCRuntime& operator=(const RTCRuntime&) = delete;
 
+  rtc::Thread* network_thread() const;
+  rtc::Thread* worker_thread() const;
+  rtc::Thread* signaling_thread() const;
+
  private:
+  std::unique_ptr<rtc::Thread> network_thread_;
+  std::unique_ptr<rtc::Thread> worker_thread_;
+  std::unique_ptr<rtc::Thread> signaling_thread_;
 #ifdef WEBRTC_WIN
   rtc::WinsockInitializer winsock_;
 #endif
 };
 
-std::unique_ptr<RTCRuntime> create_rtc_runtime();
+std::shared_ptr<RTCRuntime> create_rtc_runtime();
 
 }  // namespace livekit