From 200a193c04d448fb68a885c63bdb35171859f30c Mon Sep 17 00:00:00 2001 From: ziyue <1213642868@qq.com> Date: Thu, 28 Apr 2022 17:44:35 +0800 Subject: [PATCH] =?UTF-8?q?openRtpServer=E6=96=B0=E5=A2=9Essrc=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=BF=BD=E5=8A=A0=E8=87=B3?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E6=9C=AB=E5=B0=BE,=20=E7=A1=AE=E4=BF=9D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E4=B8=80=E8=87=B4=E6=97=A0?= =?UTF-8?q?=E6=AD=A7=E4=B9=89:=20#1572?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/WebApi.cpp | 4 ++-- src/Rtp/RtpServer.cpp | 2 +- src/Rtp/RtpServer.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/WebApi.cpp b/server/WebApi.cpp index e1d2bc82..2a044006 100755 --- a/server/WebApi.cpp +++ b/server/WebApi.cpp @@ -1056,8 +1056,8 @@ void installWebApi() { } RtpServer::Ptr server = std::make_shared(); - server->start(allArgs["port"], stream_id, allArgs["ssrc"].as(), allArgs["enable_tcp"].as(), - "0.0.0.0", allArgs["re_use_port"].as()); + server->start(allArgs["port"], stream_id, allArgs["enable_tcp"].as(), "0.0.0.0", + allArgs["re_use_port"].as(), allArgs["ssrc"].as()); server->setOnDetach([stream_id]() { //设置rtp超时移除事件 lock_guard lck(s_rtpServerMapMtx); diff --git a/src/Rtp/RtpServer.cpp b/src/Rtp/RtpServer.cpp index 12685587..0311ad8c 100644 --- a/src/Rtp/RtpServer.cpp +++ b/src/Rtp/RtpServer.cpp @@ -88,7 +88,7 @@ private: std::shared_ptr _rtcp_addr; }; -void RtpServer::start(uint16_t local_port, const string &stream_id, uint32_t ssrc, bool enable_tcp, const char *local_ip, bool re_use_port) { +void RtpServer::start(uint16_t local_port, const string &stream_id, bool enable_tcp, const char *local_ip, bool re_use_port, uint32_t ssrc) { //创建udp服务器 Socket::Ptr rtp_socket = Socket::createSocket(nullptr, true); Socket::Ptr rtcp_socket = Socket::createSocket(nullptr, true); diff --git a/src/Rtp/RtpServer.h b/src/Rtp/RtpServer.h index 72f1d30c..8c6ce4c4 100644 --- a/src/Rtp/RtpServer.h +++ b/src/Rtp/RtpServer.h @@ -39,7 +39,8 @@ public: * @param local_ip 绑定的本地网卡ip * @param re_use_port 是否设置socket为re_use属性 */ - void start(uint16_t local_port, const std::string &stream_id = "", uint32_t ssrc = 0, bool enable_tcp = true, const char *local_ip = "0.0.0.0", bool re_use_port = true); + void start(uint16_t local_port, const std::string &stream_id = "", bool enable_tcp = true, + const char *local_ip = "0.0.0.0", bool re_use_port = true, uint32_t ssrc = 0); /** * 获取绑定的本地端口