From 251fe1f77ce72ccbec9a996af7f01c10c34db2d6 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Sat, 14 May 2022 23:34:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9A=8F=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E5=88=86=E9=85=8D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Rtp/RtpServer.cpp | 3 --- src/Rtsp/Rtsp.cpp | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/Rtp/RtpServer.cpp b/src/Rtp/RtpServer.cpp index 4893c302..c2f54d5c 100644 --- a/src/Rtp/RtpServer.cpp +++ b/src/Rtp/RtpServer.cpp @@ -99,9 +99,6 @@ void RtpServer::start(uint16_t local_port, const string &stream_id, bool enable_ //随机端口,rtp端口采用偶数 auto pair = std::make_pair(rtp_socket, rtcp_socket); makeSockPair(pair, local_ip, re_use_port); - //取偶数端口 - rtp_socket = pair.first; - rtcp_socket = pair.second; } else if (!rtp_socket->bindUdpSock(local_port, local_ip, re_use_port)) { //用户指定端口 throw std::runtime_error(StrPrinter << "创建rtp端口 " << local_ip << ":" << local_port << " 失败:" << get_uv_errmsg(true)); diff --git a/src/Rtsp/Rtsp.cpp b/src/Rtsp/Rtsp.cpp index e7d73bd2..e18dfa97 100644 --- a/src/Rtsp/Rtsp.cpp +++ b/src/Rtsp/Rtsp.cpp @@ -410,9 +410,6 @@ private: }; void makeSockPair(std::pair &pair, const string &local_ip, bool re_use_port, bool is_udp) { - //全局互斥锁保护,防止端口重复分配 - static recursive_mutex s_mtx; - lock_guard lck(s_mtx); int try_count = 0; while (true) { try {