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
2017-02-09 14:17:36 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
15570d93ce3c744250613f2d4c7689878e7a8d26
15570d93
1 parent
90ff579a
change conf to console without daemon.
隐藏空白字符变更
内嵌
并排对比
正在显示
31 个修改的文件
包含
60 行增加
和
13 行删除
trunk/conf/bandwidth.conf
trunk/conf/dvr.path.conf
trunk/conf/dvr.segment.conf
trunk/conf/dvr.session.conf
trunk/conf/edge.conf
trunk/conf/edge.token.traverse.conf
trunk/conf/ffmpeg.transcode.conf
trunk/conf/forward.master.conf
trunk/conf/forward.slave.conf
trunk/conf/hds.conf
trunk/conf/hls.conf
trunk/conf/http.aac.live.conf
trunk/conf/http.flv.live.conf
trunk/conf/http.flv.live.edge1.conf
trunk/conf/http.flv.live.edge2.conf
trunk/conf/http.heartbeat.conf
trunk/conf/http.hls.conf
trunk/conf/http.hooks.callback.conf
trunk/conf/http.mp3.live.conf
trunk/conf/http.server.conf
trunk/conf/http.ts.live.conf
trunk/conf/ingest.conf
trunk/conf/origin.conf
trunk/conf/push.flv.conf
trunk/conf/push.mpegts.over.udp.conf
trunk/conf/push.rtsp.conf
trunk/conf/realtime.conf
trunk/conf/rtmp.conf
trunk/conf/security.deny.publish.conf
trunk/conf/transcode2hls.audio.only.conf
trunk/conf/transform.edge.conf
trunk/conf/bandwidth.conf
查看文件 @
15570d9
...
...
@@ -3,6 +3,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
}
...
...
trunk/conf/dvr.path.conf
查看文件 @
15570d9
...
...
@@ -5,6 +5,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
dvr
{
enabled
on
;
...
...
trunk/conf/dvr.segment.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
dvr
{
enabled
on
;
...
...
trunk/conf/dvr.session.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
dvr
{
enabled
on
;
...
...
trunk/conf/edge.conf
查看文件 @
15570d9
...
...
@@ -5,7 +5,8 @@
listen
1935
;
max_connections
1000
;
pid
objs
/
edge
.
pid
;
srs_log_file
./
objs
/
edge
.
log
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
mode
remote
;
origin
127
.
0
.
0
.
1
:
19350
;
...
...
trunk/conf/edge.token.traverse.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
mode
remote
;
origin
127
.
0
.
0
.
1
:
19350
;
...
...
trunk/conf/ffmpeg.transcode.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
transcode
{
enabled
on
;
...
...
trunk/conf/forward.master.conf
查看文件 @
15570d9
...
...
@@ -5,8 +5,8 @@
listen
1935
;
max_connections
1000
;
pid
./
objs
/
srs
.
master
.
pid
;
srs_log_tank
file
;
srs_log_file
./
objs
/
srs
.
master
.
log
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
forward
127
.
0
.
0
.
1
:
19350
;
}
...
...
trunk/conf/forward.slave.conf
查看文件 @
15570d9
...
...
@@ -5,7 +5,7 @@
listen
19350
;
max_connections
1000
;
pid
./
objs
/
srs
.
slave
.
pid
;
srs_log_tank
file
;
srs_log_file
./
objs
/
srs
.
slave
.
log
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
}
...
...
trunk/conf/hds.conf
查看文件 @
15570d9
...
...
@@ -4,10 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
srs_log_level
trace
;
vhost
__
defaultVhost__
{
hds
{
...
...
trunk/conf/hls.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
hls
{
enabled
on
;
...
...
trunk/conf/http.aac.live.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
http_server
{
enabled
on
;
listen
8080
;
...
...
trunk/conf/http.flv.live.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
http_server
{
enabled
on
;
listen
8080
;
...
...
trunk/conf/http.flv.live.edge1.conf
查看文件 @
15570d9
...
...
@@ -5,7 +5,8 @@
listen
19351
;
max_connections
1000
;
pid
objs
/
srs
.
flv
.
19351
.
pid
;
srs_log_file
objs
/
srs
.
flv
.
19351
.
log
;
daemon
off
;
srs_log_tank
console
;
http_server
{
enabled
on
;
listen
8081
;
...
...
trunk/conf/http.flv.live.edge2.conf
查看文件 @
15570d9
...
...
@@ -5,7 +5,8 @@
listen
19352
;
max_connections
1000
;
pid
objs
/
srs
.
flv
.
19352
.
pid
;
srs_log_file
objs
/
srs
.
flv
.
19352
.
log
;
daemon
off
;
srs_log_tank
console
;
http_server
{
enabled
on
;
listen
8082
;
...
...
trunk/conf/http.heartbeat.conf
查看文件 @
15570d9
...
...
@@ -3,6 +3,8 @@
listen
1935
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
heartbeat
{
enabled
on
;
interval
9
.
3
;
...
...
trunk/conf/http.hls.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
http_server
{
enabled
on
;
listen
8080
;
...
...
trunk/conf/http.hooks.callback.conf
查看文件 @
15570d9
...
...
@@ -3,8 +3,8 @@
listen
1935
;
max_connections
1000
;
srs_log_tank
file
;
srs_log_file
./
objs
/
srs
.
log
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
http_hooks
{
enabled
on
;
...
...
trunk/conf/http.mp3.live.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
http_server
{
enabled
on
;
listen
8080
;
...
...
trunk/conf/http.server.conf
查看文件 @
15570d9
...
...
@@ -3,6 +3,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
http_server
{
enabled
on
;
listen
8080
;
...
...
trunk/conf/http.ts.live.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
http_server
{
enabled
on
;
listen
8080
;
...
...
trunk/conf/ingest.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
ingest
livestream
{
enabled
on
;
...
...
trunk/conf/origin.conf
查看文件 @
15570d9
...
...
@@ -4,7 +4,7 @@
listen
19350
;
max_connections
1000
;
pid
objs
/
origin
.
pid
;
srs_log_file
./
objs
/
origin
.
log
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
}
...
...
trunk/conf/push.flv.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
http_server
{
enabled
on
;
listen
8080
;
...
...
trunk/conf/push.mpegts.over.udp.conf
查看文件 @
15570d9
...
...
@@ -5,6 +5,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
stream_caster
{
enabled
on
;
caster
mpegts_over_udp
;
...
...
trunk/conf/push.rtsp.conf
查看文件 @
15570d9
...
...
@@ -5,6 +5,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
stream_caster
{
enabled
on
;
caster
rtsp
;
...
...
trunk/conf/realtime.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
gop_cache
off
;
queue_length
10
;
...
...
trunk/conf/rtmp.conf
查看文件 @
15570d9
...
...
@@ -4,5 +4,7 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
}
...
...
trunk/conf/security.deny.publish.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
security
{
enabled
on
;
...
...
trunk/conf/transcode2hls.audio.only.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
hls
{
enabled
on
;
...
...
trunk/conf/transform.edge.conf
查看文件 @
15570d9
...
...
@@ -4,6 +4,8 @@
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
vhost
__
defaultVhost__
{
}
vhost
source
.
srs
.
com
{
...
...
请
注册
或
登录
后发表评论