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 17:42:09 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2695e4d0c6d374f0b152a70f02f7982932fcc941
2695e4d0
1 parent
6af0794b
fix bug of core
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
22 行增加
和
21 行删除
trunk/conf/srs.conf
trunk/src/core/srs_core.cpp
trunk/conf/srs.conf
查看文件 @
2695e4d
...
...
@@ -20,7 +20,7 @@ vhost __defaultVhost__ {
transcode
{
enabled
on
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
ld
{
engine
ld
{
enabled
on
;
vfilter
{
vf
'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf'
;
...
...
@@ -43,7 +43,7 @@ vhost __defaultVhost__ {
}
output
rtmp
://
127
.
0
.
0
.
1
:[
port
]/[
app
]?
vhost
=[
vhost
]/[
stream
]
_
[
engine
];
}
engine
sd
{
engine
sd
{
enabled
on
;
vfilter
{
vf
'split [main][tmp]; [tmp] crop=iw:ih/2:0:0, vflip [flip]; [main][flip] overlay=0:H/2'
;
...
...
@@ -76,11 +76,11 @@ vhost dev {
hls_path
./
objs
/
nginx
/
html
;
hls_fragment
5
;
hls_window
30
;
forward
127
.
0
.
0
.
1
:
19350
?
vhost
=
dev
;
forward
127
.
0
.
0
.
1
:
19350
;
transcode
{
enabled
on
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
dev
{
engine
dev
{
enabled
on
;
vfilter
{
}
...
...
@@ -109,7 +109,7 @@ vhost mirror.transcode.vhost.com {
transcode
{
enabled
on
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
mirror
{
engine
mirror
{
enabled
on
;
vfilter
{
vf
'split [main][tmp]; [tmp] crop=iw:ih/2:0:0, vflip [flip]; [main][flip] overlay=0:H/2'
;
...
...
@@ -139,7 +139,7 @@ vhost drawtext.transcode.vhost.com {
transcode
{
enabled
on
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
drawtext
{
engine
drawtext
{
enabled
on
;
vfilter
{
vf
'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf'
;
...
...
@@ -169,7 +169,7 @@ vhost crop.transcode.vhost.com {
transcode
{
enabled
on
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
crop
{
engine
crop
{
enabled
on
;
vfilter
{
vf
'crop=in_w-20:in_h-160:10:80'
;
...
...
@@ -199,7 +199,7 @@ vhost logo.transcode.vhost.com {
transcode
{
enabled
on
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
logo
{
engine
logo
{
enabled
on
;
vfilter
{
vf
'crop=200:100:10:10'
;
...
...
@@ -237,7 +237,7 @@ vhost all.transcode.vhost.com {
# the transcode engine for matched stream.
# all matched stream will transcoded to the following stream.
# the transcode set name(ie. hd) is optional and not used.
engine
ffsuper
{
engine
ffsuper
{
# whether the engine is enabled
# default: off.
enabled
on
;
...
...
@@ -300,7 +300,7 @@ vhost all.transcode.vhost.com {
# [engine] the tanscode engine name.
output
rtmp
://
127
.
0
.
0
.
1
:[
port
]/[
app
]?
vhost
=[
vhost
]/[
stream
]
_
[
engine
];
}
engine
ffhd
{
engine
ffhd
{
enabled
on
;
vcodec
libx264
;
vbitrate
1200
;
...
...
@@ -318,9 +318,9 @@ vhost all.transcode.vhost.com {
achannels
2
;
aparams
{
}
output
rtmp
://
[
vhost
]:[
port
]/[
app
]/[
stream
]
_
ffhd
;
output
rtmp
://
127
.
0
.
0
.
1
:[
port
]/[
app
]?
vhost
=[
vhost
]/[
stream
]
_
[
engine
]
;
}
engine
ffsd
{
engine
ffsd
{
enabled
on
;
vcodec
libx264
;
vbitrate
800
;
...
...
@@ -338,9 +338,9 @@ vhost all.transcode.vhost.com {
achannels
2
;
aparams
{
}
output
rtmp
://
[
vhost
]:[
port
]/[
app
]/[
stream
]
_
ffsd
;
output
rtmp
://
127
.
0
.
0
.
1
:[
port
]/[
app
]?
vhost
=[
vhost
]/[
stream
]
_
[
engine
]
;
}
engine
fffast
{
engine
fffast
{
enabled
on
;
vcodec
libx264
;
vbitrate
300
;
...
...
@@ -358,7 +358,7 @@ vhost all.transcode.vhost.com {
achannels
2
;
aparams
{
}
output
rtmp
://
[
vhost
]:[
port
]/[
app
]/[
stream
]
_
fffast
;
output
rtmp
://
127
.
0
.
0
.
1
:[
port
]/[
app
]?
vhost
=[
vhost
]/[
stream
]
_
[
engine
]
;
}
}
}
...
...
@@ -367,7 +367,7 @@ vhost ffempty.transcode.vhost.com {
transcode
{
enabled
on
;
ffmpeg
./
research
/
ffempty
/
ffempty
;
engine
empty
{
engine
empty
{
enabled
on
;
vcodec
libx264
;
vbitrate
300
;
...
...
@@ -385,7 +385,7 @@ vhost ffempty.transcode.vhost.com {
achannels
2
;
aparams
{
}
output
rtmp
://
[
vhost
]:[
port
]/[
app
]/[
stream
]
_
empty
;
output
rtmp
://
127
.
0
.
0
.
1
:[
port
]/[
app
]?
vhost
=[
vhost
]/[
stream
]
_
[
engine
]
;
}
}
}
...
...
@@ -396,7 +396,7 @@ vhost app.transcode.vhost.com {
transcode
live
{
enabled
on
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
fd
{
engine
{
enabled
off
;
}
}
...
...
@@ -408,13 +408,13 @@ vhost stream.transcode.vhost.com {
transcode
live
/
livestream
{
enabled
on
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
fd
{
engine
{
enabled
off
;
}
}
}
# the vhost which forward publish streams.
vhost
forward
.
vhost
.
com
{
vhost
same
.
vhost
.
forward
.
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.
...
...
@@ -425,7 +425,7 @@ vhost forward.vhost.com {
forward
127
.
0
.
0
.
1
:
1936
127
.
0
.
0
.
1
:
1937
;
}
# the vhost which forward publish streams to other vhosts.
vhost
forward1
.
vhost
.
com
{
vhost
change
.
vhost
.
forward
.
vhost
.
com
{
forward
127
.
0
.
0
.
1
:
1936
?
vhost
=
forward2
.
vhost
.
com
127
.
0
.
0
.
1
:
1937
?
vhost
=
forward3
.
vhost
.
com
;
}
# the vhost disabled.
...
...
trunk/src/core/srs_core.cpp
100644 → 100755
查看文件 @
2695e4d
...
...
@@ -92,6 +92,7 @@ void srs_vhost_resolve(std::string& vhost, std::string& app)
{
app
=
srs_replace
(
app
,
"..."
,
"?"
);
size_t
pos
=
0
;
if
((
pos
=
app
.
find
(
"?"
))
==
std
::
string
::
npos
)
{
return
;
}
...
...
请
注册
或
登录
后发表评论