srtp自动初始化，支持多线程

webrtc/SrtpSession.cpp

@@ -4,15 +4,14 @@
 #include "SrtpSession.hpp"
 #include <cstring> // std::memset(), std::memcpy()
 #include "logger.h"
+#include "Util/util.h"
+using namespace toolkit;
 
 namespace RTC
 {
 	/* Static. */
 
-	static constexpr size_t EncryptBufferSize{ 65536 };
+    static std::vector<const char *> errors = {
-	static uint8_t EncryptBuffer[EncryptBufferSize];
-
-    std::vector<const char *> DepLibSRTP::errors = {
             // From 0 (srtp_err_status_ok) to 24 (srtp_err_status_pfkey_err).
             "success (srtp_err_status_ok)",
             "unspecified failure (srtp_err_status_fail)",
@@ -43,41 +42,31 @@ namespace RTC
 
 /* Static methods. */
 
-    void DepLibSRTP::ClassInit() {
+    const char *DepLibSRTP::GetErrorString(srtp_err_status_t code) {
+        // This throws out_of_range if the given index is not in the vector.
+        return errors.at(code);
+    }
+
+    bool DepLibSRTP::IsError(srtp_err_status_t code) {
+        return (code != srtp_err_status_ok);
+    }
+
+    INSTANCE_IMP(DepLibSRTP);
+
+    DepLibSRTP::DepLibSRTP(){
         MS_TRACE();
 
         MS_DEBUG_TAG(info, "libsrtp version: \"%s\"", srtp_get_version_string());
 
         srtp_err_status_t err = srtp_init();
 
-        if (DepLibSRTP::IsError(err))
+        if (DepLibSRTP::IsError(err)) {
             MS_THROW_ERROR("srtp_init() failed: %s", DepLibSRTP::GetErrorString(err));
         }
 
-    void DepLibSRTP::ClassDestroy() {
-        MS_TRACE();
-
-        srtp_shutdown();
-    }
-
-    /* Class methods. */
-
-	void SrtpSession::ClassInit()
-	{
         // Set libsrtp event handler.
-		srtp_err_status_t err =
+        err = srtp_install_event_handler([](srtp_event_data_t *data){
-		  srtp_install_event_handler(static_cast<srtp_event_handler_func_t*>(OnSrtpEvent));
-
-		if (DepLibSRTP::IsError(err))
-		{
-			MS_THROW_ERROR("srtp_install_event_handler() failed: %s", DepLibSRTP::GetErrorString(err));
-		}
-	}
-
-	void SrtpSession::OnSrtpEvent(srtp_event_data_t* data)
-	{
             MS_TRACE();
-
             switch (data->event)
             {
                 case event_ssrc_collision:
@@ -96,12 +85,26 @@ namespace RTC
                     MS_WARN_TAG(srtp, "stream reached the hard packet limit (2^48 packets)");
                     break;
             }
+        });
+
+        if (DepLibSRTP::IsError(err))
+        {
+            MS_THROW_ERROR("srtp_install_event_handler() failed: %s", DepLibSRTP::GetErrorString(err));
         }
+    }
+
+    DepLibSRTP::~DepLibSRTP(){
+        MS_TRACE();
+        srtp_shutdown();
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////
 
 	/* Instance methods. */
 
 	SrtpSession::SrtpSession(Type type, CryptoSuite cryptoSuite, uint8_t* key, size_t keyLen)
 	{
+        _env = DepLibSRTP::Instance().shared_from_this();
 		MS_TRACE();
 
 		srtp_policy_t policy; // NOLINT(cppcoreguidelines-pro-type-member-init)

webrtc/SrtpSession.hpp

@@ -4,21 +4,22 @@
 #include "Utils.hpp"
 #include <srtp2/srtp.h>
 #include <vector>
+#include <memory>
 
 namespace RTC
 {
-    class DepLibSRTP {
+    class DepLibSRTP : public std::enable_shared_from_this<DepLibSRTP>
+    {
     public:
-        static void ClassInit();
+        using Ptr = std::shared_ptr<DepLibSRTP>;
-        static void ClassDestroy();
+        ~DepLibSRTP();
-        static bool IsError(srtp_err_status_t code) { return (code != srtp_err_status_ok); }
+
-        static const char *GetErrorString(srtp_err_status_t code) {
+        static bool IsError(srtp_err_status_t code);
-            // This throws out_of_range if the given index is not in the vector.
+        static const char *GetErrorString(srtp_err_status_t code);
-            return DepLibSRTP::errors.at(code);
+        static DepLibSRTP &Instance();
-        }
 
     private:
-        static std::vector<const char *> errors;
+        DepLibSRTP();
     };
 
 	class SrtpSession
@@ -40,12 +41,6 @@ namespace RTC
 			OUTBOUND
 		};
 
-	public:
-		static void ClassInit();
-
-	private:
-		static void OnSrtpEvent(srtp_event_data_t* data);
-
 	public:
 		SrtpSession(Type type, CryptoSuite cryptoSuite, uint8_t* key, size_t keyLen);
 		~SrtpSession();
@@ -63,6 +58,10 @@ namespace RTC
 	private:
 		// Allocated by this.
 		srtp_t session{ nullptr };
+		//rtp包最大1600
+        static constexpr size_t EncryptBufferSize{ 1600 };
+        uint8_t EncryptBuffer[EncryptBufferSize];
+        DepLibSRTP::Ptr _env;
 	};
 } // namespace RTC
 

webrtc/WebRtcTransport.cpp

@@ -5,15 +5,16 @@
 WebRtcTransport::WebRtcTransport() {
     static onceToken token([](){
         RTC::DtlsTransport::ClassInit();
-        RTC::DepLibSRTP::ClassInit();
-        RTC::SrtpSession::ClassInit();
     });
 
     dtls_transport_ = std::make_shared<RTC::DtlsTransport>(EventPollerPool::Instance().getFirstPoller(), this);
     ice_server_ = std::make_shared<RTC::IceServer>(this, makeRandStr(4), makeRandStr(24));
 }
 
-WebRtcTransport::~WebRtcTransport() {}
+WebRtcTransport::~WebRtcTransport() {
+    dtls_transport_ = nullptr;
+    ice_server_ = nullptr;
+}
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////