winlin

update conf

@@ -23,8 +23,7 @@ vhost __defaultVhost__ { @@ -23,8 +23,7 @@ vhost __defaultVhost__ {
23 engine ld{ 23 engine ld{
24 enabled on; 24 enabled on;
25 vfilter { 25 vfilter {
26 - i ./doc/ffmpeg-min.png;  
27 - filter_complex 'overlay=10:10'; 26 + vf 'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf';
28 } 27 }
29 vcodec libx264; 28 vcodec libx264;
30 vbitrate 300; 29 vbitrate 300;
@@ -77,7 +76,7 @@ vhost dev { @@ -77,7 +76,7 @@ vhost dev {
77 hls_path ./objs/nginx/html; 76 hls_path ./objs/nginx/html;
78 hls_fragment 5; 77 hls_fragment 5;
79 hls_window 30; 78 hls_window 30;
80 - forward dev:19350; 79 + #forward dev:19350;
81 transcode { 80 transcode {
82 enabled on; 81 enabled on;
83 ffmpeg ./objs/ffmpeg/bin/ffmpeg; 82 ffmpeg ./objs/ffmpeg/bin/ffmpeg;
@@ -101,7 +100,7 @@ vhost dev { @@ -101,7 +100,7 @@ vhost dev {
101 achannels 2; 100 achannels 2;
102 aparams { 101 aparams {
103 } 102 }
104 - output rtmp://[vhost]:[port]/[app]/[stream]_dev; 103 + output rtmp://127.0.0.1:[port]/[app]/[stream]_dev;
105 } 104 }
106 } 105 }
107 } 106 }
@@ -143,7 +142,7 @@ vhost drawtext.transcode.vhost.com { @@ -143,7 +142,7 @@ vhost drawtext.transcode.vhost.com {
143 engine drawtext{ 142 engine drawtext{
144 enabled on; 143 enabled on;
145 vfilter { 144 vfilter {
146 - vf 'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#EEEEEE:fontfile=./doc/FreeSerifBold.ttf'; 145 + vf 'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf';
147 } 146 }
148 vcodec libx264; 147 vcodec libx264;
149 vbitrate 300; 148 vbitrate 300;
@@ -421,6 +420,14 @@ vhost forward.vhost.com { @@ -421,6 +420,14 @@ vhost forward.vhost.com {
421 # format: {ip}:{port} {ip_N}:{port_N} 420 # format: {ip}:{port} {ip_N}:{port_N}
422 forward 127.0.0.1:1936 127.0.0.1:1937; 421 forward 127.0.0.1:1936 127.0.0.1:1937;
423 } 422 }
  423 +# the vhost which forward publish streams to other vhosts.
  424 +vhost forward1.vhost.com {
  425 + # forward all publish stream to the specified server.
  426 + # this used to split/forward the current stream for cluster active-standby,
  427 + # active-active for cdn to build high available fault tolerance system.
  428 + # format: {ip}:{port} {ip_N}:{port_N}
  429 + forward forward.vhost.com:1936 forward.vhost.com:1937;
  430 +}
424 # the vhost disabled. 431 # the vhost disabled.
425 vhost removed.vhost.com { 432 vhost removed.vhost.com {
426 # whether the vhost is enabled. 433 # whether the vhost is enabled.