正在显示
1 个修改的文件
包含
1 行增加
和
35 行删除
@@ -486,6 +486,7 @@ Supported operating systems and hardware: | @@ -486,6 +486,7 @@ Supported operating systems and hardware: | ||
486 | * 2013-10-17, Created.<br/> | 486 | * 2013-10-17, Created.<br/> |
487 | 487 | ||
488 | ## History | 488 | ## History |
489 | +* v2.0, 2014-12-08, update wiki for mr([EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_LowLatency#merged-read), [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_LowLatency#merged-read)) and mw([EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_LowLatency#merged-write), [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_LowLatency#merged-write)). | ||
489 | * v2.0, 2014-12-07, fix [#251](https://github.com/winlinvip/simple-rtmp-server/issues/251), 10k+ clients, use queue cond wait and fast vector. 2.0.67 | 490 | * v2.0, 2014-12-07, fix [#251](https://github.com/winlinvip/simple-rtmp-server/issues/251), 10k+ clients, use queue cond wait and fast vector. 2.0.67 |
490 | * v2.0, 2014-12-05, fix [#251](https://github.com/winlinvip/simple-rtmp-server/issues/251), 9k+ clients, use fast cache for msgs queue. 2.0.57 | 491 | * v2.0, 2014-12-05, fix [#251](https://github.com/winlinvip/simple-rtmp-server/issues/251), 9k+ clients, use fast cache for msgs queue. 2.0.57 |
491 | * v2.0, 2014-12-04, fix [#241](https://github.com/winlinvip/simple-rtmp-server/issues/241), add mw(merged-write) config. 2.0.53 | 492 | * v2.0, 2014-12-04, fix [#241](https://github.com/winlinvip/simple-rtmp-server/issues/241), add mw(merged-write) config. 2.0.53 |
@@ -860,41 +861,6 @@ Schema#2: SRS RTMP Edge server pull stream from origin (or upstream SRS | @@ -860,41 +861,6 @@ Schema#2: SRS RTMP Edge server pull stream from origin (or upstream SRS | ||
860 | RTMP Edge server), then delivery to Client. | 861 | RTMP Edge server), then delivery to Client. |
861 | </pre> | 862 | </pre> |
862 | 863 | ||
863 | -### (plan) SRS Multiple processes Architecture(design by wenjie) | ||
864 | - | ||
865 | -<pre> | ||
866 | - +---------------+ +--------+ | ||
867 | - | upnode server | + client + | ||
868 | - +-------+-------+ +---+----+ | ||
869 | - -------------+------------network-------+--------- | ||
870 | - | | | ||
871 | - +--------+ +----+-----------+ +----+----------+ | ||
872 | - | master +--fork->-+ back source(1) +-->-pull-+ stream 1-N(2) + | ||
873 | - +---+----+ +----------------+ +-------+-------+ | ||
874 | - | | | ||
875 | - +-------------------------------------fork--->-----+ | ||
876 | - | +-------------+ | ||
877 | - +-------------------fork-->-+ http/vod(3) | | ||
878 | - +-------------+ | ||
879 | -Remark: | ||
880 | -(1) back source process: create by master process, get stream from | ||
881 | - upnode server if edge, create stream if origin, serve the stream | ||
882 | - process. | ||
883 | -(2) stream process: create by master process, get stream from back | ||
884 | - source process, serve the client. | ||
885 | -(3) the embeded mininum http server, also provides vod service. for | ||
886 | - http server, it provides http api, hls(live/vod) delivery. for | ||
887 | - vod server, it slice the file to hls(m3u8/ts). | ||
888 | -Remark: | ||
889 | -(a) This multiple processes architecture is design by wenjie, it's a | ||
890 | - very simple and powerful multiple process architecture, for the | ||
891 | - master no need to pass between stream process. | ||
892 | -(b) The CLI architecture is similar to this, instead, cli process | ||
893 | - will collect informations from all stream process, master process | ||
894 | - only send signals to child processes. | ||
895 | -(c) Maybe multiple thread is ok? By winlin. | ||
896 | -</pre> | ||
897 | - | ||
898 | ### Bandwidth Test Workflow | 864 | ### Bandwidth Test Workflow |
899 | 865 | ||
900 | <pre> | 866 | <pre> |
-
请 注册 或 登录 后发表评论