Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into transcode2

src/Rtp/Decoder.cpp

@@ -85,6 +85,9 @@ DecoderImp::DecoderImp(const Decoder::Ptr &decoder, MediaSinkInterface *sink){
 #if defined(ENABLE_RTPPROXY) || defined(ENABLE_HLS)
 
 void DecoderImp::onStream(int stream, int codecid, const void *extra, size_t bytes, int finish) {
+    if (_finished) {
+        return;
+    }
     // G711传统只支持 8000/1/16的规格，FFmpeg貌似做了扩展，但是这里不管它了
     auto track = Factory::getTrackByCodecId(getCodecByMpegId(codecid), 8000, 1, 16);
     if (track) {
@@ -92,6 +95,7 @@ void DecoderImp::onStream(int stream, int codecid, const void *extra, size_t byt
     }
     // 防止未获取视频track提前complete导致忽略后续视频的问题，用于兼容一些不太规范的ps流
     if (finish && _have_video) {
+        _finished = true;
         _sink->addTrackCompleted();
         InfoL << "Add track finished";
     }

src/Rtp/Decoder.h

@@ -57,6 +57,7 @@ private:
     void onStream(int stream, int codecid, const void *extra, size_t bytes, int finish);
 
 private:
+    bool _finished = false;
     bool _have_video = false;
     Decoder::Ptr _decoder;
     MediaSinkInterface *_sink;

src/Rtp/RtpServer.cpp

@@ -176,6 +176,8 @@ void RtpServer::start(uint16_t local_port, const MediaTuple &tuple, TcpMode tcp_
         udp_server = std::make_shared<UdpServer>();
         (*udp_server)[RtpSession::kOnlyTrack] = only_track;
         (*udp_server)[RtpSession::kUdpRecvBuffer] = udpRecvSocketBuffer;
+        (*udp_server)[RtpSession::kVhost] = tuple.vhost;
+        (*udp_server)[RtpSession::kApp] = tuple.app;
         udp_server->start<RtpSession>(local_port, local_ip);
         rtp_socket = nullptr;
     }