external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

merge srs2

Browse source
This commit is contained in:
winlin 2017-01-11 09:33:26 +08:00
commit 7bbb3bae42
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -204,6 +204,7 @@ Please select your language:
### V2 changes ### V2 changes
* v2.0, 2017-01-11, fix [#736][bug #736], recovery the hls dispose. 2.0.227
* v2.0, 2017-01-10, refine hls html5 video template. * v2.0, 2017-01-10, refine hls html5 video template.
* v2.0, 2017-01-10, fix [#635][bug #635], hls support NonIDR(open gop). 2.0.226 * v2.0, 2017-01-10, fix [#635][bug #635], hls support NonIDR(open gop). 2.0.226
* v2.0, 2017-01-06, for [#730][bug #730], reset ack follow flash player rules. 2.0.225 * v2.0, 2017-01-06, for [#730][bug #730], reset ack follow flash player rules. 2.0.225

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

@ -800,8 +800,6 @@ int SrsSource::cycle_all()
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
// TODO: FIXME: support source cleanup.
// @see https://github.com/ossrs/srs/issues/714
int cid = _srs_context->get_id(); int cid = _srs_context->get_id();
ret = do_cycle_all(); ret = do_cycle_all();
_srs_context->set_id(cid); _srs_context->set_id(cid);
@ -816,10 +814,17 @@ int SrsSource::do_cycle_all()
std::map<std::string, SrsSource*>::iterator it; std::map<std::string, SrsSource*>::iterator it;
for (it = pool.begin(); it != pool.end();) { for (it = pool.begin(); it != pool.end();) {
SrsSource* source = it->second; SrsSource* source = it->second;
// Do cycle source to cleanup components, such as hls dispose.
if ((ret = source->cycle()) != ERROR_SUCCESS) { if ((ret = source->cycle()) != ERROR_SUCCESS) {
return ret; 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()) { if (source->expired()) {
int cid = source->source_id(); int cid = source->source_id();
if (cid == -1 && source->pre_source_id() > 0) { if (cid == -1 && source->pre_source_id() > 0) {
@ -835,6 +840,9 @@ int SrsSource::do_cycle_all()
} else { } else {
++it; ++it;
} }
#else
++it;
#endif
} }
return ret; return ret;