amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-29 14:45:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
xiongziliang 2017-05-03 00:12:51 +08:00
parent d27f7107e1
commit 3fa3f1e46d
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -78,9 +78,7 @@ add_definitions(-DENABLE_RTMP2RTSP -DENABLE_RTSP2RTMP -DENABLE_HLS)
include_directories(${PROJECT_SOURCE_DIR}/src) include_directories(${PROJECT_SOURCE_DIR}/src)
#使能c++11 #使能c++11
if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
add_compile_options(-std=c++11)
endif(CMAKE_COMPILER_IS_GNUCXX)
#关闭过期接口警告 #关闭过期接口警告
add_compile_options(-Wno-deprecated-declarations) add_compile_options(-Wno-deprecated-declarations)

21
tests/test_server.cpp
View File

@ -12,9 +12,12 @@
#include "Rtsp/RtspSession.h" #include "Rtsp/RtspSession.h"
#include "Rtmp/RtmpSession.h" #include "Rtmp/RtmpSession.h"
#include "Http/HttpSession.h" #include "Http/HttpSession.h"
#include "Http/HttpsSession.h"
#ifdef ENABLE_OPENSSL
#include "Util/SSLBox.h" #include "Util/SSLBox.h"
#include "Util/SqlPool.h" #include "Http/HttpsSession.h"
#endif//ENABLE_OPENSSL
#include "Util/logger.h" #include "Util/logger.h"
#include "Util/onceToken.h" #include "Util/onceToken.h"
#include "Util/File.h" #include "Util/File.h"
@ -50,6 +53,8 @@ int main(int argc,char *argv[]){
player->play(url); player->play(url);
proxyMap.emplace(string(url),player); proxyMap.emplace(string(url),player);
} }
#ifdef ENABLE_OPENSSL
//请把证书"test_server.pem"放置在本程序可执行程序同目录下 //请把证书"test_server.pem"放置在本程序可执行程序同目录下
try{ try{
SSL_Initor::Instance().loadServerPem((exePath() + ".pem").data()); SSL_Initor::Instance().loadServerPem((exePath() + ".pem").data());
@ -57,22 +62,32 @@ int main(int argc,char *argv[]){
FatalL << "请把证书:" << (exeName() + ".pem") << "放置在本程序可执行程序同目录下:" << exeDir() << endl; FatalL << "请把证书:" << (exeName() + ".pem") << "放置在本程序可执行程序同目录下:" << exeDir() << endl;
return 0; return 0;
} }
#endif //ENABLE_OPENSSL
TcpServer<RtspSession>::Ptr rtspSrv(new TcpServer<RtspSession>()); TcpServer<RtspSession>::Ptr rtspSrv(new TcpServer<RtspSession>());
TcpServer<RtmpSession>::Ptr rtmpSrv(new TcpServer<RtmpSession>()); TcpServer<RtmpSession>::Ptr rtmpSrv(new TcpServer<RtmpSession>());
TcpServer<HttpSession>::Ptr httpSrv(new TcpServer<HttpSession>()); TcpServer<HttpSession>::Ptr httpSrv(new TcpServer<HttpSession>());
TcpServer<HttpsSession>::Ptr httpsSrv(new TcpServer<HttpsSession>());
rtspSrv->start(mINI::Instance()[Config::Rtsp::kPort]); rtspSrv->start(mINI::Instance()[Config::Rtsp::kPort]);
rtmpSrv->start(mINI::Instance()[Config::Rtmp::kPort]); rtmpSrv->start(mINI::Instance()[Config::Rtmp::kPort]);
httpSrv->start(mINI::Instance()[Config::Http::kPort]); httpSrv->start(mINI::Instance()[Config::Http::kPort]);
#ifdef ENABLE_OPENSSL
TcpServer<HttpsSession>::Ptr httpsSrv(new TcpServer<HttpsSession>());
httpsSrv->start(mINI::Instance()[Config::Http::kSSLPort]); httpsSrv->start(mINI::Instance()[Config::Http::kSSLPort]);
#endif //ENABLE_OPENSSL
EventPoller::Instance().runLoop(); EventPoller::Instance().runLoop();
rtspSrv.reset(); rtspSrv.reset();
rtmpSrv.reset(); rtmpSrv.reset();
httpSrv.reset(); httpSrv.reset();
#ifdef ENABLE_OPENSSL
httpsSrv.reset(); httpsSrv.reset();
#endif //ENABLE_OPENSSL
UDPServer::Destory(); UDPServer::Destory();
WorkThreadPool::Destory(); WorkThreadPool::Destory();