external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix #241, add mw(merged-write) config. 2.0.53

Browse source
This commit is contained in:
winlin 2014-12-04 21:35:13 +08:00
parent 72fa33d9fb
commit b1d7fbe668
12 changed files with 125 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/conf/full.conf
View file

@ -143,7 +143,8 @@ vhost __defaultVhost__ {
}
# the MR(merged-read) setting for publisher.
vhost mr.srs.com {
# the MW(merged-write) settings for player.
vhost mrw.srs.com {
# about MR, read https://github.com/winlinvip/simple-rtmp-server/issues/241
mr {
# whether enable the MR(merged-read)
@ -160,6 +161,11 @@ vhost mr.srs.com {
# default: 500
latency 500;
}
# set the MW(merged-write) latency in ms.
# SRS always set mw on, so we just set the latency value.
# the latency of stream >= mw_latency + mr_latency
# default: 500
mw_latency 500;
}
# vhost for edge, edge and origin is the same vhost