From 6e2002e451ce2cb3c7fbed4e6d82c84c41cfe8a9 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Sat, 30 Mar 2019 00:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E7=A8=8B=E5=BA=8F=E9=80=80?= =?UTF-8?q?=E5=87=BA=E6=97=B6=E9=87=8A=E6=94=BE=E7=9B=B8=E5=85=B3=E8=B5=84?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_server.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/test_server.cpp b/tests/test_server.cpp index 6effb8e2..84f54d2c 100644 --- a/tests/test_server.cpp +++ b/tests/test_server.cpp @@ -100,7 +100,8 @@ onceToken token1([](){ #define REALM "realm_zlmedaikit" - +static map s_mapFlvRecorder; +static mutex s_mtxFlvRecorder; static onceToken s_token([](){ //监听kBroadcastOnGetRtspRealm事件决定rtsp链接是否需要鉴权(传统的rtsp鉴权方案)才能访问 NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastOnGetRtspRealm,[](BroadcastOnGetRtspRealmArgs){ @@ -183,8 +184,6 @@ static onceToken s_token([](){ //监听rtsp、rtmp源注册或注销事件;此处用于测试rtmp保存为flv录像,保存在http根目录下 NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastMediaChanged,[](BroadcastMediaChangedArgs){ if(schema == RTMP_SCHEMA && app == "live"){ - static map s_mapFlvRecorder; - static mutex s_mtxFlvRecorder; lock_guard lck(s_mtxFlvRecorder); if(bRegist){ DebugL << "开始录制RTMP:" << schema << " " << vhost << " " << app << " " << stream; @@ -355,6 +354,9 @@ int main(int argc,char *argv[]) { signal(SIGINT, [](int) { sem.post(); });// 设置退出信号 signal(SIGHUP, [](int) { loadIniConfig(); }); sem.wait(); + + lock_guard lck(s_mtxFlvRecorder); + s_mapFlvRecorder.clear(); return 0; }