胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
7f0803a5 1 parent 932e22bf

update readme, remove all br.

内嵌 并排对比
正在显示 1 个修改的文件 包含 29 行增加 和 34 行删除
@@ -46,18 +46,12 @@ rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/Deliver @@ -46,18 +46,12 @@ rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/Deliver
46 [HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS), [HLS audio only](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS#hlsaudioonly), [transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), 46 [HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS), [HLS audio only](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS#hlsaudioonly), [transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG),
47 [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback). 47 [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback).
48 48
49 -Release: [http://winlinvip.github.io/simple-rtmp-server](http://winlinvip.github.io/simple-rtmp-server)  
50 -  
51 -Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)  
52 -  
53 -CSDN mirror: [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn)  
54 -  
55 -See also: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server)  
56 -  
57 -Github DEMO: [demo with your SRS](http://winlinvip.github.io/simple-rtmp-server/trunk/research/players/srs_player.html?server=192.168.1.170&vhost=192.168.1.170)  
58 -  
59 -Wiki: [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki)  
60 - 49 +Release: [http://winlinvip.github.io/simple-rtmp-server](http://winlinvip.github.io/simple-rtmp-server) <br/>
  50 +Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) <br/>
  51 +CSDN mirror: [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn) <br/>
  52 +See also: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server) <br/>
  53 +Github DEMO: [demo with your SRS](http://winlinvip.github.io/simple-rtmp-server/trunk/research/players/srs_player.html?server=192.168.1.170&vhost=192.168.1.170) <br/>
  54 +Wiki: [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki) <br/>
61 TencentQQ: [http://url.cn/WAHICw](http://url.cn/WAHICw) (Group: 212189142) 55 TencentQQ: [http://url.cn/WAHICw](http://url.cn/WAHICw) (Group: 212189142)
62 56
63 ## AUTHORS 57 ## AUTHORS
@@ -77,11 +71,11 @@ A big THANK YOU goes to: @@ -77,11 +71,11 @@ A big THANK YOU goes to:
77 * [chnvideo](chnvideo.com) co-founders([wiseyoung](mailto:wiseyoung@chnvideo.com), [trueice](mailto:trueice@chnvideo.com), [leijian](mailto:leijian@chnvideo.com)) for [big supports](https://github.com/winlinvip/simple-rtmp-server/wiki/Product#bigthanks). 71 * [chnvideo](chnvideo.com) co-founders([wiseyoung](mailto:wiseyoung@chnvideo.com), [trueice](mailto:trueice@chnvideo.com), [leijian](mailto:leijian@chnvideo.com)) for [big supports](https://github.com/winlinvip/simple-rtmp-server/wiki/Product#bigthanks).
78 * Genes amd Mabbott for creating [st](https://github.com/winlinvip/state-threads)([state-threads](http://sourceforge.net/projects/state-threads/)). 72 * Genes amd Mabbott for creating [st](https://github.com/winlinvip/state-threads)([state-threads](http://sourceforge.net/projects/state-threads/)).
79 * Michael Talyanksy for introducing us to use st. 73 * Michael Talyanksy for introducing us to use st.
80 -* Roman Arutyunyan for creating [nginx-rtmp](https://github.com/arut/nginx-rtmp-module) for srs to refer to.  
81 -* Joyent for creating [http-parser](https://github.com/joyent/http-parser) for http-api for srs.  
82 -* Igor Sysoev for creating [nginx](http://nginx.org/) for srs to refer to.  
83 -* [FFMPEG](http://ffmpeg.org/) and [libx264](http://www.videolan.org/) group for srs to use to transcode.  
84 -* Guido van Rossum for creating Python for api-server for srs. 74 +* Roman Arutyunyan for creating [nginx-rtmp](https://github.com/arut/nginx-rtmp-module) for SRS to refer to.
  75 +* Joyent for creating [http-parser](https://github.com/joyent/http-parser) for http-api for SRS.
  76 +* Igor Sysoev for creating [nginx](http://nginx.org/) for SRS to refer to.
  77 +* [FFMPEG](http://ffmpeg.org/) and [libx264](http://www.videolan.org/) group for SRS to use to transcode.
  78 +* Guido van Rossum for creating Python for api-server for SRS.
85 79
86 ## Usage 80 ## Usage
87 81
@@ -112,7 +106,7 @@ cd simple-rtmp-server/trunk @@ -112,7 +106,7 @@ cd simple-rtmp-server/trunk
112 * [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleFFMPEG) 106 * [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleFFMPEG)
113 * [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward) 107 * [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward)
114 * [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime) 108 * [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime)
115 -* [Usage: How to deploy srs on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleARM) 109 +* [Usage: How to deploy SRS on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleARM)
116 * [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo) 110 * [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo)
117 * [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample) 111 * [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample)
118 * [Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Product) 112 * [Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Product)
@@ -169,11 +163,11 @@ Supported operating systems and hardware: @@ -169,11 +163,11 @@ Supported operating systems and hardware:
169 163
170 ## Performance 164 ## Performance
171 1. 300 connections, 150Mbps, 500kbps, CPU 18.8%, MEM 5956KB. 165 1. 300 connections, 150Mbps, 500kbps, CPU 18.8%, MEM 5956KB.
172 -2. 600 connections, 300Mbps, 500kbps, CPU 32.1%, MEM 9808KB.  
173 -3. 900 connections, 450Mbps, 500kbps, CPU 49.9%, MEM 11MB.  
174 -4. 1200 connections, 600Mbps, 500kbps, CPU 72.4%, MEM 15MB.  
175 -5. 1500 connections, 750Mbps, 500kbps, CPU 81.9%, MEM 28MB.  
176 -6. 1800 connections, 900Mbps, 500kbps, CPU 90.2%, MEM 41MB. 166 +1. 600 connections, 300Mbps, 500kbps, CPU 32.1%, MEM 9808KB.
  167 +1. 900 connections, 450Mbps, 500kbps, CPU 49.9%, MEM 11MB.
  168 +1. 1200 connections, 600Mbps, 500kbps, CPU 72.4%, MEM 15MB.
  169 +1. 1500 connections, 750Mbps, 500kbps, CPU 81.9%, MEM 28MB.
  170 +1. 1800 connections, 900Mbps, 500kbps, CPU 90.2%, MEM 41MB.
177 171
178 <pre> 172 <pre>
179 [winlin@dev6 srs]$ dstat 173 [winlin@dev6 srs]$ dstat
@@ -189,8 +183,9 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw @@ -189,8 +183,9 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw
189 41 6 52 0 0 1| 0 1264k| 116M 116M| 0 0 | 25k 28k 183 41 6 52 0 0 1| 0 1264k| 116M 116M| 0 0 | 25k 28k
190 48 6 45 0 0 1| 0 1272k| 143M 143M| 0 0 | 27k 27k 184 48 6 45 0 0 1| 0 1272k| 143M 143M| 0 0 | 27k 27k
191 </pre> 185 </pre>
192 -See also: [Performance for x86/x64 Test Guide](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance)<br/>  
193 -See also: [Performance for RaspberryPi](https://github.com/winlinvip/simple-rtmp-server/wiki/RaspberryPi) 186 +
  187 +* See also: [Performance for x86/x64 Test Guide](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance)
  188 +* See also: [Performance for RaspberryPi](https://github.com/winlinvip/simple-rtmp-server/wiki/RaspberryPi)
194 189
195 ## Releases 190 ## Releases
196 * 2013-12-25, [Release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, player/encoder/chat demos. 20926 lines.<br/> 191 * 2013-12-25, [Release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, player/encoder/chat demos. 20926 lines.<br/>
@@ -233,7 +228,7 @@ See also: [Performance for RaspberryPi](https://github.com/winlinvip/simple-rtmp @@ -233,7 +228,7 @@ See also: [Performance for RaspberryPi](https://github.com/winlinvip/simple-rtmp
233 * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile. 228 * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile.
234 * v1.0, 2014-03-04, add gest framework for utest, build success. 229 * v1.0, 2014-03-04, add gest framework for utest, build success.
235 * v1.0, 2014-03-02, add wiki [srs-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLibrtmp), 230 * v1.0, 2014-03-02, add wiki [srs-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLibrtmp),
236 -[srs for arm](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm), 231 +[SRS for arm](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm),
237 [product](https://github.com/winlinvip/simple-rtmp-server/wiki/Product) 232 [product](https://github.com/winlinvip/simple-rtmp-server/wiki/Product)
238 * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp. 233 * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp.
239 * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module. 234 * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module.
@@ -327,14 +322,14 @@ on_connect/close/publish/unpublish/play/stop. @@ -327,14 +322,14 @@ on_connect/close/publish/unpublish/play/stop.
327 322
328 ## Architecture 323 ## Architecture
329 324
330 -srs always use the most simple architecture to support complex transaction. 325 +SRS always use the most simple architecture to support complex transaction.
331 * System arch: the system structure and arch. 326 * System arch: the system structure and arch.
332 -* Modularity arch: the main modularity of srs.  
333 -* Stream arch: the stream dispatch arch of srs. 327 +* Modularity arch: the main modularity of SRS.
  328 +* Stream arch: the stream dispatch arch of SRS.
334 * RTMP cluster arch: the RTMP origin and edge cluster arch. 329 * RTMP cluster arch: the RTMP origin and edge cluster arch.
335 -* Multiple processes arch (by wenjie): the multiple process of srs.  
336 -* CLI arch: the cli arch for srs, api to manage srs.  
337 -* Bandwidth specification: the bandwidth test specification of srs. 330 +* Multiple processes arch (by wenjie): the multiple process of SRS.
  331 +* CLI arch: the cli arch for SRS, api to manage SRS.
  332 +* Bandwidth specification: the bandwidth test specification of SRS.
338 333
339 ### System Architecture 334 ### System Architecture
340 335
@@ -393,8 +388,8 @@ srs always use the most simple architecture to support complex transaction. @@ -393,8 +388,8 @@ srs always use the most simple architecture to support complex transaction.
393 Remark: 388 Remark:
394 (1) Encoder: encoder must push RTMP stream to SRS server. 389 (1) Encoder: encoder must push RTMP stream to SRS server.
395 (2) MediaSource: any media source, which can be ingest by ffmpeg. 390 (2) MediaSource: any media source, which can be ingest by ffmpeg.
396 -(3) Ingester: srs will fork a process to run ffmpeg(or your application)  
397 -to ingest any input to rtmp, push to srs. 391 +(3) Ingester: SRS will fork a process to run ffmpeg(or your application)
  392 +to ingest any input to rtmp, push to SRS.
398 </pre> 393 </pre>
399 394
400 ### [HDS/HLS origin backup](https://github.com/winlinvip/simple-rtmp-server/wiki/RTMP-ATC) 395 ### [HDS/HLS origin backup](https://github.com/winlinvip/simple-rtmp-server/wiki/RTMP-ATC)