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-09-11 08:21:06 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7ae76b579e449035bc6db8b5527ea586491ee1f6
7ae76b57
1 parent
77d21f7e
refine the conf, use srs3 style
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
25 行增加
和
15 行删除
trunk/conf/demo.19350.conf
trunk/conf/full.conf
trunk/conf/http.flv.live.edge1.conf
trunk/conf/http.flv.live.edge2.conf
trunk/conf/http.server.conf
trunk/conf/transform.edge.conf
trunk/conf/demo.19350.conf
查看文件 @
7ae76b5
...
...
@@ -11,7 +11,9 @@ pid ./objs/srs.demo.19350.pid;
vhost
__
defaultVhost__
{
enabled
on
;
gop_cache
on
;
play
{
gop_cache
on
;
}
hls
{
enabled
on
;
hls_path
./
objs
/
nginx
/
html
/
forward
;
...
...
trunk/conf/full.conf
查看文件 @
7ae76b5
...
...
@@ -445,17 +445,19 @@ vhost play.srs.com {
# vhost for time jitter
vhost
jitter
.
srs
.
com
{
# @see play.srs.com
time_jitter
full
;
# @see play.srs.com
mix_correct
off
;
play
{
time_jitter
full
;
mix_correct
off
;
}
}
# vhost for atc.
vhost
atc
.
srs
.
com
{
# @see play.srs.com
atc
on
;
# @see play.srs.com
atc_auto
on
;
play
{
atc
on
;
atc_auto
on
;
}
}
# the MR(merged-read) setting for publisher.
...
...
trunk/conf/http.flv.live.edge1.conf
查看文件 @
7ae76b5
...
...
@@ -12,8 +12,10 @@ http_server {
dir
./
objs
/
nginx
/
html
;
}
vhost
__
defaultVhost__
{
mode
remote
;
origin
127
.
0
.
0
.
1
;
cluster
{
mode
remote
;
origin
127
.
0
.
0
.
1
;
}
http_remux
{
enabled
on
;
mount
[
vhost
]/[
app
]/[
stream
].
flv
;
...
...
trunk/conf/http.flv.live.edge2.conf
查看文件 @
7ae76b5
...
...
@@ -12,8 +12,10 @@ http_server {
dir
./
objs
/
nginx
/
html
;
}
vhost
__
defaultVhost__
{
mode
remote
;
origin
127
.
0
.
0
.
1
;
cluster
{
mode
remote
;
origin
127
.
0
.
0
.
1
;
}
http_remux
{
enabled
on
;
mount
[
vhost
]/[
app
]/[
stream
].
flv
;
...
...
trunk/conf/http.server.conf
查看文件 @
7ae76b5
...
...
@@ -9,7 +9,7 @@ http_server {
dir
./
objs
/
nginx
/
html
;
}
vhost
ossrs
.
net
{
http
{
http
_static
{
enabled
on
;
mount
[
vhost
]/;
dir
./
objs
/
nginx
/
html
;
...
...
trunk/conf/transform.edge.conf
查看文件 @
7ae76b5
...
...
@@ -21,7 +21,9 @@ vhost source.srs.com {
}
}
vhost
transform
.
srs
.
edge
.
com
{
mode
remote
;
origin
127
.
0
.
0
.
1
:
1935
;
vhost
source
.
srs
.
com
;
cluster
{
mode
remote
;
origin
127
.
0
.
0
.
1
:
1935
;
vhost
source
.
srs
.
com
;
}
}
\ No newline at end of file
...
...
请
注册
或
登录
后发表评论