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
2013-12-01 14:28:07 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e4ea965a3ae462ccc0ddb3eec9ea9ab4990477e8
e4ea965a
1 parent
82190d7f
update conf
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
12 行增加
和
5 行删除
trunk/conf/srs.conf
trunk/conf/srs.conf
查看文件 @
e4ea965
...
...
@@ -23,8 +23,7 @@ vhost __defaultVhost__ {
engine
ld
{
enabled
on
;
vfilter
{
i
./
doc
/
ffmpeg
-
min
.
png
;
filter_complex
'overlay=10:10'
;
vf
'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf'
;
}
vcodec
libx264
;
vbitrate
300
;
...
...
@@ -77,7 +76,7 @@ vhost dev {
hls_path
./
objs
/
nginx
/
html
;
hls_fragment
5
;
hls_window
30
;
forward
dev
:
19350
;
#
forward dev:19350;
transcode
{
enabled
on
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
...
...
@@ -101,7 +100,7 @@ vhost dev {
achannels
2
;
aparams
{
}
output
rtmp
://
[
vhost
]
:[
port
]/[
app
]/[
stream
]
_
dev
;
output
rtmp
://
127
.
0
.
0
.
1
:[
port
]/[
app
]/[
stream
]
_
dev
;
}
}
}
...
...
@@ -143,7 +142,7 @@ vhost drawtext.transcode.vhost.com {
engine
drawtext
{
enabled
on
;
vfilter
{
vf
'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#
EEEEEE
:fontfile=./doc/FreeSerifBold.ttf'
;
vf
'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#
cccccc
:fontfile=./doc/FreeSerifBold.ttf'
;
}
vcodec
libx264
;
vbitrate
300
;
...
...
@@ -421,6 +420,14 @@ vhost forward.vhost.com {
# format: {ip}:{port} {ip_N}:{port_N}
forward
127
.
0
.
0
.
1
:
1936
127
.
0
.
0
.
1
:
1937
;
}
# the vhost which forward publish streams to other vhosts.
vhost
forward1
.
vhost
.
com
{
# forward all publish stream to the specified server.
# this used to split/forward the current stream for cluster active-standby,
# active-active for cdn to build high available fault tolerance system.
# format: {ip}:{port} {ip_N}:{port_N}
forward
forward
.
vhost
.
com
:
1936
forward
.
vhost
.
com
:
1937
;
}
# the vhost disabled.
vhost
removed
.
vhost
.
com
{
# whether the vhost is enabled.
...
...
请
注册
或
登录
后发表评论