From e8a870e215a755274e4683bd5e9de83d3a9bc869 Mon Sep 17 00:00:00 2001 From: Dw9 Date: Fri, 14 Jul 2023 20:15:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?rtc=20port=E9=BB=98=E8=AE=A48000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/main.cpp | 11 +++++++++++ src/Common/config.cpp | 18 ++++++++++++++++++ src/Common/config.h | 10 ++++++++++ webrtc/WebRtcTransport.cpp | 24 ------------------------ 4 files changed, 39 insertions(+), 24 deletions(-) diff --git a/server/main.cpp b/server/main.cpp index d09bf5d5..f6a9df7b 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -102,6 +102,17 @@ onceToken token1([](){ },nullptr); } //namespace RtpProxy +// RTC配置项目 +namespace Rtc { +#define RTC_FIELD "rtc." +const string kPort = RTC_FIELD "port"; +const string kTcpPort = RTC_FIELD "tcpPort"; +onceToken token1([]() { + mINI::Instance()[kPort] = 8000; + mINI::Instance()[kTcpPort] = 8000; +},nullptr); +} // namespace RTC + } // namespace mediakit diff --git a/src/Common/config.cpp b/src/Common/config.cpp index 52c79091..18a862f0 100644 --- a/src/Common/config.cpp +++ b/src/Common/config.cpp @@ -260,6 +260,24 @@ static onceToken token([]() { }); } // namespace Rtp +////////////RTC服务器配置/////////// +namespace Rtc { +#define RTC_FIELD "rtc." +// rtp和rtcp接受超时时间 +const string kTimeOutSec = RTC_FIELD "timeoutSec"; +// 服务器外网ip +const string kExternIP = RTC_FIELD "externIP"; +// 设置remb比特率，非0时关闭twcc并开启remb。该设置在rtc推流时有效，可以控制推流画质 +const string kRembBitRate = RTC_FIELD "rembBitRate"; + +static onceToken token([]() { + mINI::Instance()[kTimeOutSec] = 15; + mINI::Instance()[kExternIP] = ""; + mINI::Instance()[kRembBitRate] = 0; +}); + +} // namespace RTC + ////////////组播配置/////////// namespace MultiCast { #define MULTI_FIELD "multicast." diff --git a/src/Common/config.h b/src/Common/config.h index ec546a17..534d6f40 100644 --- a/src/Common/config.h +++ b/src/Common/config.h @@ -308,6 +308,16 @@ extern const std::string kLowLatency; extern const std::string kH264StapA; } // namespace Rtp +////////////RTC服务器配置/////////// +namespace Rtc { +//rtc播放推流、播放超时时间 +extern const std::string kTimeOutSec; +// 服务器外网ip +extern const std::string kExternIP; +// 设置remb比特率，非0时关闭twcc并开启remb。该设置在rtc推流时有效，可以控制推流画质 +extern const std::string kRembBitRate; +} // namespace Rtc + ////////////组播配置/////////// namespace MultiCast { // 组播分配起始地址 diff --git a/webrtc/WebRtcTransport.cpp b/webrtc/WebRtcTransport.cpp index 031710e8..56895ae0 100644 --- a/webrtc/WebRtcTransport.cpp +++ b/webrtc/WebRtcTransport.cpp @@ -36,30 +36,6 @@ using namespace std; namespace mediakit { -// RTC配置项目 -namespace Rtc { -#define RTC_FIELD "rtc." -// rtp和rtcp接受超时时间 -const string kTimeOutSec = RTC_FIELD "timeoutSec"; -// 服务器外网ip -const string kExternIP = RTC_FIELD "externIP"; -// 设置remb比特率，非0时关闭twcc并开启remb。该设置在rtc推流时有效，可以控制推流画质 -const string kRembBitRate = RTC_FIELD "rembBitRate"; -// webrtc单端口udp服务器 -const string kPort = RTC_FIELD "port"; - -const string kTcpPort = RTC_FIELD "tcpPort"; - -static onceToken token([]() { - mINI::Instance()[kTimeOutSec] = 15; - mINI::Instance()[kExternIP] = ""; - mINI::Instance()[kRembBitRate] = 0; - mINI::Instance()[kPort] = 0; - mINI::Instance()[kTcpPort] = 0; -}); - -} // namespace RTC - static atomic s_key { 0 }; static void translateIPFromEnv(std::vector &v) { From 84ab30ec7654cbb4dced5d8cbf92ec8c5f8d5181 Mon Sep 17 00:00:00 2001 From: Dw9 Date: Fri, 14 Jul 2023 21:30:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dc=20api=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/config.ini | 2 +- webrtc/WebRtcTransport.cpp | 17 +++++++++++++++++ webrtc/WebRtcTransport.h | 7 ------- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/conf/config.ini b/conf/config.ini index c6a7e545..80c4fb60 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -38,7 +38,7 @@ restart_sec=0 modify_stamp=2 #转协议是否开启音频 enable_audio=1 -#添加acc静音音频，在关闭音频时，此开关无效 +#添加aac静音音频，在关闭音频时，此开关无效 add_mute_audio=1 #无人观看时，是否直接关闭(而不是通过on_none_reader hook返回close) #此配置置1时，此流如果无人观看，将不触发on_none_reader hook回调， diff --git a/webrtc/WebRtcTransport.cpp b/webrtc/WebRtcTransport.cpp index 56895ae0..5bb93dc1 100644 --- a/webrtc/WebRtcTransport.cpp +++ b/webrtc/WebRtcTransport.cpp @@ -32,6 +32,23 @@ #define RTP_MSLABEL "zlmediakit-mslabel" #define RTP_MSID RTP_MSLABEL " " RTP_LABEL +namespace mediakit { +//c api RTC配置项目 +namespace Rtc { +#ifndef RTC_FIELD +#define RTC_FIELD "rtc." +// webrtc单端口udp服务器 +const std::string kPort = RTC_FIELD "port"; +const std::string kTcpPort = RTC_FIELD "tcpPort"; + +static onceToken token([]() { + mINI::Instance()[kPort] = 8000; + mINI::Instance()[kTcpPort] = 8000; +}); +#endif +} +} + using namespace std; namespace mediakit { diff --git a/webrtc/WebRtcTransport.h b/webrtc/WebRtcTransport.h index 2534ca3b..9ef681e6 100644 --- a/webrtc/WebRtcTransport.h +++ b/webrtc/WebRtcTransport.h @@ -28,13 +28,6 @@ namespace mediakit { -//RTC配置项目 -namespace Rtc { -extern const std::string kPort; -extern const std::string kTcpPort; -extern const std::string kTimeOutSec; -}//namespace RTC - class WebRtcInterface { public: WebRtcInterface() = default; From 9734b7bf00155302bb0b39d1198f7649a00b8cde Mon Sep 17 00:00:00 2001 From: weishao Date: Wed, 19 Jul 2023 16:41:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?rtc=20udp/tcp=20port=20=E9=BB=98=E8=AE=A480?= =?UTF-8?q?00?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/main.cpp | 10 ---------- src/Common/config.cpp | 17 ---------------- src/Common/config.h | 9 --------- webrtc/WebRtcTransport.cpp | 41 ++++++++++++++++++++++---------------- webrtc/WebRtcTransport.h | 7 +++++++ 5 files changed, 31 insertions(+), 53 deletions(-) diff --git a/server/main.cpp b/server/main.cpp index f6a9df7b..f4140bf6 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -102,16 +102,6 @@ onceToken token1([](){ },nullptr); } //namespace RtpProxy -// RTC配置项目 -namespace Rtc { -#define RTC_FIELD "rtc." -const string kPort = RTC_FIELD "port"; -const string kTcpPort = RTC_FIELD "tcpPort"; -onceToken token1([]() { - mINI::Instance()[kPort] = 8000; - mINI::Instance()[kTcpPort] = 8000; -},nullptr); -} // namespace RTC } // namespace mediakit diff --git a/src/Common/config.cpp b/src/Common/config.cpp index 18a862f0..7abc0ca9 100644 --- a/src/Common/config.cpp +++ b/src/Common/config.cpp @@ -260,23 +260,6 @@ static onceToken token([]() { }); } // namespace Rtp -////////////RTC服务器配置/////////// -namespace Rtc { -#define RTC_FIELD "rtc." -// rtp和rtcp接受超时时间 -const string kTimeOutSec = RTC_FIELD "timeoutSec"; -// 服务器外网ip -const string kExternIP = RTC_FIELD "externIP"; -// 设置remb比特率，非0时关闭twcc并开启remb。该设置在rtc推流时有效，可以控制推流画质 -const string kRembBitRate = RTC_FIELD "rembBitRate"; - -static onceToken token([]() { - mINI::Instance()[kTimeOutSec] = 15; - mINI::Instance()[kExternIP] = ""; - mINI::Instance()[kRembBitRate] = 0; -}); - -} // namespace RTC ////////////组播配置/////////// namespace MultiCast { diff --git a/src/Common/config.h b/src/Common/config.h index 534d6f40..38c8c1a0 100644 --- a/src/Common/config.h +++ b/src/Common/config.h @@ -308,15 +308,6 @@ extern const std::string kLowLatency; extern const std::string kH264StapA; } // namespace Rtp -////////////RTC服务器配置/////////// -namespace Rtc { -//rtc播放推流、播放超时时间 -extern const std::string kTimeOutSec; -// 服务器外网ip -extern const std::string kExternIP; -// 设置remb比特率，非0时关闭twcc并开启remb。该设置在rtc推流时有效，可以控制推流画质 -extern const std::string kRembBitRate; -} // namespace Rtc ////////////组播配置/////////// namespace MultiCast { diff --git a/webrtc/WebRtcTransport.cpp b/webrtc/WebRtcTransport.cpp index 5bb93dc1..b87647db 100644 --- a/webrtc/WebRtcTransport.cpp +++ b/webrtc/WebRtcTransport.cpp @@ -32,27 +32,34 @@ #define RTP_MSLABEL "zlmediakit-mslabel" #define RTP_MSID RTP_MSLABEL " " RTP_LABEL -namespace mediakit { -//c api RTC配置项目 -namespace Rtc { -#ifndef RTC_FIELD -#define RTC_FIELD "rtc." -// webrtc单端口udp服务器 -const std::string kPort = RTC_FIELD "port"; -const std::string kTcpPort = RTC_FIELD "tcpPort"; - -static onceToken token([]() { - mINI::Instance()[kPort] = 8000; - mINI::Instance()[kTcpPort] = 8000; -}); -#endif -} -} - using namespace std; namespace mediakit { +// RTC配置项目 +namespace Rtc { +#define RTC_FIELD "rtc." +// rtp和rtcp接受超时时间 +const string kTimeOutSec = RTC_FIELD "timeoutSec"; +// 服务器外网ip +const string kExternIP = RTC_FIELD "externIP"; +// 设置remb比特率，非0时关闭twcc并开启remb。该设置在rtc推流时有效，可以控制推流画质 +const string kRembBitRate = RTC_FIELD "rembBitRate"; +// webrtc单端口udp服务器 +const string kPort = RTC_FIELD "port"; + +const string kTcpPort = RTC_FIELD "tcpPort"; + +static onceToken token([]() { + mINI::Instance()[kTimeOutSec] = 15; + mINI::Instance()[kExternIP] = ""; + mINI::Instance()[kRembBitRate] = 0; + mINI::Instance()[kPort] = 8000; + mINI::Instance()[kTcpPort] = 8000; +}); + +} // namespace RTC + static atomic s_key { 0 }; static void translateIPFromEnv(std::vector &v) { diff --git a/webrtc/WebRtcTransport.h b/webrtc/WebRtcTransport.h index 9ef681e6..2534ca3b 100644 --- a/webrtc/WebRtcTransport.h +++ b/webrtc/WebRtcTransport.h @@ -28,6 +28,13 @@ namespace mediakit { +//RTC配置项目 +namespace Rtc { +extern const std::string kPort; +extern const std::string kTcpPort; +extern const std::string kTimeOutSec; +}//namespace RTC + class WebRtcInterface { public: WebRtcInterface() = default; From 52438db96c45563786615237a1e3faa7a5db3134 Mon Sep 17 00:00:00 2001 From: weishao Date: Mon, 24 Jul 2023 14:32:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/main.cpp | 1 - src/Common/config.cpp | 1 - src/Common/config.h | 1 - 3 files changed, 3 deletions(-) diff --git a/server/main.cpp b/server/main.cpp index 10542cf2..b9d84249 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -102,7 +102,6 @@ onceToken token1([](){ },nullptr); } //namespace RtpProxy - } // namespace mediakit diff --git a/src/Common/config.cpp b/src/Common/config.cpp index 7abc0ca9..52c79091 100644 --- a/src/Common/config.cpp +++ b/src/Common/config.cpp @@ -260,7 +260,6 @@ static onceToken token([]() { }); } // namespace Rtp - ////////////组播配置/////////// namespace MultiCast { #define MULTI_FIELD "multicast." diff --git a/src/Common/config.h b/src/Common/config.h index 38c8c1a0..ec546a17 100644 --- a/src/Common/config.h +++ b/src/Common/config.h @@ -308,7 +308,6 @@ extern const std::string kLowLatency; extern const std::string kH264StapA; } // namespace Rtp - ////////////组播配置/////////// namespace MultiCast { // 组播分配起始地址