amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

程序退出时清空RtpProcess对象

Browse Source
This commit is contained in:
xiongziliang 2020-10-24 23:29:44 +08:00
parent fd898254f2
commit c5f1b4cd52
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/WebApi.cpp
View File

@ -1155,6 +1155,8 @@ void installWebApi() {
} }
void unInstallWebApi(){ void unInstallWebApi(){
RtpSelector::Instance().clear();
{ {
lock_guard<recursive_mutex> lck(s_proxyMapMtx); lock_guard<recursive_mutex> lck(s_proxyMapMtx);
s_proxyMap.clear(); s_proxyMap.clear();
@ -1164,6 +1166,7 @@ void unInstallWebApi(){
lock_guard<recursive_mutex> lck(s_ffmpegMapMtx); lock_guard<recursive_mutex> lck(s_ffmpegMapMtx);
s_ffmpegMap.clear(); s_ffmpegMap.clear();
} }
{ {
#if defined(ENABLE_RTPPROXY) #if defined(ENABLE_RTPPROXY)
lock_guard<recursive_mutex> lck(s_rtpServerMapMtx); lock_guard<recursive_mutex> lck(s_rtpServerMapMtx);

5
src/Rtp/RtpSelector.cpp
View File

@ -15,6 +15,11 @@ namespace mediakit{
INSTANCE_IMP(RtpSelector); INSTANCE_IMP(RtpSelector);
void RtpSelector::clear(){
lock_guard<decltype(_mtx_map)> lck(_mtx_map);
_map_rtp_process.clear();
}
bool RtpSelector::inputRtp(const Socket::Ptr &sock, const char *data, int data_len, bool RtpSelector::inputRtp(const Socket::Ptr &sock, const char *data, int data_len,
const struct sockaddr *addr,uint32_t *dts_out) { const struct sockaddr *addr,uint32_t *dts_out) {
//使用ssrc为流id //使用ssrc为流id

5
src/Rtp/RtpSelector.h
View File

@ -55,6 +55,11 @@ public:
static bool getSSRC(const char *data,int data_len, uint32_t &ssrc); static bool getSSRC(const char *data,int data_len, uint32_t &ssrc);
static RtpSelector &Instance(); static RtpSelector &Instance();
/**
* 清空所有对象
*/
void clear();
/** /**
* 输入多个rtp流，根据ssrc分流 * 输入多个rtp流，根据ssrc分流
* @param sock 本地socket * @param sock 本地socket