server/WebHook.cpp

@@ -339,10 +339,6 @@ static mINI jsonToMini(const Value &obj) {
     mINI ret;
     if (obj.isObject()) {
         for (auto it = obj.begin(); it != obj.end(); ++it) {
-            if (it->isNull()) {
-                // 忽略null，修复wvp传null覆盖Protocol配置的问题
-                continue;
-            }
             try {
                 auto str = (*it).asString();
                 ret[it.name()] = std::move(str);

src/Rtp/RtpProcess.cpp

@@ -107,7 +107,6 @@ bool RtpProcess::inputRtp(bool is_udp, const Socket::Ptr &sock, const char *data
     if (!_auth_err.empty()) {
         throw toolkit::SockException(toolkit::Err_other, _auth_err);
     }
-    auto header = (RtpHeader *) data;
     if (_sock != sock) {
         // 第一次运行本函数  [AUTO-TRANSLATED:a1d7ac17]
         // First time running this function
@@ -115,7 +114,7 @@ bool RtpProcess::inputRtp(bool is_udp, const Socket::Ptr &sock, const char *data
         _sock = sock;
         _addr.reset(new sockaddr_storage(*((sockaddr_storage *)addr)));
         if (first) {
-            emitOnPublish(ntohl(header->ssrc));
+            emitOnPublish();
             _cache_ticker.resetTime();
         }
     }
@@ -132,6 +131,7 @@ bool RtpProcess::inputRtp(bool is_udp, const Socket::Ptr &sock, const char *data
         _process = std::make_shared<GB28181Process>(_media_info, this);
     }
 
+    auto header = (RtpHeader *) data;
     onRtp(ntohs(header->seq), ntohl(header->stamp), 0/*不发送sr,所以可以设置为0*/ , 90000/*ps/ts流时间戳按照90K采样率*/, len);
 
     GET_CONFIG(string, dump_dir, RtpProxy::kDumpDir);
@@ -271,15 +271,15 @@ string RtpProcess::getIdentifier() const {
     return _media_info.stream;
 }
 
-void RtpProcess::emitOnPublish(uint32_t ssrc) {
+void RtpProcess::emitOnPublish() {
     weak_ptr<RtpProcess> weak_self = shared_from_this();
-    Broadcast::PublishAuthInvoker invoker = [weak_self, ssrc](const string &err, const ProtocolOption &option) {
+    Broadcast::PublishAuthInvoker invoker = [weak_self](const string &err, const ProtocolOption &option) {
         auto strong_self = weak_self.lock();
         if (!strong_self) {
             return;
         }
         auto poller = strong_self->getOwnerPoller(MediaSource::NullMediaSource());
-        poller->async([weak_self, err, option, ssrc]() {
+        poller->async([weak_self, err, option]() {
             auto strong_self = weak_self.lock();
             if (!strong_self) {
                 return;
@@ -293,7 +293,7 @@ void RtpProcess::emitOnPublish(uint32_t ssrc) {
                 }
                 strong_self->_muxer->setMediaListener(strong_self);
                 strong_self->doCachedFunc();
-                InfoP(strong_self) << "允许RTP推流，ssrc: " << printSSRC(ssrc);
+                InfoP(strong_self) << "允许RTP推流";
             } else {
                 strong_self->_auth_err = err;
                 WarnP(strong_self) << "禁止RTP推流:" << err;

src/Rtp/RtpProcess.h

@@ -122,7 +122,7 @@ protected:
 private:
     RtpProcess(const MediaTuple &tuple);
 
-    void emitOnPublish(uint32_t ssrc);
+    void emitOnPublish();
     void doCachedFunc();
     bool alive();
     void onManager();