winlin

refine for 2.0

正在显示 1 个修改的文件 包含 4 行增加8 行删除
@@ -1170,10 +1170,6 @@ SRS always use the most simple architecture to support complex transaction. @@ -1170,10 +1170,6 @@ SRS always use the most simple architecture to support complex transaction.
1170 * System arch: the system structure and arch. 1170 * System arch: the system structure and arch.
1171 * Modularity arch: the main modularity of SRS. 1171 * Modularity arch: the main modularity of SRS.
1172 * Stream arch: the stream dispatch arch of SRS. 1172 * Stream arch: the stream dispatch arch of SRS.
1173 -* RTMP cluster arch: the RTMP origin and edge cluster arch.  
1174 -* Multiple processes arch (by wenjie): the multiple process of SRS.  
1175 -* CLI arch: the cli arch for SRS, api to manage SRS.  
1176 -* Bandwidth specification: the bandwidth test specification of SRS.  
1177 1173
1178 ### System Architecture 1174 ### System Architecture
1179 1175
@@ -1181,12 +1177,12 @@ SRS always use the most simple architecture to support complex transaction. @@ -1181,12 +1177,12 @@ SRS always use the most simple architecture to support complex transaction.
1181 +------------------------------------------------------+ 1177 +------------------------------------------------------+
1182 | SRS(Simple RTMP Server) | 1178 | SRS(Simple RTMP Server) |
1183 +---------------+---------------+-----------+----------+ 1179 +---------------+---------------+-----------+----------+
1184 -| API/hook | Transcoder | HLS | RTMP | 1180 +| API/hook | Transcoder | HLS/HDS | RTMP/FLV |
1185 | http-parser | FFMPEG/x264 | NGINX/ts | protocol | 1181 | http-parser | FFMPEG/x264 | NGINX/ts | protocol |
1186 +---------------+---------------+-----------+----------+ 1182 +---------------+---------------+-----------+----------+
1187 | Network(state-threads) | 1183 | Network(state-threads) |
1188 +------------------------------------------------------+ 1184 +------------------------------------------------------+
1189 -| All Linux(RHEL,CentOS,Ubuntu,Fedora...) | 1185 +| All Linux/Unix(RHEL,CentOS,Ubuntu,Fedora...) |
1190 +------------------------------------------------------+ 1186 +------------------------------------------------------+
1191 </pre> 1187 </pre>
1192 1188
@@ -1194,11 +1190,11 @@ SRS always use the most simple architecture to support complex transaction. @@ -1194,11 +1190,11 @@ SRS always use the most simple architecture to support complex transaction.
1194 1190
1195 <pre> 1191 <pre>
1196 +------------------------------------------------------+ 1192 +------------------------------------------------------+
1197 -| Main(srs/bandwidth/librtmp) | 1193 +| Main(srs/ingest-hls/librtmp) |
1198 +------------------------------------------------------+ 1194 +------------------------------------------------------+
1199 | App(Server/Client application) | 1195 | App(Server/Client application) |
1200 +------------------------------------------------------+ 1196 +------------------------------------------------------+
1201 -| RTMP(Protocol stack) | 1197 +| RTMP/HTTP/RawStream(Protocol stack) |
1202 +------------------------------------------------------+ 1198 +------------------------------------------------------+
1203 | Kernel(depends on Core, provides error/log) | 1199 | Kernel(depends on Core, provides error/log) |
1204 +------------------------------------------------------+ 1200 +------------------------------------------------------+