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

fix #736, recovery the hls dispose. 2.0.227

Browse source
This commit is contained in:
winlin 2017-01-11 09:25:48 +08:00
parent 087a596a63
commit e3aa34ec5f
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -794,14 +794,9 @@ int SrsSource::cycle_all()
{
int ret = ERROR_SUCCESS;
// TODO: FIXME: support source cleanup.
// @see https://github.com/ossrs/srs/issues/713
// @see https://github.com/ossrs/srs/issues/714
#if 0
int cid = _srs_context->get_id();
ret = do_cycle_all();
_srs_context->set_id(cid);
#endif
return ret;
}
@ -813,10 +808,17 @@ int SrsSource::do_cycle_all()
std::map<std::string, SrsSource*>::iterator it;
for (it = pool.begin(); it != pool.end();) {
SrsSource* source = it->second;
// Do cycle source to cleanup components, such as hls dispose.
if ((ret = source->cycle()) != ERROR_SUCCESS) {
return ret;
}
// TODO: FIXME: support source cleanup.
// @see https://github.com/ossrs/srs/issues/713
// @see https://github.com/ossrs/srs/issues/714
#if 0
// When source expired, remove it.
if (source->expired()) {
int cid = source->source_id();
if (cid == -1 && source->pre_source_id() > 0) {
@ -832,6 +834,9 @@ int SrsSource::do_cycle_all()
} else {
++it;
}
#else
++it;
#endif
}
return ret;