talksik/client-sdk-rust
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Working DataChannel

Browse Source
This commit is contained in:
Théo Monnom
2022-09-20 14:37:47 +02:00
parent 8380ffadef
commit 8111b97782
9 changed files with 245 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/livekit-webrtc/libwebrtc-sys/src/data_channel.cpp
+9 -1
View File
@@ -21,6 +21,14 @@ namespace livekit {
data_channel_->UnregisterObserver();
}
bool DataChannel::send(const DataBuffer &buffer) {
return data_channel_->Send(webrtc::DataBuffer{rtc::CopyOnWriteBuffer(buffer.ptr, buffer.len), buffer.binary });
}
rust::String DataChannel::label() const{
return data_channel_->label();
}
void DataChannel::close() {
return data_channel_->Close();
}
@@ -55,7 +63,7 @@ namespace livekit {
void NativeDataChannelObserver::OnMessage(const webrtc::DataBuffer &buffer) {
DataBuffer data{};
data.binary = buffer.data.data();
data.ptr = buffer.data.data();
data.len = buffer.data.size();
data.binary = buffer.binary;
observer_->on_message(data);
crates/livekit-webrtc/libwebrtc-sys/src/data_channel.rs
+18 -6
View File
@@ -38,6 +38,7 @@ pub mod ffi {
}
#[derive(Debug)]
#[repr(u32)]
pub enum DataState {
Connecting,
Open,
@@ -68,6 +69,8 @@ pub mod ffi {
);
fn unregister_observer(self: Pin<&mut DataChannel>);
fn send(self: Pin<&mut DataChannel>, data: &DataBuffer) -> bool;
fn label(self: &DataChannel) -> String;
fn close(self: Pin<&mut DataChannel>);
fn create_data_channel_init(init: DataChannelInit) -> UniquePtr<NativeDataChannelInit>;
@@ -79,6 +82,9 @@ pub mod ffi {
}
}
unsafe impl Send for ffi::DataChannel {}
unsafe impl Send for ffi::NativeDataChannelObserver {}
// DataChannelObserver
pub trait DataChannelObserver: Send {
@@ -88,24 +94,30 @@ pub trait DataChannelObserver: Send {
}
pub struct DataChannelObserverWrapper {
observer: Box<dyn DataChannelObserver>,
observer: *mut dyn DataChannelObserver,
}
impl DataChannelObserverWrapper {
pub fn new(observer: Box<dyn DataChannelObserver>) -> Self {
/// SAFETY
/// DataChannelObserver must lives as long as DataChannelObserverWrapper does
pub unsafe fn new(observer: *mut dyn DataChannelObserver) -> Self {
Self { observer }
}
fn on_state_change(&self) {
self.observer.on_state_change();
unsafe {
(*self.observer).on_state_change();
}
}
fn on_message(&self, buffer: ffi::DataBuffer) {
let data = unsafe { slice::from_raw_parts(buffer.ptr, buffer.len) };
self.observer.on_message(data, buffer.binary);
unsafe {
let data = slice::from_raw_parts(buffer.ptr, buffer.len);
(*self.observer).on_message(data, buffer.binary);
}
}
fn on_buffered_amount_change(&self, sent_data_size: u64) {
self.observer.on_buffered_amount_change(sent_data_size);
unsafe { (*self.observer).on_buffered_amount_change(sent_data_size) };
}
}
crates/livekit-webrtc/libwebrtc-sys/src/media_stream_interface.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
namespace livekit {
MediaStreamInterface::MediaStreamInterface(rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) : media_stream_(stream) {
MediaStreamInterface::MediaStreamInterface(rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) : media_stream_(std::move(stream)) {
}
} // livekit
crates/livekit-webrtc/libwebrtc-sys/src/peer_connection.rs
+67 -44
View File
@@ -2,10 +2,10 @@ use crate::candidate::ffi::Candidate;
use crate::data_channel::ffi::DataChannel;
use crate::jsep::ffi::IceCandidate;
use crate::media_stream_interface::ffi::MediaStreamInterface;
use crate::rtc_error::ffi::RTCError;
use crate::rtp_receiver::ffi::RtpReceiver;
use crate::rtp_transceiver::ffi::RtpTransceiver;
use cxx::UniquePtr;
use crate::rtc_error::ffi::RTCError;
#[cxx::bridge(namespace = "livekit")]
pub mod ffi {
@@ -174,17 +174,11 @@ pub mod ffi {
extern "Rust" {
type AddIceCandidateObserverWrapper;
fn on_complete(
self: &AddIceCandidateObserverWrapper,
error: RTCError,
);
fn on_complete(self: &AddIceCandidateObserverWrapper, error: RTCError);
type PeerConnectionObserverWrapper;
fn on_signaling_change(
self: &PeerConnectionObserverWrapper,
new_state: SignalingState,
);
fn on_signaling_change(self: &PeerConnectionObserverWrapper, new_state: SignalingState);
fn on_add_stream(
self: &PeerConnectionObserverWrapper,
stream: UniquePtr<MediaStreamInterface>,
@@ -244,14 +238,8 @@ pub mod ffi {
receiver: UniquePtr<RtpReceiver>,
streams: Vec<MediaStreamPtr>,
);
fn on_track(
self: &PeerConnectionObserverWrapper,
transceiver: UniquePtr<RtpTransceiver>,
);
fn on_remove_track(
self: &PeerConnectionObserverWrapper,
receiver: UniquePtr<RtpReceiver>,
);
fn on_track(self: &PeerConnectionObserverWrapper, transceiver: UniquePtr<RtpTransceiver>);
fn on_remove_track(self: &PeerConnectionObserverWrapper, receiver: UniquePtr<RtpReceiver>);
fn on_interesting_usage(self: &PeerConnectionObserverWrapper, usage_pattern: i32);
}
}
@@ -260,6 +248,8 @@ pub mod ffi {
unsafe impl Sync for ffi::PeerConnection {}
unsafe impl Send for ffi::PeerConnection {}
unsafe impl Send for ffi::NativePeerConnectionObserver {}
impl Default for ffi::RTCOfferAnswerOptions {
/*
static const int kUndefined = -1;
@@ -281,9 +271,8 @@ impl Default for ffi::RTCOfferAnswerOptions {
}
}
pub struct AddIceCandidateObserverWrapper {
observer: Box<dyn Fn(RTCError) + Send>
observer: Box<dyn Fn(RTCError) + Send>,
}
impl AddIceCandidateObserverWrapper {
@@ -291,7 +280,7 @@ impl AddIceCandidateObserverWrapper {
Self { observer }
}
fn on_complete(&self, error: RTCError){
fn on_complete(&self, error: RTCError) {
(self.observer)(error);
}
}
@@ -342,47 +331,69 @@ impl PeerConnectionObserverWrapper {
}
fn on_signaling_change(&self, new_state: ffi::SignalingState) {
unsafe { (*self.observer).on_signaling_change(new_state); }
unsafe {
(*self.observer).on_signaling_change(new_state);
}
}
fn on_add_stream(&self, stream: UniquePtr<MediaStreamInterface>) {
unsafe { (*self.observer).on_add_stream(stream); }
unsafe {
(*self.observer).on_add_stream(stream);
}
}
fn on_remove_stream(&self, stream: UniquePtr<MediaStreamInterface>) {
unsafe { (*self.observer).on_remove_stream(stream); }
unsafe {
(*self.observer).on_remove_stream(stream);
}
}
fn on_data_channel(&self, data_channel: UniquePtr<DataChannel>) {
unsafe { (*self.observer).on_data_channel(data_channel); }
unsafe {
(*self.observer).on_data_channel(data_channel);
}
}
fn on_renegotiation_needed(&self) {
unsafe { (*self.observer).on_renegotiation_needed(); }
unsafe {
(*self.observer).on_renegotiation_needed();
}
}
fn on_negotiation_needed_event(&self, event: u32) {
unsafe { (*self.observer).on_negotiation_needed_event(event); }
unsafe {
(*self.observer).on_negotiation_needed_event(event);
}
}
fn on_ice_connection_change(&self, new_state: ffi::IceConnectionState) {
unsafe { (*self.observer).on_ice_connection_change(new_state); }
unsafe {
(*self.observer).on_ice_connection_change(new_state);
}
}
fn on_standardized_ice_connection_change(&self, new_state: ffi::IceConnectionState) {
unsafe { (*self.observer).on_standardized_ice_connection_change(new_state); }
unsafe {
(*self.observer).on_standardized_ice_connection_change(new_state);
}
}
fn on_connection_change(&self, new_state: ffi::PeerConnectionState) {
unsafe { (*self.observer).on_connection_change(new_state); }
unsafe {
(*self.observer).on_connection_change(new_state);
}
}
fn on_ice_gathering_change(&self, new_state: ffi::IceGatheringState) {
unsafe { (*self.observer).on_ice_gathering_change(new_state); }
unsafe {
(*self.observer).on_ice_gathering_change(new_state);
}
}
fn on_ice_candidate(&self, candidate: UniquePtr<IceCandidate>) {
unsafe { (*self.observer).on_ice_candidate(candidate); }
unsafe {
(*self.observer).on_ice_candidate(candidate);
}
}
fn on_ice_candidate_error(
@@ -393,7 +404,9 @@ impl PeerConnectionObserverWrapper {
error_code: i32,
error_text: String,
) {
unsafe { (*self.observer).on_ice_candidate_error(address, port, url, error_code, error_text); }
unsafe {
(*self.observer).on_ice_candidate_error(address, port, url, error_code, error_text);
}
}
fn on_ice_candidates_removed(&self, removed: Vec<ffi::CandidatePtr>) {
@@ -403,40 +416,50 @@ impl PeerConnectionObserverWrapper {
vec.push(v.ptr);
}
unsafe { (*self.observer).on_ice_candidates_removed(vec); }
unsafe {
(*self.observer).on_ice_candidates_removed(vec);
}
}
fn on_ice_connection_receiving_change(&self, receiving: bool) {
unsafe { (*self.observer).on_ice_connection_receiving_change(receiving); }
unsafe {
(*self.observer).on_ice_connection_receiving_change(receiving);
}
}
fn on_ice_selected_candidate_pair_changed(&self, event: ffi::CandidatePairChangeEvent) {
unsafe { (*self.observer).on_ice_selected_candidate_pair_changed(event); }
unsafe {
(*self.observer).on_ice_selected_candidate_pair_changed(event);
}
}
fn on_add_track(
&self,
receiver: UniquePtr<RtpReceiver>,
streams: Vec<ffi::MediaStreamPtr>,
) {
fn on_add_track(&self, receiver: UniquePtr<RtpReceiver>, streams: Vec<ffi::MediaStreamPtr>) {
let mut vec = Vec::new();
for v in streams {
vec.push(v.ptr);
}
unsafe { (*self.observer).on_add_track(receiver, vec); }
unsafe {
(*self.observer).on_add_track(receiver, vec);
}
}
fn on_track(&self, transceiver: UniquePtr<RtpTransceiver>) {
unsafe { (*self.observer).on_track(transceiver); }
unsafe {
(*self.observer).on_track(transceiver);
}
}
fn on_remove_track(&self, receiver: UniquePtr<RtpReceiver>) {
unsafe { (*self.observer).on_remove_track(receiver); }
unsafe {
(*self.observer).on_remove_track(receiver);
}
}
fn on_interesting_usage(&self, usage_pattern: i32) {
unsafe { (*self.observer).on_interesting_usage(usage_pattern); }
unsafe {
(*self.observer).on_interesting_usage(usage_pattern);
}
}
}