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

refine ingest, start/stop ingest in server

Browse source
This commit is contained in:
winlin 2014-04-07 09:27:30 +08:00
parent eea2310b07
commit 095364a72b
4 changed files with 43 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -169,6 +169,9 @@ SrsServer::SrsServer()
#ifdef SRS_HTTP_SERVER
http_stream_handler = SrsHttpHandler::create_http_stream();
#endif
#ifdef SRS_INGEST
ingester = new SrsIngester();
#endif
}
SrsServer::~SrsServer()
@ -193,6 +196,9 @@ SrsServer::~SrsServer()
#ifdef SRS_HTTP_SERVER
srs_freep(http_stream_handler);
#endif
#ifdef SRS_INGEST
srs_freep(ingester);
#endif
}
int SrsServer::initialize()
@ -371,11 +377,12 @@ int SrsServer::cycle()
{
int ret = ERROR_SUCCESS;
// ingest streams
if ((ret = ingest_streams()) != ERROR_SUCCESS) {
srs_error("ingest streams failed. ret=%d", ret);
#ifdef SRS_INGEST
if ((ret = ingester->start()) != ERROR_SUCCESS) {
srs_error("start ingest streams failed. ret=%d", ret);
return ret;
}
#endif
// the deamon thread, update the time cache
while (true) {
@ -404,6 +411,10 @@ int SrsServer::cycle()
srs_trace("reload config success.");
}
}
#ifdef SRS_INGEST
ingester->stop();
#endif
return ret;
}
@ -448,15 +459,6 @@ void SrsServer::on_signal(int signo)
}
}
int SrsServer::ingest_streams()
{
int ret = ERROR_SUCCESS;
#ifdef SRS_INGEST
#endif
return ret;
}
void SrsServer::close_listeners()
{
std::vector<SrsListener*>::iterator it;