胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
4c3d3013 2 parents c2d9c986 cd8be3f1

Merge branch '2.0release' into develop

内嵌 并排对比
正在显示 1 个修改的文件 包含 3 行增加 和 3 行删除
@@ -829,7 +829,7 @@ SRS always use the most simple architecture to support complex transaction. @@ -829,7 +829,7 @@ SRS always use the most simple architecture to support complex transaction.
829 829
830 <pre> 830 <pre>
831 +---------+ +----------+ 831 +---------+ +----------+
832 - + Publish + + Deliver | 832 + | Publish | | Deliver |
833 +---|-----+ +----|-----+ 833 +---|-----+ +----|-----+
834 +----------------------+-------------------------+----------------+ 834 +----------------------+-------------------------+----------------+
835 | Input | SRS(Simple RTMP Server) | Output | 835 | Input | SRS(Simple RTMP Server) | Output |
@@ -844,13 +844,13 @@ SRS always use the most simple architecture to support complex transaction. @@ -844,13 +844,13 @@ SRS always use the most simple architecture to support complex transaction.
844 +----------------------+ | | 844 +----------------------+ | |
845 | MediaSource(2) | | | 845 | MediaSource(2) | | |
846 | (RTSP,FILE, | | | 846 | (RTSP,FILE, | | |
847 -| HTTP,HLS, --pull-+->-- Ingester ----(rtmp)-+-> SRS | 847 +| HTTP,HLS, --pull-+->-- Ingester(3) -(rtmp)-+-> SRS |
848 | Device, | | | 848 | Device, | | |
849 | ......) | | | 849 | ......) | | |
850 +----------------------+ | | 850 +----------------------+ | |
851 | MediaSource(2) | | | 851 | MediaSource(2) | | |
852 | (RTSP,FILE, | | | 852 | (RTSP,FILE, | | |
853 -| HTTP,HLS, --push-+->-- Streamer ----(rtmp)-+-> SRS | 853 +| HTTP,HLS, --push-+->-- Streamer(4) -(rtmp)-+-> SRS |
854 | Device, | | | 854 | Device, | | |
855 | ......) | | | 855 | ......) | | |
856 +----------------------+-------------------------+----------------+ 856 +----------------------+-------------------------+----------------+