external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Extract hybrid server for SRT

Browse source
This commit is contained in:
winlin 2020-01-23 18:21:11 +08:00
parent 225c830971
commit 1959d1d920
6 changed files with 175 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

31
trunk/src/app/srs_app_server.cpp
View file

@ -688,11 +688,6 @@ srs_error_t SrsServer::listen()
if ((err = conn_manager->start()) != srs_success) {
return srs_error_wrap(err, "connection manager");
}
#ifdef SRS_AUTO_SRT
if ((err = listen_srt()) != srs_success) {
return srs_error_wrap(err, "srt listen");
}
#endif
return err;
}
@ -1009,32 +1004,6 @@ srs_error_t SrsServer::do_cycle()
return err;
}
#ifdef SRS_AUTO_SRT
srs_error_t SrsServer::listen_srt() {
srs_error_t err = srs_success;
if(_srs_config->get_srt_enabled()) {
srs_trace("srt server is enabled...");
unsigned short srt_port = _srs_config->get_srt_listen_port();
srs_trace("srt server listen port:%d", srt_port);
err = srt2rtmp::get_instance()->init();
if (err != srs_success) {
srs_error_wrap(err, "srt start srt2rtmp error");
return err;
}
srt_ptr = std::make_shared<srt_server>(srt_port);
if (!srt_ptr) {
srs_error_wrap(err, "srt listen %d", srt_port);
}
srt_ptr->start();
} else {
srs_trace("srt server is disabled...");
}
return err;
}
#endif
srs_error_t SrsServer::listen_rtmp()
{
srs_error_t err = srs_success;