diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index c73fefb0c..473493e99 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -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.