From a26c28334e23bdf631ffb469e65a21a15d44853a Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 27 Nov 2013 23:27:55 +0800 Subject: [PATCH] update readme --- README.md | 17 ++++++++++++----- trunk/conf/srs.conf | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4c23494ea..d0a7b8fef 100755 --- a/README.md +++ b/README.md @@ -40,11 +40,18 @@ m3u8 url: http://127.0.0.1:80/live/livestream.m3u8 ### Summary 1. simple: also stable enough.
2. high-performance: single-thread, async socket, event/st-thread driven.
-3. support vhost,support \_\_defaultVhost\_\_.
-4. support both rtmp and hls live streaming.
-5. no edge server, origin server only.
-6. no vod streaming, live streaming only.
-7. no multiple processes, single process only.
+3. support vhost, support \_\_defaultVhost\_\_.
+4. support both rtmp and hls(m3u8) live streaming.
+5. support reload config to enable changes.
+6. support cache last gop for flash player to fast startup.
+7. support listen at multiple ports.
+8. [dev] support forward publish stream to build active-standby cluster.
+9. [dev] support live stream transcoding by ffmpeg.
+10. [dev] support full http callback api.
+11. [dev] support network based cli and json result.
+12. no edge server, origin server only.
+13. no vod streaming, live streaming only.
+14. no multiple processes, single process only.
### Releases * 2013-11-26, [release v0.5](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.5), support HLS(m3u8), fragment and window. 14449 lines.
diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index 8ff97257a..b8a84849e 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -15,6 +15,15 @@ vhost __defaultVhost__ { hls_path ./objs/nginx/html; hls_fragment 5; hls_window 30; + forward 127.0.0.1:1936; +} +# the vhost which forward publish streams. +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. + # format: {ip}:{port} {ip_N}:{port_N} + forward 127.0.0.1:1936 127.0.0.1:1937; } # the vhost disabled. vhost removed.vhost.com {