diff --git a/src/interface/x.h b/src/interface/x.h index 96a184a..3d84798 100644 --- a/src/interface/x.h +++ b/src/interface/x.h @@ -85,7 +85,7 @@ DLLAPI int CreateConnection(PeerPtr* peer_ptr, const char* transmission_id, DLLAPI int JoinConnection(PeerPtr* peer_ptr, const char* transmission_id, const char* password); -DLLAPI int LeaveConnection(PeerPtr* peer_ptr); +DLLAPI int LeaveConnection(PeerPtr* peer_ptr, const char* transmission_id); DLLAPI int SendData(PeerPtr* peer_ptr, DATA_TYPE data_type, const char* data, size_t size); diff --git a/src/pc/peer_connection.cpp b/src/pc/peer_connection.cpp index 45cd45a..b455b49 100644 --- a/src/pc/peer_connection.cpp +++ b/src/pc/peer_connection.cpp @@ -193,6 +193,8 @@ int PeerConnection::Init(PeerConnectionParams params, nv12_data_ = new char[1280 * 720 * 3 / 2]; + LOG_INFO("[{}] Init finish", user_id); + // if (0 != CreateVideoCodec(hardware_acceleration_)) { // LOG_ERROR("Create video codec failed"); // return -1; @@ -342,7 +344,7 @@ int PeerConnection::Join(const std::string &transmission_id, return ret; } -int PeerConnection::Leave() { +int PeerConnection::Leave(const std::string &transmission_id) { if (SignalStatus::SignalConnected != GetSignalStatus()) { LOG_ERROR("Signal not connected"); return -1; @@ -350,11 +352,11 @@ int PeerConnection::Leave() { json message = {{"type", "leave_transmission"}, {"user_id", user_id_}, - {"transmission_id", transmission_id_}}; + {"transmission_id", transmission_id}}; if (ws_transport_) { ws_transport_->Send(message.dump()); LOG_INFO("[{}] sends leave transmission [{}] notification ", user_id_, - transmission_id_); + transmission_id); } ice_ready_ = false; @@ -576,7 +578,7 @@ int PeerConnection::RequestTransmissionMemberList( return -1; } - LOG_INFO("Request member list"); + LOG_INFO("[{}] Request member list", user_id_); json message = {{"type", "query_user_id_list"}, {"transmission_id", transmission_id_}, diff --git a/src/pc/peer_connection.h b/src/pc/peer_connection.h index b654625..9309a97 100644 --- a/src/pc/peer_connection.h +++ b/src/pc/peer_connection.h @@ -61,7 +61,7 @@ class PeerConnection { int Join(const std::string &transmission_id, const std::string &password = ""); - int Leave(); + int Leave(const std::string &transmission_id); int Destroy(); diff --git a/src/rtc/x_inner.cpp b/src/rtc/x_inner.cpp index 6b38abc..ee0ecb6 100644 --- a/src/rtc/x_inner.cpp +++ b/src/rtc/x_inner.cpp @@ -81,13 +81,13 @@ int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id, return ret; } -int LeaveConnection(PeerPtr *peer_ptr) { +int LeaveConnection(PeerPtr *peer_ptr, const char *transmission_id) { if (!peer_ptr) { LOG_ERROR("peer_ptr not created"); return -1; } - peer_ptr->peer_connection->Leave(); + peer_ptr->peer_connection->Leave(transmission_id); LOG_INFO("LeaveConnection"); return 0; }