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 branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-06-03 10:13:58 +08:00
commit 5dd81d182c
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
trunk/conf/full.conf
View file

@ -624,8 +624,9 @@ vhost with-hls.srs.com {
# the timeout in seconds to dispose the hls,
# dispose is to remove all hls files, m3u8 and ts files.
# when timeout or server terminate, dispose hls.
# default: 300
hls_dispose 300;
# @remark 0 to disable dispose.
# default: 0
hls_dispose 0;
# the max size to notify hls,
# to read max bytes from ts of specified cdn network,
# @remark only used when on_hls_notify is config.

2
trunk/src/app/srs_app_config.cpp
View file

@ -3566,7 +3566,7 @@ int SrsConfig::get_hls_dispose(string vhost)
{
SrsConfDirective* conf = get_hls(vhost);
int DEFAULT = 300;
int DEFAULT = 0;
if (!conf) {
return DEFAULT;

8
trunk/src/app/srs_app_hls.cpp
View file

@ -1155,6 +1155,14 @@ void SrsHls::dispose()
on_unpublish();
}
// only dispose hls when positive.
if (_req) {
int hls_dispose = _srs_config->get_hls_dispose(_req->vhost);
if (hls_dispose <= 0) {
return;
}
}
muxer->dispose();
}