external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-05-23 13:10:20 +08:00
commit 03c6aa37ad
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -1174,10 +1174,6 @@ SRS always use the most simple architecture to support complex transaction.
* System arch: the system structure and arch. * System arch: the system structure and arch.
* Modularity arch: the main modularity of SRS. * Modularity arch: the main modularity of SRS.
* Stream arch: the stream dispatch arch 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 ### System Architecture
@ -1185,12 +1181,12 @@ SRS always use the most simple architecture to support complex transaction.
+------------------------------------------------------+ +------------------------------------------------------+
| SRS(Simple RTMP Server) | | SRS(Simple RTMP Server) |
+---------------+---------------+-----------+----------+ +---------------+---------------+-----------+----------+
| API/hook | Transcoder | HLS | RTMP | | API/hook | Transcoder | HLS/HDS | RTMP/FLV |
| http-parser | FFMPEG/x264 | NGINX/ts | protocol | | http-parser | FFMPEG/x264 | NGINX/ts | protocol |
+---------------+---------------+-----------+----------+ +---------------+---------------+-----------+----------+
| Network(state-threads) | | Network(state-threads) |
+------------------------------------------------------+ +------------------------------------------------------+
| All Linux(RHEL,CentOS,Ubuntu,Fedora...) | | All Linux/Unix(RHEL,CentOS,Ubuntu,Fedora...) |
+------------------------------------------------------+ +------------------------------------------------------+
</pre> </pre>
@ -1198,11 +1194,11 @@ SRS always use the most simple architecture to support complex transaction.
<pre> <pre>
+------------------------------------------------------+ +------------------------------------------------------+
| Main(srs/bandwidth/librtmp) | | Main(srs/ingest-hls/librtmp) |
+------------------------------------------------------+ +------------------------------------------------------+
| App(Server/Client application) | | App(Server/Client application) |
+------------------------------------------------------+ +------------------------------------------------------+
| RTMP(Protocol stack) | | RTMP/HTTP/RawStream(Protocol stack) |
+------------------------------------------------------+ +------------------------------------------------------+
| Kernel(depends on Core, provides error/log) | | Kernel(depends on Core, provides error/log) |
+------------------------------------------------------+ +------------------------------------------------------+