external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-07-23 14:35:04 +08:00
commit 4c3d3013a2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -829,7 +829,7 @@ SRS always use the most simple architecture to support complex transaction.
<pre> <pre>
+---------+ +----------+ +---------+ +----------+
+ Publish + + Deliver | | Publish | | Deliver |
+---|-----+ +----|-----+ +---|-----+ +----|-----+
+----------------------+-------------------------+----------------+ +----------------------+-------------------------+----------------+
| Input | SRS(Simple RTMP Server) | Output | | Input | SRS(Simple RTMP Server) | Output |
@ -844,13 +844,13 @@ SRS always use the most simple architecture to support complex transaction.
+----------------------+ | | +----------------------+ | |
| MediaSource(2) | | | | MediaSource(2) | | |
| (RTSP,FILE, | | | | (RTSP,FILE, | | |
| HTTP,HLS, --pull-+->-- Ingester ----(rtmp)-+-> SRS | | HTTP,HLS, --pull-+->-- Ingester(3) -(rtmp)-+-> SRS |
| Device, | | | | Device, | | |
| ......) | | | | ......) | | |
+----------------------+ | | +----------------------+ | |
| MediaSource(2) | | | | MediaSource(2) | | |
| (RTSP,FILE, | | | | (RTSP,FILE, | | |
| HTTP,HLS, --push-+->-- Streamer ----(rtmp)-+-> SRS | | HTTP,HLS, --push-+->-- Streamer(4) -(rtmp)-+-> SRS |
| Device, | | | | Device, | | |
| ......) | | | | ......) | | |
+----------------------+-------------------------+----------------+ +----------------------+-------------------------+----------------+