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-02-02 13:39:23 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
89b37d34691040822bf9739ff1cfb9bf7c7e6302
89b37d34
1 parent
4d10cc9f
for #136, refine the conf for hls.
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
13 行增加
和
13 行删除
trunk/conf/full.conf
trunk/conf/hls.conf
trunk/conf/full.conf
查看文件 @
89b37d3
...
...
@@ -448,18 +448,6 @@ vhost with-hls.srs.com {
# if off, donot write hls(ts and m3u8) when publish.
# default: off
enabled
on
;
# the hls output path.
# the app dir is auto created under the hls_path.
# for example, for rtmp stream:
# rtmp://127.0.0.1/live/livestream
# http://127.0.0.1/live/livestream.m3u8
# where hls_path is /hls, srs will create the following files:
# /hls/live the app dir for all streams.
# /hls/live/livestream.m3u8 the HLS m3u8 file.
# /hls/live/livestream-1.ts the HLS media/ts file.
# in a word, the hls_path is for vhost.
# default: ./objs/nginx/html
hls_path
./
objs
/
nginx
/
html
;
# the hls fragment in seconds, the duration of a piece of ts.
# default: 10
hls_fragment
10
;
...
...
@@ -473,6 +461,18 @@ vhost with-hls.srs.com {
# @see https://github.com/winlinvip/simple-rtmp-server/issues/264
# default: ignore
hls_on_error
ignore
;
# the hls output path.
# the app dir is auto created under the hls_path.
# for example, for rtmp stream:
# rtmp://127.0.0.1/live/livestream
# http://127.0.0.1/live/livestream.m3u8
# where hls_path is /hls, srs will create the following files:
# /hls/live the app dir for all streams.
# /hls/live/livestream.m3u8 the HLS m3u8 file.
# /hls/live/livestream-1.ts the HLS media/ts file.
# in a word, the hls_path is for vhost.
# default: ./objs/nginx/html
hls_path
./
objs
/
nginx
/
html
;
}
}
# the vhost with hls disabled.
...
...
trunk/conf/hls.conf
查看文件 @
89b37d3
...
...
@@ -7,8 +7,8 @@ max_connections 1000;
vhost
__
defaultVhost__
{
hls
{
enabled
on
;
hls_path
./
objs
/
nginx
/
html
;
hls_fragment
10
;
hls_window
60
;
hls_path
./
objs
/
nginx
/
html
;
}
}
...
...
请
注册
或
登录
后发表评论