From c19856be5ca93c8b28c67f232ea3834870fe7d5d Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 23 May 2015 13:10:11 +0800 Subject: [PATCH] refine for 2.0 --- README.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index df3dc4218..9f9f0d341 100755 --- a/README.md +++ b/README.md @@ -1170,10 +1170,6 @@ SRS always use the most simple architecture to support complex transaction. * System arch: the system structure and arch. * Modularity arch: the main modularity of SRS. * Stream arch: the stream dispatch arch of SRS. -* RTMP cluster arch: the RTMP origin and edge cluster arch. -* Multiple processes arch (by wenjie): the multiple process of SRS. -* CLI arch: the cli arch for SRS, api to manage SRS. -* Bandwidth specification: the bandwidth test specification of SRS. ### System Architecture @@ -1181,12 +1177,12 @@ SRS always use the most simple architecture to support complex transaction. +------------------------------------------------------+ | SRS(Simple RTMP Server) | +---------------+---------------+-----------+----------+ -| API/hook | Transcoder | HLS | RTMP | +| API/hook | Transcoder | HLS/HDS | RTMP/FLV | | http-parser | FFMPEG/x264 | NGINX/ts | protocol | +---------------+---------------+-----------+----------+ | Network(state-threads) | +------------------------------------------------------+ -| All Linux(RHEL,CentOS,Ubuntu,Fedora...) | +| All Linux/Unix(RHEL,CentOS,Ubuntu,Fedora...) | +------------------------------------------------------+ @@ -1194,11 +1190,11 @@ SRS always use the most simple architecture to support complex transaction. 
 +------------------------------------------------------+
-|             Main(srs/bandwidth/librtmp)              |
+|             Main(srs/ingest-hls/librtmp)             |
 +------------------------------------------------------+
 |           App(Server/Client application)             |
 +------------------------------------------------------+
-|               RTMP(Protocol stack)                   |
+|         RTMP/HTTP/RawStream(Protocol stack)          |
 +------------------------------------------------------+
 |      Kernel(depends on Core, provides error/log)     |
 +------------------------------------------------------+