diff --git a/README.md b/README.md index 5810751dc..61d5bcb9f 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Simple-RTMP-Server ================== SRS(SIMPLE RTMP Server) over state-threads created in 2013.
-SRS is a simple, high-performance, running in single process, origin live server.
+SRS is a simple, high-performance, multiple process, origin/edge live server.
SRS supports [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/RtmpUrlVhost), rtmp, [HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS), transcoding, forward, http hooks.
Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)
See also: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server)
@@ -208,9 +208,9 @@ Supported operating systems and hardware: ### Summary 1. Simple: also stable enough.
2. [High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance): single-thread, async socket, event/st-thread driven.
-3. NO edge server, origin server only.
+3. With RTMP edge server, support origin server.
4. NO vod streaming, live streaming only.
-5. NO multiple processes, single process only.
+5. With multiple processes, support single process.
6. Support vhost, support \_\_defaultVhost\_\_.
7. Support adobe rtmp live streaming.
8. Support apple [HLS(m3u8)](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS) live streaming.
@@ -230,14 +230,15 @@ Supported operating systems and hardware: 22. Player, publisher(encoder), and demo pages(jquery+bootstrap).
23. Demo video meeting or chat(SRS+cherrypy+jquery+bootstrap).
24. [dev] Full documents in wiki, in chineses.
-25. [plan] Support network based cli and json result.
-26. [plan] Support adobe flash refer/token/swf verification.
-27. [plan] Support adobe amf3 codec.
-28. [plan] Support dvr(record live to vod file)
-29. [plan] Support FMS edge protocol
-30. [plan] Support encryption: RTMPE/RTMPS, HLS DRM
-31. [plan] Support RTMPT, http to tranverse firewalls
-32. [plan] Support file source, transcoding file to live stream
+25. [plan] Support RTMP edge server
+26. [plan] Support multiple process
+27. [plan] Support network based cli and json result.
+28. [no-plan] Support adobe flash refer/token/swf verification.
+29. [no-plan] Support adobe amf3 codec.
+30. [no-plan] Support dvr(record live to vod file)
+31. [no-plan] Support encryption: RTMPE/RTMPS, HLS DRM
+32. [no-plan] Support RTMPT, http to tranverse firewalls
+33. [no-plan] Support file source, transcoding file to live stream
### Performance 1. 300 connections, 150Mbps, 500kbps, CPU 18.8%, 5956KB.