Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-06-03 10:13:46 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
af9efe921394cdbe0ddcc0cf4728b6fff7c2cd45
af9efe92
1 parent
4e42b9c6
disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
12 行增加
和
3 行删除
trunk/conf/full.conf
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_hls.cpp
trunk/conf/full.conf
查看文件 @
af9efe9
...
...
@@ -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.
...
...
trunk/src/app/srs_app_config.cpp
查看文件 @
af9efe9
...
...
@@ -3566,7 +3566,7 @@ int SrsConfig::get_hls_dispose(string vhost)
{
SrsConfDirective
*
conf
=
get_hls
(
vhost
);
int
DEFAULT
=
30
0
;
int
DEFAULT
=
0
;
if
(
!
conf
)
{
return
DEFAULT
;
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
af9efe9
...
...
@@ -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
();
}
...
...
请
注册
或
登录
后发表评论