Fix crash caused by multi threads during program termination

src/pc/peer_connection.cpp

@@ -59,12 +59,14 @@ int PeerConnection::Init(PeerConnectionParams params,
   on_ice_status_change_ = [this](std::string ice_status) {
     if ("JUICE_STATE_COMPLETED" == ice_status) {
       ice_ready_ = true;
+      LOG_INFO("Ice connected");
     } else {
       ice_ready_ = false;
+      LOG_INFO("Ice not useable");
     }
   };
 
-  ws_transport_ = new WsTransmission(on_receive_ws_msg_);
+  ws_transport_ = std::make_shared<WsTransmission>(on_receive_ws_msg_);
   uri_ = "ws://" + cfg_signal_server_ip_ + ":" + cfg_signal_server_port_;
   if (ws_transport_) {
     ws_transport_->Connect(uri_);
@@ -149,9 +151,10 @@ void PeerConnection::ProcessSignal(const std::string &signal) {
       LOG_INFO("]");
 
       for (auto &remote_user_id : user_id_list_) {
-        ice_transmission_list_[remote_user_id] = new IceTransmission(
+        ice_transmission_list_[remote_user_id] =
-            true, transmission_id, user_id_, remote_user_id, ws_transport_,
+            std::make_unique<IceTransmission>(
-            on_receive_ice_msg_, on_ice_status_change_);
+                true, transmission_id, user_id_, remote_user_id, ws_transport_,
+                on_receive_ice_msg_, on_ice_status_change_);
         ice_transmission_list_[remote_user_id]->InitIceTransmission(
             cfg_stun_server_ip_, stun_server_port_);
         ice_transmission_list_[remote_user_id]->JoinTransmission();
@@ -166,8 +169,6 @@ void PeerConnection::ProcessSignal(const std::string &signal) {
       auto user_id_it = ice_transmission_list_.find(user_id);
       if (user_id_it != ice_transmission_list_.end()) {
         user_id_it->second->DestroyIceTransmission();
-        delete user_id_it->second;
-        user_id_it->second = nullptr;
         ice_transmission_list_.erase(user_id_it);
         LOG_INFO("Terminate transmission to user [{}]", user_id);
       }
@@ -184,9 +185,10 @@ void PeerConnection::ProcessSignal(const std::string &signal) {
         std::string remote_user_id = j["remote_user_id"].get<std::string>();
         LOG_INFO("[{}] receive offer from [{}]", user_id_, remote_user_id);
 
-        ice_transmission_list_[remote_user_id] = new IceTransmission(
+        ice_transmission_list_[remote_user_id] =
-            false, transmission_id, user_id_, remote_user_id, ws_transport_,
+            std::make_unique<IceTransmission>(
-            on_receive_ice_msg_, on_ice_status_change_);
+                false, transmission_id, user_id_, remote_user_id, ws_transport_,
+                on_receive_ice_msg_, on_ice_status_change_);
 
         ice_transmission_list_[remote_user_id]->InitIceTransmission(
             cfg_stun_server_ip_, stun_server_port_);
@@ -237,17 +239,19 @@ int PeerConnection::RequestTransmissionMemberList(
   return 0;
 }
 
-int PeerConnection::Destroy() {
+int PeerConnection::Destroy() { return 0; }
-  if (ws_transport_) {
-    delete ws_transport_;
-  }
-  return 0;
-}
 
 SignalStatus PeerConnection::GetSignalStatus() { return signal_status_; }
 
 int PeerConnection::SendVideoData(const char *data, size_t size) {
-  if (!ice_ready_) return -1;
+  if (!ice_ready_) {
+    return -1;
+  }
+
+  if (ice_transmission_list_.empty()) {
+    return -1;
+  }
+
   int ret = Encode((uint8_t *)data, size);
   if (0 != ret) {
     LOG_ERROR("Encode failed");
@@ -261,7 +265,7 @@ int PeerConnection::SendVideoData(const char *data, size_t size) {
 }
 
 int PeerConnection::OnEncodedImage(char *encoded_packets, size_t size) {
-  for (auto ice_trans : ice_transmission_list_) {
+  for (auto &ice_trans : ice_transmission_list_) {
     LOG_ERROR("H264 frame size: [{}]", size);
     ice_trans.second->SendData(encoded_packets, size);
   }
@@ -270,14 +274,14 @@ int PeerConnection::OnEncodedImage(char *encoded_packets, size_t size) {
 }
 
 int PeerConnection::SendAudioData(const char *data, size_t size) {
-  for (auto ice_trans : ice_transmission_list_) {
+  for (auto &ice_trans : ice_transmission_list_) {
     ice_trans.second->SendData(data, size);
   }
   return 0;
 }
 
 int PeerConnection::SendUserData(const char *data, size_t size) {
-  for (auto ice_trans : ice_transmission_list_) {
+  for (auto &ice_trans : ice_transmission_list_) {
     ice_trans.second->SendData(data, size);
   }
   return 0;

src/pc/peer_connection.h

@@ -62,25 +62,26 @@ class PeerConnection : public VideoEncoder, VideoDecoder {
   std::string cfg_stun_server_port_;
   int signal_server_port_ = 0;
   int stun_server_port_ = 0;
-  WsTransmission *ws_transport_ = nullptr;
-  IceTransmission *ice_transmission_ = nullptr;
-  std::map<std::string, IceTransmission *> ice_transmission_list_;
-  std::function<void(const std::string &)> on_receive_ws_msg_ = nullptr;
-  std::function<void(const char *, size_t, const char *, size_t)>
-      on_receive_ice_msg_ = nullptr;
-  std::function<void(std::string)> on_ice_status_change_ = nullptr;
-  bool ice_ready_ = false;
 
+ private:
+  std::shared_ptr<WsTransmission> ws_transport_ = nullptr;
+  std::function<void(const std::string &)> on_receive_ws_msg_ = nullptr;
   unsigned int ws_connection_id_ = 0;
   std::string user_id_ = "";
   std::string transmission_id_ = "";
   std::vector<std::string> user_id_list_;
   SignalStatus signal_status_ = SignalStatus::Closed;
 
+ private:
+  std::map<std::string, std::unique_ptr<IceTransmission>>
+      ice_transmission_list_;
+  std::function<void(const char *, size_t, const char *, size_t)>
+      on_receive_ice_msg_ = nullptr;
+  std::function<void(std::string)> on_ice_status_change_ = nullptr;
+  bool ice_ready_ = false;
+
   OnReceiveBuffer on_receive_buffer_;
   char *nv12_data_ = nullptr;
-
- private:
 };
 
 #endif

src/rtp/rtp_video_receiver.cpp

@@ -6,19 +6,9 @@
 
 RtpVideoReceiver::RtpVideoReceiver() {}
 
-RtpVideoReceiver::~RtpVideoReceiver() {
+RtpVideoReceiver::~RtpVideoReceiver() {}
-  if (jitter_thread_ && jitter_thread_->joinable()) {
-    jitter_thread_->join();
-    delete jitter_thread_;
-    jitter_thread_ = nullptr;
-  }
-}
 
 void RtpVideoReceiver::InsertRtpPacket(RtpPacket& rtp_packet) {
-  if (!jitter_thread_) {
-    jitter_thread_ = new std::thread(&RtpVideoReceiver::Process, this);
-  }
-
   if (NAL_UNIT_TYPE::NALU == rtp_packet.NalUnitType()) {
     compelete_video_frame_queue_.push(
         VideoFrame(rtp_packet.Payload(), rtp_packet.Size()));
@@ -98,23 +88,36 @@ bool RtpVideoReceiver::CheckIsFrameCompleted(RtpPacket& rtp_packet) {
   return false;
 }
 
-void RtpVideoReceiver::Process() {
+void RtpVideoReceiver::Start() {
-  while (1) {
+  std::lock_guard<std::mutex> lock_guard(mutex_);
-    if (!compelete_video_frame_queue_.isEmpty()) {
+  stop_ = false;
-      VideoFrame video_frame;
+}
-      compelete_video_frame_queue_.pop(video_frame);
-      if (on_receive_complete_frame_) {
-        auto now_complete_frame_ts = std::chrono::high_resolution_clock::now()
-                                         .time_since_epoch()
-                                         .count() /
-                                     1000000;
-        uint32_t duration = now_complete_frame_ts - last_complete_frame_ts_;
-        LOG_ERROR("Duration {}", 1000 / duration);
-        last_complete_frame_ts_ = now_complete_frame_ts;
-        on_receive_complete_frame_(video_frame);
-      }
-    }
 
-    std::this_thread::sleep_for(std::chrono::milliseconds(13));
+void RtpVideoReceiver::Stop() {
+  std::lock_guard<std::mutex> lock_guard(mutex_);
+  stop_ = true;
+}
+
+bool RtpVideoReceiver::Process() {
+  std::lock_guard<std::mutex> lock_guard(mutex_);
+  if (stop_) {
+    return false;
   }
+
+  if (!compelete_video_frame_queue_.isEmpty()) {
+    VideoFrame video_frame;
+    compelete_video_frame_queue_.pop(video_frame);
+    if (on_receive_complete_frame_) {
+      auto now_complete_frame_ts =
+          std::chrono::high_resolution_clock::now().time_since_epoch().count() /
+          1000000;
+      uint32_t duration = now_complete_frame_ts - last_complete_frame_ts_;
+      LOG_ERROR("Duration {}", 1000 / duration);
+      last_complete_frame_ts_ = now_complete_frame_ts;
+      on_receive_complete_frame_(video_frame);
+    }
+  }
+
+  std::this_thread::sleep_for(std::chrono::milliseconds(13));
+  return true;
 }

src/rtp/rtp_video_receiver.h

@@ -3,14 +3,15 @@
 
 #include <functional>
 #include <map>
+#include <mutex>
 #include <queue>
-#include <thread>
 
 #include "frame.h"
 #include "ringbuffer.h"
 #include "rtp_video_session.h"
+#include "thread_base.h"
 
-class RtpVideoReceiver {
+class RtpVideoReceiver : public ThreadBase {
  public:
   RtpVideoReceiver();
   ~RtpVideoReceiver();
@@ -23,13 +24,16 @@ class RtpVideoReceiver {
     on_receive_complete_frame_ = on_receive_complete_frame;
   }
 
+  void Start();
+  void Stop();
+
  private:
   bool CheckIsFrameCompleted(RtpPacket& rtp_packet);
-  void Process();
-
-  //  private:
   //   void OnReceiveFrame(uint8_t* payload) {}
 
+ private:
+  bool Process() override;
+
  private:
   std::map<uint16_t, RtpPacket> incomplete_frame_list_;
   uint8_t* nv12_data_ = nullptr;
@@ -37,8 +41,9 @@ class RtpVideoReceiver {
   uint32_t last_complete_frame_ts_ = 0;
 
   RingBuffer<VideoFrame> compelete_video_frame_queue_;
-  std::thread* jitter_thread_ = nullptr;
+
-  bool start_ = false;
+  bool stop_ = true;
+  std::mutex mutex_;
 };
 
 #endif

src/rtp/rtp_video_sender.cpp

@@ -2,29 +2,35 @@
 
 #include <chrono>
 
+#include "log.h"
+
 RtpVideoSender::RtpVideoSender() {}
 
-RtpVideoSender::~RtpVideoSender() {
+RtpVideoSender::~RtpVideoSender() {}
-  if (send_thread_ && send_thread_->joinable()) {
-    send_thread_->join();
-    delete send_thread_;
-    send_thread_ = nullptr;
-  }
-}
 
 void RtpVideoSender::Enqueue(std::vector<RtpPacket>& rtp_packets) {
-  if (!send_thread_) {
-    send_thread_ = new std::thread(&RtpVideoSender::Process, this);
-  }
-
   for (auto& rtp_packet : rtp_packets) {
-    start_ = true;
     rtp_packe_queue_.push(rtp_packet);
   }
 }
 
-void RtpVideoSender::Process() {
+void RtpVideoSender::Start() {
-  while (1) {
+  std::lock_guard<std::mutex> lock_guard(mutex_);
+  stop_ = false;
+}
+
+void RtpVideoSender::Stop() {
+  std::lock_guard<std::mutex> lock_guard(mutex_);
+  stop_ = true;
+}
+
+bool RtpVideoSender::Process() {
+  std::lock_guard<std::mutex> lock_guard(mutex_);
+  if (stop_) {
+    return false;
+  }
+
+  for (size_t i = 0; i < 50; i++)
     if (!rtp_packe_queue_.isEmpty()) {
       RtpPacket rtp_packet;
       rtp_packe_queue_.pop(rtp_packet);
@@ -33,6 +39,5 @@ void RtpVideoSender::Process() {
       }
     }
 
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+  return true;
-  }
 }

src/rtp/rtp_video_sender.h

@@ -2,12 +2,14 @@
 #define _RTP_VIDEO_SENDER_H_
 
 #include <functional>
+#include <mutex>
 #include <thread>
 
 #include "ringbuffer.h"
 #include "rtp_packet.h"
+#include "thread_base.h"
 
-class RtpVideoSender {
+class RtpVideoSender : public ThreadBase {
  public:
   RtpVideoSender();
   ~RtpVideoSender();
@@ -21,14 +23,18 @@ class RtpVideoSender {
     rtp_packet_send_func_ = rtp_packet_send_func;
   }
 
+  void Start();
+  void Stop();
+
  private:
-  void Process();
+  bool Process() override;
 
  private:
   std::function<void(RtpPacket &)> rtp_packet_send_func_ = nullptr;
   RingBuffer<RtpPacket> rtp_packe_queue_;
-  std::thread *send_thread_ = nullptr;
+
-  bool start_ = false;
+  bool stop_ = true;
+  std::mutex mutex_;
 };
 
 #endif

src/thread/thread_base.cpp

@@ -0,0 +1,24 @@
+#include "thread_base.h"
+
+#include "log.h"
+
+ThreadBase::ThreadBase() {}
+
+ThreadBase::~ThreadBase() {}
+
+void ThreadBase::StartThread() {
+  if (!thread_) {
+    thread_ = std::make_unique<std::thread>(&ThreadBase::Run, this);
+  }
+}
+
+void ThreadBase::StopThread() {
+  if (thread_ && thread_->joinable()) {
+    thread_->join();
+  }
+}
+
+void ThreadBase::Run() {
+  while (Process()) {
+  }
+}

src/thread/thread_base.h

@@ -0,0 +1,26 @@
+#ifndef _THREAD_BASE_H_
+#define _THREAD_BASE_H_
+
+#include <mutex>
+#include <thread>
+
+class ThreadBase {
+ public:
+  ThreadBase();
+  ~ThreadBase();
+
+ public:
+  void StartThread();
+  void StopThread();
+  virtual bool Process() = 0;
+
+ private:
+  void Run();
+
+ private:
+  std::unique_ptr<std::thread> thread_ = nullptr;
+  bool start_ = false;
+  std::mutex mutex_;
+};
+
+#endif

src/transmission/ice_transmission.cpp

@@ -18,7 +18,8 @@ const std::vector<std::string> ice_status = {
 
 IceTransmission::IceTransmission(
     bool offer_peer, std::string &transmission_id, std::string &user_id,
-    std::string &remote_user_id, WsTransmission *ice_ws_transmission,
+    std::string &remote_user_id,
+    std::shared_ptr<WsTransmission> ice_ws_transmission,
     std::function<void(const char *, size_t, const char *, size_t)>
         on_receive_ice_msg,
     std::function<void(std::string)> on_ice_status_change)
@@ -31,36 +32,25 @@ IceTransmission::IceTransmission(
       on_ice_status_change_(on_ice_status_change) {}
 
 IceTransmission::~IceTransmission() {
-  if (kcp_update_thread_ && kcp_update_thread_->joinable()) {
+  if (rtp_video_sender_) {
-    kcp_update_thread_->join();
+    rtp_video_sender_->Stop();
-    delete kcp_update_thread_;
+    rtp_video_sender_->StopThread();
-    kcp_update_thread_ = nullptr;
-  }
-
-  if (rtp_video_session_) {
-    delete rtp_video_session_;
-    rtp_video_session_ = nullptr;
   }
 
   if (rtp_video_receiver_) {
-    delete rtp_video_receiver_;
+    rtp_video_receiver_->Stop();
-    rtp_video_receiver_ = nullptr;
+    rtp_video_receiver_->StopThread();
   }
 
   if (rtp_payload_) {
     delete rtp_payload_;
     rtp_payload_ = nullptr;
   }
-
-  if (ice_agent_) {
-    delete ice_agent_;
-    ice_agent_ = nullptr;
-  }
 }
 
 int IceTransmission::InitIceTransmission(std::string &ip, int port) {
-  rtp_video_session_ = new RtpVideoSession(PAYLOAD_TYPE::H264);
+  rtp_video_session_ = std::make_unique<RtpVideoSession>(PAYLOAD_TYPE::H264);
-  rtp_video_receiver_ = new RtpVideoReceiver();
+  rtp_video_receiver_ = std::make_unique<RtpVideoReceiver>();
   rtp_video_receiver_->SetOnReceiveCompleteFrame(
       [this](VideoFrame &video_frame) -> void {
         LOG_ERROR("OnReceiveCompleteFrame {}", video_frame.Size());
@@ -69,16 +59,21 @@ int IceTransmission::InitIceTransmission(std::string &ip, int port) {
                                remote_user_id_.size());
       });
 
-  rtp_video_sender_ = new RtpVideoSender();
+  rtp_video_receiver_->StartThread();
+  rtp_video_receiver_->Start();
+
+  rtp_video_sender_ = std::make_unique<RtpVideoSender>();
   rtp_video_sender_->SetRtpPacketSendFunc([this](
                                               RtpPacket &rtp_packet) -> void {
     if (ice_agent_) {
-      LOG_ERROR("Send rtp packet {}", rtp_packet.Size());
       ice_agent_->Send((const char *)rtp_packet.Buffer(), rtp_packet.Size());
     }
   });
 
-  ice_agent_ = new IceAgent(ip, port);
+  rtp_video_sender_->StartThread();
+  rtp_video_sender_->Start();
+
+  ice_agent_ = std::make_unique<IceAgent>(ip, port);
 
   ice_agent_->CreateIceAgent(
       [](juice_agent_t *agent, juice_state_t state, void *user_ptr) {
@@ -136,7 +131,6 @@ int IceTransmission::InitIceTransmission(std::string &ip, int port) {
 
 int IceTransmission::DestroyIceTransmission() {
   LOG_INFO("[{}->{}] Destroy ice transmission", user_id_, remote_user_id_);
-  kcp_stop_ = true;
   return ice_agent_->DestoryIceAgent();
 }
 
@@ -221,8 +215,13 @@ int IceTransmission::SendData(const char *data, size_t size) {
   if (JUICE_STATE_COMPLETED == state_) {
     std::vector<RtpPacket> packets;
 
-    rtp_video_session_->Encode((uint8_t *)data, size, packets);
+    if (rtp_video_session_) {
-    rtp_video_sender_->Enqueue(packets);
+      rtp_video_session_->Encode((uint8_t *)data, size, packets);
+    }
+    if (rtp_video_sender_) {
+      rtp_video_sender_->Enqueue(packets);
+    }
+
     // for (auto &packet : packets) {
     //   ice_agent_->Send((const char *)packet.Buffer(), packet.Size());
     // }

src/transmission/ice_transmission.h

@@ -16,7 +16,8 @@ class IceTransmission {
  public:
   IceTransmission(
       bool offer_peer, std::string &transmission_id, std::string &user_id,
-      std::string &remote_user_id, WsTransmission *ice_ws_transmission,
+      std::string &remote_user_id,
+      std::shared_ptr<WsTransmission> ice_ws_transmission,
       std::function<void(const char *, size_t, const char *, size_t)>
           on_receive_ice_msg,
       std::function<void(std::string)> on_ice_status_change);
@@ -52,8 +53,8 @@ class IceTransmission {
   int SendAnswer();
 
  private:
-  IceAgent *ice_agent_ = nullptr;
+  std::unique_ptr<IceAgent> ice_agent_ = nullptr;
-  WsTransmission *ice_ws_transport_ = nullptr;
+  std::shared_ptr<WsTransmission> ice_ws_transport_ = nullptr;
   CongestionControl *congestion_control_ = nullptr;
   std::function<void(const char *, size_t, const char *, size_t)>
       on_receive_ice_msg_cb_ = nullptr;
@@ -71,17 +72,14 @@ class IceTransmission {
   juice_state_t state_ = JUICE_STATE_DISCONNECTED;
 
  private:
-  // ikcpcb *kcp_ = nullptr;
+  std::unique_ptr<RtpVideoSession> rtp_video_session_ = nullptr;
-  char kcp_complete_buffer_[2560 * 1440 * 4];
+  std::unique_ptr<RtpVideoReceiver> rtp_video_receiver_ = nullptr;
-  bool kcp_stop_ = false;
+  std::unique_ptr<RtpVideoSender> rtp_video_sender_ = nullptr;
-  std::thread *kcp_update_thread_ = nullptr;
-
- private:
-  RtpVideoSession *rtp_video_session_ = nullptr;
-  RtpVideoReceiver *rtp_video_receiver_ = nullptr;
-  RtpVideoSender *rtp_video_sender_ = nullptr;
   uint8_t *rtp_payload_ = nullptr;
   RtpPacket pop_packet_;
+  bool start_send_packet_ = false;
+
+  uint32_t last_complete_frame_ts_ = 0;
 };
 
 #endif

xmake.lua

@@ -48,6 +48,12 @@ target("ringbuffer")
     set_kind("headeronly")
     add_includedirs("src/ringbuffer", {public = true})
 
+target("thread")
+    set_kind("static")
+    add_deps("log")
+    add_files("src/thread/*.cpp")
+    add_includedirs("src/thread", {public = true})
+
 target("frame")
     set_kind("static")
     add_files("src/frame/*.cpp")
@@ -55,7 +61,7 @@ target("frame")
     
 target("rtp")
     set_kind("static")
-    add_deps("log", "frame", "ringbuffer")
+    add_deps("log", "frame", "ringbuffer", "thread")
     add_files("src/rtp/*.cpp")
     add_includedirs("src/rtp", {public = true})