YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-27 04:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[feat] add callback to notify the travsesal mode

Browse Source
This commit is contained in:
dijunkun
2024-07-30 17:31:44 +08:00
parent af49ebe63d
commit 54179722e5
6 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pc/peer_connection.cpp
View File

@@ -96,6 +96,7 @@ int PeerConnection::Init(PeerConnectionParams params,
on_receive_data_buffer_ = params.on_receive_data_buffer;
on_signal_status_ = params.on_signal_status;
on_connection_status_ = params.on_connection_status;
net_status_report_ = params.net_status_report;
user_data_ = params.user_data;
on_receive_ws_msg_ = [this](const std::string &msg) { ProcessSignal(msg); };
@@ -170,6 +171,14 @@ int PeerConnection::Init(PeerConnectionParams params,
}
};
on_net_status_report_ = [this](IceTransmission::TraversalType mode,
const unsigned short send,
const unsigned short receive, void *user_ptr) {
if (net_status_report_) {
net_status_report_(TraversalMode(mode), send, receive, user_ptr);
}
};
ws_transport_ =
std::make_shared<WsTransmission>(on_receive_ws_msg_, on_ws_status_);
uri_ = "ws://" + cfg_signal_server_ip_ + ":" + cfg_signal_server_port_;
@@ -435,6 +444,8 @@ void PeerConnection::ProcessSignal(const std::string &signal) {
on_receive_audio_);
ice_transmission_list_[remote_user_id]->SetOnReceiveDataFunc(
on_receive_data_);
ice_transmission_list_[remote_user_id]
->SetOnReceiveNetStatusReportFunc(on_net_status_report_);
ice_transmission_list_[remote_user_id]->InitIceTransmission(
cfg_stun_server_ip_, stun_server_port_, cfg_turn_server_ip_,
@@ -486,6 +497,9 @@ void PeerConnection::ProcessSignal(const std::string &signal) {
on_receive_audio_);
ice_transmission_list_[remote_user_id]->SetOnReceiveDataFunc(
on_receive_data_);
ice_transmission_list_[remote_user_id]->SetOnReceiveNetStatusReportFunc(
on_net_status_report_);
ice_transmission_list_[remote_user_id]->InitIceTransmission(
cfg_stun_server_ip_, stun_server_port_, cfg_turn_server_ip_,
turn_server_port_, cfg_turn_server_username_,

9
src/pc/peer_connection.h
View File

@@ -20,8 +20,8 @@ typedef void (*OnSignalStatus)(SignalStatus status, void *);
typedef void (*OnConnectionStatus)(ConnectionStatus status, void *);
typedef void (*NetStatusReport)(const unsigned short, const unsigned short,
void *);
typedef void (*NetStatusReport)(TraversalMode mode, const unsigned short,
const unsigned short, void *);
typedef struct {
bool use_cfg_file;
@@ -98,6 +98,7 @@ class PeerConnection {
bool hardware_acceleration_ = false;
bool av1_encoding_ = false;
bool trickle_ice_ = true;
TraversalMode mode_ = TraversalMode::P2P;
private:
std::shared_ptr<WsTransmission> ws_transport_ = nullptr;
@@ -122,6 +123,9 @@ class PeerConnection {
std::function<void(const char *, size_t, const char *, size_t)>
on_receive_data_ = nullptr;
std::function<void(std::string)> on_ice_status_change_ = nullptr;
std::function<void(IceTransmission::TraversalType, const unsigned short,
const unsigned short, void *)>
on_net_status_report_ = nullptr;
bool ice_ready_ = false;
OnReceiveBuffer on_receive_video_buffer_;
@@ -129,6 +133,7 @@ class PeerConnection {
OnReceiveBuffer on_receive_data_buffer_;
OnSignalStatus on_signal_status_;
OnConnectionStatus on_connection_status_;
NetStatusReport net_status_report_;
void *user_data_;
char *nv12_data_ = nullptr;