conf/config.ini

@@ -342,8 +342,6 @@ rtp_g711_dur_ms = 100
 #udp接收数据socket buffer大小配置
 #4*1024*1024=4196304
 udp_recv_socket_buffer=4194304
-#ps/ts解析后是否等待下一帧以判断本帧是否完整，开启后提高兼容性，但是可能增加延时
-merge_frame=1
 
 [rtc]
 #rtc播放推流、播放超时时间

src/Common/config.cpp

@@ -366,7 +366,6 @@ const string kOpusPT = RTP_PROXY_FIELD "opus_pt";
 const string kGopCache = RTP_PROXY_FIELD "gop_cache";
 const string kRtpG711DurMs = RTP_PROXY_FIELD "rtp_g711_dur_ms";
 const string kUdpRecvSocketBuffer = RTP_PROXY_FIELD "udp_recv_socket_buffer";
-const std::string kMergeFrame = RTP_PROXY_FIELD "merge_frame";
 
 static onceToken token([]() {
     mINI::Instance()[kDumpDir] = "";
@@ -379,7 +378,6 @@ static onceToken token([]() {
     mINI::Instance()[kGopCache] = 1;
     mINI::Instance()[kRtpG711DurMs] = 100;
     mINI::Instance()[kUdpRecvSocketBuffer] = 4 * 1024 * 1024;
-    mINI::Instance()[kMergeFrame] = 1;
 });
 } // namespace RtpProxy
 

src/Common/config.h

@@ -563,8 +563,6 @@ extern const std::string kGopCache;
 extern const std::string kRtpG711DurMs;
 // udp recv socket buffer size
 extern const std::string kUdpRecvSocketBuffer;
-// ps/ts解析后是否等待下一帧以判断本帧是否完整，开启后提高兼容性，但是可能增加延时
-extern const std::string kMergeFrame;
 } // namespace RtpProxy
 
 /**

src/Rtp/Decoder.cpp

@@ -11,7 +11,6 @@
 #include "Decoder.h"
 #include "PSDecoder.h"
 #include "TSDecoder.h"
-#include "Common/config.h"
 #include "Extension/Factory.h"
 
 #if defined(ENABLE_RTPPROXY) || defined(ENABLE_HLS)
@@ -123,18 +122,11 @@ void DecoderImp::onDecode(int stream, int codecid, int flags, int64_t pts, int64
         WarnL << "Unsupported codec :" << getCodecName(codec);
         return;
     }
-    GET_CONFIG(bool, merge_frame, RtpProxy::kMergeFrame)
     auto frame = Factory::getFrameFromPtr(codec, (char *)data, bytes, dts, pts);
-    if (getTrackType(codec) != TrackVideo || !merge_frame) {
+    if (getTrackType(codec) != TrackVideo) {
         onFrame(stream, frame);
-        if (_last_is_keyframe && _video_merge) {
-            // 上次是关键帧，收到音频后，说明帧收齐了
-            _video_merge->flush();
-        }
         return;
     }
-    _last_is_keyframe = frame->keyFrame() || frame->configFrame();
-    _video_merge = &ref.second;
     ref.second.inputFrame(frame, [this, stream, codec](uint64_t dts, uint64_t pts, const Buffer::Ptr &buffer, bool) {
         onFrame(stream, Factory::getFrameFromBuffer(codec, buffer, dts, pts));
     });

src/Rtp/Decoder.h

@@ -59,14 +59,13 @@ private:
 private:
     bool _finished = false;
     bool _have_video = false;
-    bool _last_is_keyframe = false;
     Decoder::Ptr _decoder;
     MediaSinkInterface *_sink;
+
     class FrameMergerImp : public FrameMerger {
     public:
         FrameMergerImp() : FrameMerger(FrameMerger::none) {}
     };
-    FrameMergerImp *_video_merge = nullptr;
     std::unordered_map<int, std::pair<Track::Ptr, FrameMergerImp> > _tracks;
 };
 

src/Rtp/RtpSender.cpp

@@ -36,15 +36,19 @@ RtpSender::~RtpSender() {
 }
 
 void RtpSender::startSend(const MediaSource &sender, const MediaSourceEvent::SendRtpArgs &args, const function<void(uint16_t local_port, const SockException &ex)> &cb){
-    auto origin_socket = sender.getOriginSock();
-    _origin_socket = dynamic_pointer_cast<Socket>(origin_socket);
+    try {
+        _origin_socket = dynamic_pointer_cast<Socket>(sender.getOriginSock());
+    } catch (...) {
+    }
     if (!_origin_socket) {
-        auto process = dynamic_pointer_cast<RtpProcess>(origin_socket);
-        if (process) {
-            _origin_socket = process->getSock();
+        try {
+            auto process = dynamic_pointer_cast<RtpProcess>(sender.getOriginSock());
+            if (process) {
+                _origin_socket = process->getSock();
+            }
+        } catch (...) {
         }
     }
-
     _args = args;
     if (!_interface) {
         // 重连时不重新创建对象  [AUTO-TRANSLATED:b788cd5d]
@@ -451,8 +455,8 @@ void RtpSender::onFlushRtpList(shared_ptr<List<Buffer::Ptr>> rtp_list) {
                 }
                 default: CHECK(0);
             }
-            if (_socket_rtp->sockType() == toolkit::SockNum::Sock_TCP && _socket_rtp->isSocketBusy() && _origin_socket) {
-                _origin_socket->enableRecv(false);
+            if (_socket_rtp->sockType() == toolkit::SockNum::Sock_TCP && _socket_rtp->isSocketBusy()) {
+                _socket_rtp->enableRecv(false);
             }
         });
     };