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

pc test

Browse Source
This commit is contained in:
Théo Monnom
2022-09-16 11:45:39 +02:00
parent f643f458f8
commit 06587d154f
20 changed files with 261 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/livekit-webrtc/libwebrtc-sys/src/peer_connection.rs
+71 -62
View File
@@ -1,5 +1,3 @@
use std::cell::RefCell;
use std::rc::Rc;
use crate::candidate::ffi::Candidate;
use crate::data_channel::ffi::DataChannel;
use crate::jsep::ffi::IceCandidate;
@@ -143,42 +141,45 @@ pub mod ffi {
extern "Rust" {
type PeerConnectionObserverWrapper;
fn on_signaling_change(self: &mut PeerConnectionObserverWrapper, new_state: SignalingState);
fn on_add_stream(
unsafe fn on_signaling_change(
self: &mut PeerConnectionObserverWrapper,
new_state: SignalingState,
);
unsafe fn on_add_stream(
self: &mut PeerConnectionObserverWrapper,
stream: UniquePtr<MediaStreamInterface>,
);
fn on_remove_stream(
unsafe fn on_remove_stream(
self: &mut PeerConnectionObserverWrapper,
stream: UniquePtr<MediaStreamInterface>,
);
fn on_data_channel(
unsafe fn on_data_channel(
self: &mut PeerConnectionObserverWrapper,
data_channel: UniquePtr<DataChannel>,
);
fn on_renegotiation_needed(self: &mut PeerConnectionObserverWrapper);
fn on_negotiation_needed_event(self: &mut PeerConnectionObserverWrapper, event: u32);
fn on_ice_connection_change(
unsafe fn on_renegotiation_needed(self: &mut PeerConnectionObserverWrapper);
unsafe fn on_negotiation_needed_event(self: &mut PeerConnectionObserverWrapper, event: u32);
unsafe fn on_ice_connection_change(
self: &mut PeerConnectionObserverWrapper,
new_state: IceConnectionState,
);
fn on_standardized_ice_connection_change(
unsafe fn on_standardized_ice_connection_change(
self: &mut PeerConnectionObserverWrapper,
new_state: IceConnectionState,
);
fn on_connection_change(
unsafe fn on_connection_change(
self: &mut PeerConnectionObserverWrapper,
new_state: PeerConnectionState,
);
fn on_ice_gathering_change(
unsafe fn on_ice_gathering_change(
self: &mut PeerConnectionObserverWrapper,
new_state: IceGatheringState,
);
fn on_ice_candidate(
unsafe fn on_ice_candidate(
self: &mut PeerConnectionObserverWrapper,
candidate: UniquePtr<IceCandidate>,
);
fn on_ice_candidate_error(
unsafe fn on_ice_candidate_error(
self: &mut PeerConnectionObserverWrapper,
address: String,
port: i32,
@@ -186,32 +187,35 @@ pub mod ffi {
error_code: i32,
error_text: String,
);
fn on_ice_candidates_removed(
unsafe fn on_ice_candidates_removed(
self: &mut PeerConnectionObserverWrapper,
removed: Vec<CandidatePtr>,
);
fn on_ice_connection_receiving_change(
unsafe fn on_ice_connection_receiving_change(
self: &mut PeerConnectionObserverWrapper,
receiving: bool,
);
fn on_ice_selected_candidate_pair_changed(
unsafe fn on_ice_selected_candidate_pair_changed(
self: &mut PeerConnectionObserverWrapper,
event: CandidatePairChangeEvent,
);
fn on_add_track(
unsafe fn on_add_track(
self: &mut PeerConnectionObserverWrapper,
receiver: UniquePtr<RtpReceiver>,
streams: Vec<MediaStreamPtr>,
);
fn on_track(
unsafe fn on_track(
self: &mut PeerConnectionObserverWrapper,
transceiver: UniquePtr<RtpTransceiver>,
);
fn on_remove_track(
unsafe fn on_remove_track(
self: &mut PeerConnectionObserverWrapper,
receiver: UniquePtr<RtpReceiver>,
);
fn on_interesting_usage(self: &mut PeerConnectionObserverWrapper, usage_pattern: i32);
unsafe fn on_interesting_usage(
self: &mut PeerConnectionObserverWrapper,
usage_pattern: i32,
);
}
}
@@ -273,60 +277,63 @@ pub trait PeerConnectionObserver: Send + Sync {
fn on_interesting_usage(&mut self, usage_pattern: i32);
}
// Thread safety is handled inside PeerConnectionObserver
pub struct PeerConnectionObserverWrapper {
observer: Rc<RefCell<dyn PeerConnectionObserver>>,
observer: *mut dyn PeerConnectionObserver,
}
impl PeerConnectionObserverWrapper {
pub fn new(observer: Rc<RefCell<dyn PeerConnectionObserver>>) -> Self {
/// SAFETY
/// PeerConnectionObserver must lives as long as PeerConnectionObserverWrapper does
pub unsafe fn new(observer: *mut dyn PeerConnectionObserver) -> Self {
Self { observer }
}
fn on_signaling_change(&mut self, new_state: ffi::SignalingState) {
self.observer.borrow_mut().on_signaling_change(new_state);
unsafe fn on_signaling_change(&mut self, new_state: ffi::SignalingState) {
(*self.observer).on_signaling_change(new_state);
}
fn on_add_stream(&mut self, stream: UniquePtr<MediaStreamInterface>) {
self.observer.borrow_mut().on_add_stream(stream);
unsafe fn on_add_stream(&mut self, stream: UniquePtr<MediaStreamInterface>) {
(*self.observer).on_add_stream(stream);
}
fn on_remove_stream(&mut self, stream: UniquePtr<MediaStreamInterface>) {
self.observer.borrow_mut().on_remove_stream(stream);
unsafe fn on_remove_stream(&mut self, stream: UniquePtr<MediaStreamInterface>) {
(*self.observer).on_remove_stream(stream);
}
fn on_data_channel(&mut self, data_channel: UniquePtr<DataChannel>) {
self.observer.borrow_mut().on_data_channel(data_channel);
unsafe fn on_data_channel(&mut self, data_channel: UniquePtr<DataChannel>) {
(*self.observer).on_data_channel(data_channel);
}
fn on_renegotiation_needed(&mut self) {
self.observer.borrow_mut().on_renegotiation_needed();
unsafe fn on_renegotiation_needed(&mut self) {
(*self.observer).on_renegotiation_needed();
}
fn on_negotiation_needed_event(&mut self, event: u32) {
self.observer.borrow_mut().on_negotiation_needed_event(event);
unsafe fn on_negotiation_needed_event(&mut self, event: u32) {
(*self.observer).on_negotiation_needed_event(event);
}
fn on_ice_connection_change(&mut self, new_state: ffi::IceConnectionState) {
self.observer.borrow_mut().on_ice_connection_change(new_state);
unsafe fn on_ice_connection_change(&mut self, new_state: ffi::IceConnectionState) {
(*self.observer).on_ice_connection_change(new_state);
}
fn on_standardized_ice_connection_change(&mut self, new_state: ffi::IceConnectionState) {
self.observer.borrow_mut().on_standardized_ice_connection_change(new_state);
unsafe fn on_standardized_ice_connection_change(&mut self, new_state: ffi::IceConnectionState) {
(*self.observer).on_standardized_ice_connection_change(new_state);
}
fn on_connection_change(&mut self, new_state: ffi::PeerConnectionState) {
self.observer.borrow_mut().on_connection_change(new_state);
unsafe fn on_connection_change(&mut self, new_state: ffi::PeerConnectionState) {
(*self.observer).on_connection_change(new_state);
}
fn on_ice_gathering_change(&mut self, new_state: ffi::IceGatheringState) {
self.observer.borrow_mut().on_ice_gathering_change(new_state);
unsafe fn on_ice_gathering_change(&mut self, new_state: ffi::IceGatheringState) {
(*self.observer).on_ice_gathering_change(new_state);
}
fn on_ice_candidate(&mut self, candidate: UniquePtr<IceCandidate>) {
self.observer.borrow_mut().on_ice_candidate(candidate);
unsafe fn on_ice_candidate(&mut self, candidate: UniquePtr<IceCandidate>) {
(*self.observer).on_ice_candidate(candidate);
}
fn on_ice_candidate_error(
unsafe fn on_ice_candidate_error(
&mut self,
address: String,
port: i32,
@@ -334,29 +341,31 @@ impl PeerConnectionObserverWrapper {
error_code: i32,
error_text: String,
) {
self.observer
.borrow_mut().on_ice_candidate_error(address, port, url, error_code, error_text);
(*self.observer).on_ice_candidate_error(address, port, url, error_code, error_text);
}
fn on_ice_candidates_removed(&mut self, removed: Vec<ffi::CandidatePtr>) {
unsafe fn on_ice_candidates_removed(&mut self, removed: Vec<ffi::CandidatePtr>) {
let mut vec = Vec::new();
for v in removed {
vec.push(v.ptr);
}
self.observer.borrow_mut().on_ice_candidates_removed(vec);
(*self.observer).on_ice_candidates_removed(vec);
}
fn on_ice_connection_receiving_change(&mut self, receiving: bool) {
self.observer.borrow_mut().on_ice_connection_receiving_change(receiving);
unsafe fn on_ice_connection_receiving_change(&mut self, receiving: bool) {
(*self.observer).on_ice_connection_receiving_change(receiving);
}
fn on_ice_selected_candidate_pair_changed(&mut self, event: ffi::CandidatePairChangeEvent) {
self.observer.borrow_mut().on_ice_selected_candidate_pair_changed(event);
unsafe fn on_ice_selected_candidate_pair_changed(
&mut self,
event: ffi::CandidatePairChangeEvent,
) {
(*self.observer).on_ice_selected_candidate_pair_changed(event);
}
fn on_add_track(
unsafe fn on_add_track(
&mut self,
receiver: UniquePtr<RtpReceiver>,
streams: Vec<ffi::MediaStreamPtr>,
@@ -367,18 +376,18 @@ impl PeerConnectionObserverWrapper {
vec.push(v.ptr);
}
self.observer.borrow_mut().on_add_track(receiver, vec);
(*self.observer).on_add_track(receiver, vec);
}
fn on_track(&mut self, transceiver: UniquePtr<RtpTransceiver>) {
self.observer.borrow_mut().on_track(transceiver);
unsafe fn on_track(&mut self, transceiver: UniquePtr<RtpTransceiver>) {
(*self.observer).on_track(transceiver);
}
fn on_remove_track(&mut self, receiver: UniquePtr<RtpReceiver>) {
self.observer.borrow_mut().on_remove_track(receiver);
unsafe fn on_remove_track(&mut self, receiver: UniquePtr<RtpReceiver>) {
(*self.observer).on_remove_track(receiver);
}
fn on_interesting_usage(&mut self, usage_pattern: i32) {
self.observer.borrow_mut().on_interesting_usage(usage_pattern);
unsafe fn on_interesting_usage(&mut self, usage_pattern: i32) {
(*self.observer).on_interesting_usage(usage_pattern);
}
}