refine the multiple processes architecture, remove the isolate bandwidth test process
正在显示
2 个修改的文件
包含
12 行增加
和
15 行删除
| @@ -254,21 +254,18 @@ Schema#2: SRS RTMP Edge server pull stream from origin (or upstream SRS | @@ -254,21 +254,18 @@ Schema#2: SRS RTMP Edge server pull stream from origin (or upstream SRS | ||
| 254 | +---------+---------+ +-----+-----+ | 254 | +---------+---------+ +-----+-----+ |
| 255 | --------------+------------network-------+--------- | 255 | --------------+------------network-------+--------- |
| 256 | | | | 256 | | | |
| 257 | - +-----------+ +----+-----------+ +----+------+ | ||
| 258 | - | master +--fork->-+ back source(1) +-->-pull-+ stream(2) + | ||
| 259 | - +-----+-----+ +----------------+ +-------+---+ | 257 | + +-----------+ +----+-----------+ +----+-----------+ |
| 258 | + | master +--fork->-+ back source(1) +-->-pull-+ stream 1-N(2) + | ||
| 259 | + +-----+-----+ +----------------+ +-------+--------+ | ||
| 260 | + | | | ||
| 260 | +-------------------------------------fork--->-----+ | 261 | +-------------------------------------fork--->-----+ |
| 261 | - | +-------------------+ | ||
| 262 | - +--fork->--+ bandwidth test(3) + | ||
| 263 | - +-------------------+ | ||
| 264 | 262 | ||
| 265 | Remark: | 263 | Remark: |
| 266 | (1) back source process: create by master process, get stream from | 264 | (1) back source process: create by master process, get stream from |
| 267 | - upnode server, serve the stream process. | 265 | + upnode server if edge, create stream if origin, serve the stream |
| 266 | + process. | ||
| 268 | (2) stream process: create by master process, get stream from back | 267 | (2) stream process: create by master process, get stream from back |
| 269 | source process, serve the client. | 268 | source process, serve the client. |
| 270 | -(3) bandwidth test process: create by master process, serve the | ||
| 271 | - bandwidth test client. | ||
| 272 | Remark: | 269 | Remark: |
| 273 | (a) This multiple processes architecture is design by wenjie, it's a | 270 | (a) This multiple processes architecture is design by wenjie, it's a |
| 274 | very simple and powerful multiple process architecture, for the | 271 | very simple and powerful multiple process architecture, for the |
| @@ -79,18 +79,18 @@ BLACK="\\${BLACK}" | @@ -79,18 +79,18 @@ BLACK="\\${BLACK}" | ||
| 79 | 79 | ||
| 80 | default: bandwidth librtmp-sample utest | 80 | default: bandwidth librtmp-sample utest |
| 81 | @echo -e "\$(GREEN)build summary:\$(BLACK)" | 81 | @echo -e "\$(GREEN)build summary:\$(BLACK)" |
| 82 | - @echo -e " \$(GREEN)server: ./objs/srs, the srs server\$(BLACK)" | 82 | + @echo -e " \$(GREEN)server: ./objs/srs, the srs server\$(BLACK)" |
| 83 | @echo -e " ${SrsHlsSummaryColor}hls: delivery HLS stream, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS\$(BLACK)" | 83 | @echo -e " ${SrsHlsSummaryColor}hls: delivery HLS stream, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS\$(BLACK)" |
| 84 | @echo -e " ${SrsSslSummaryColor}ssl: support RTMP complex handshake, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/RTMPHandshake\$(BLACK)" | 84 | @echo -e " ${SrsSslSummaryColor}ssl: support RTMP complex handshake, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/RTMPHandshake\$(BLACK)" |
| 85 | @echo -e " ${SrsFfmpegSummaryColor}ffmpeg: support transcoding with FFMPEG, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG\$(BLACK)" | 85 | @echo -e " ${SrsFfmpegSummaryColor}ffmpeg: support transcoding with FFMPEG, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG\$(BLACK)" |
| 86 | @echo -e " ${SrsHttpSummaryColor}http: support http callback, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback\$(BLACK)" | 86 | @echo -e " ${SrsHttpSummaryColor}http: support http callback, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback\$(BLACK)" |
| 87 | - @echo -e " \$(GREEN)bandwidth: ./objs/bandwidth, the bandwidth test client\$(BLACK)" | ||
| 88 | - @echo -e " \$(GREEN)librtmp: ./objs/include, ./objs/lib, the srs-librtmp library, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLibrtmp\$(BLACK)" | 87 | + @echo -e " \$(GREEN)bandwidth: ./objs/bandwidth, the bandwidth test client\$(BLACK)" |
| 88 | + @echo -e " \$(GREEN)librtmp: ./objs/include, ./objs/lib, the srs-librtmp library, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLibrtmp\$(BLACK)" | ||
| 89 | @echo -e " \$(GREEN)simple handshake: publish/play stream with simple handshake to server\$(BLACK)" | 89 | @echo -e " \$(GREEN)simple handshake: publish/play stream with simple handshake to server\$(BLACK)" |
| 90 | @echo -e " ${SrsSslSummaryColor}complex handshake: it's not required to publish/play stream for client, recommend disable it for srs-librtmp\$(BLACK)" | 90 | @echo -e " ${SrsSslSummaryColor}complex handshake: it's not required to publish/play stream for client, recommend disable it for srs-librtmp\$(BLACK)" |
| 91 | - @echo -e " \$(GREEN)librtmp-sample: ./research/librtmp, the srs-librtmp client sample\$(BLACK)" | ||
| 92 | - @echo -e " ${SrsResearchSummaryColor}research: ./objs/research, api server, players, ts info.\$(BLACK)" | ||
| 93 | - @echo -e " ${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\$(BLACK)" | 91 | + @echo -e " \$(GREEN)librtmp-sample: ./research/librtmp, the srs-librtmp client sample\$(BLACK)" |
| 92 | + @echo -e " ${SrsResearchSummaryColor}research: ./objs/research, api server, players, ts info.\$(BLACK)" | ||
| 93 | + @echo -e " ${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\$(BLACK)" | ||
| 94 | @echo -e "\$(GREEN)binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/Build\$(BLACK)" | 94 | @echo -e "\$(GREEN)binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/Build\$(BLACK)" |
| 95 | 95 | ||
| 96 | help: | 96 | help: |
-
请 注册 或 登录 后发表评论