external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

SRT: Initialize SRT eventloop in adapter.

Browse source
This commit is contained in:
winlin 2022-05-28 12:07:36 +08:00
parent 4899be9c34
commit 21899c5998
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
trunk/src/app/srs_app_srt_server.cpp
View file

@ -14,6 +14,10 @@ using namespace std;
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_app_srt_conn.hpp> #include <srs_app_srt_conn.hpp>
#ifdef SRS_SRT
SrsSrtEventLoop* _srt_eventloop = NULL;
#endif
std::string srs_srt_listener_type2string(SrsSrtListenerType type) std::string srs_srt_listener_type2string(SrsSrtListenerType type)
{ {
switch (type) { switch (type) {
@ -300,6 +304,17 @@ SrsSrtServerAdapter::~SrsSrtServerAdapter()
srs_error_t SrsSrtServerAdapter::initialize() srs_error_t SrsSrtServerAdapter::initialize()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
_srt_eventloop = new SrsSrtEventLoop();
if ((err = _srt_eventloop->initialize()) != srs_success) {
return srs_error_wrap(err, "srt poller initialize");
}
if ((err = _srt_eventloop->start()) != srs_success) {
return srs_error_wrap(err, "srt poller start");
}
return err; return err;
} }

11
trunk/src/main/srs_main_server.cpp
View file

@ -66,10 +66,6 @@ extern const char* _srs_version;
// @global main SRS server, for debugging // @global main SRS server, for debugging
SrsServer* _srs_server = NULL; SrsServer* _srs_server = NULL;
#ifdef SRS_SRT
SrsSrtEventLoop* _srt_eventloop = NULL;
#endif
/** /**
* main entrance. * main entrance.
*/ */
@ -460,13 +456,6 @@ srs_error_t run_hybrid_server()
_srs_hybrid->register_server(new SrsServerAdapter()); _srs_hybrid->register_server(new SrsServerAdapter());
#ifdef SRS_SRT #ifdef SRS_SRT
_srt_eventloop = new SrsSrtEventLoop();
if ((err = _srt_eventloop->initialize()) != srs_success) {
return srs_error_wrap(err, "srt poller initialize");
}
if ((err = _srt_eventloop->start()) != srs_success) {
return srs_error_wrap(err, "srt poller start");
}
_srs_hybrid->register_server(new SrsSrtServerAdapter()); _srs_hybrid->register_server(new SrsSrtServerAdapter());
#endif #endif