winlin

refine the content

正在显示 1 个修改的文件 包含 27 行增加13 行删除
@@ -13,20 +13,20 @@ For the wiki for SRS/3.0, please read [Chinese][srs_CN] or [English][srs_EN]. @@ -13,20 +13,20 @@ For the wiki for SRS/3.0, please read [Chinese][srs_CN] or [English][srs_EN].
13 13
14 ## Content 14 ## Content
15 15
16 -* [Content](#content)  
17 * [About](#about) 16 * [About](#about)
18 * [Usage](#usage) 17 * [Usage](#usage)
19 * [Wiki](#wiki) 18 * [Wiki](#wiki)
20 * [Product](#product) 19 * [Product](#product)
  20 + * [History](#history)
21 * [Features](#features) 21 * [Features](#features)
22 - * [Compare](#compare)  
23 * [Releases](#releases) 22 * [Releases](#releases)
24 - * [History](#history) 23 + * [Compare](#compare)
25 * [Performance](#performance) 24 * [Performance](#performance)
26 * [Architecture](#architecture) 25 * [Architecture](#architecture)
27 * [System Architecture](#system-architecture) 26 * [System Architecture](#system-architecture)
28 * [Modularity Architecture](#modularity-architecture) 27 * [Modularity Architecture](#modularity-architecture)
29 * [Stream Architecture](#stream-architecture) 28 * [Stream Architecture](#stream-architecture)
  29 +* [Tips](#tips)
30 * [Authors](#authors) 30 * [Authors](#authors)
31 * [Mirrors](#mirrors) 31 * [Mirrors](#mirrors)
32 * [System Requirements](#system-requirements) 32 * [System Requirements](#system-requirements)
@@ -42,22 +42,24 @@ The stream on origin can be transcoded, DVR to VOD file, ingest from external so @@ -42,22 +42,24 @@ The stream on origin can be transcoded, DVR to VOD file, ingest from external so
42 HTTP API and callback is powerful mechenism for integraty. 42 HTTP API and callback is powerful mechenism for integraty.
43 The wikis are writen by both English and Chinese. 43 The wikis are writen by both English and Chinese.
44 44
45 -1. <strong>Completely rewriten HLS:</strong> following m3u8/ts spec, and HLS support h.264+aac/mp3.  
46 -1. <strong>High efficient RTMP:</strong> deliverying support 7k+ concurrency, vhost based, both origin and edge.  
47 -1. <strong>Embeded HTTP server:</strong> for HLS, api and HTTP flv/ts/mp3/aac streaming. 45 +Why SRS?
  46 +
  47 +1. <strong>Completely rewriten HLS:</strong> Following m3u8/ts spec, and HLS support h.264+aac/mp3.
  48 +1. <strong>High efficient RTMP:</strong> Deliverying support 7k+ concurrency, vhost based, both origin and edge.
  49 +1. <strong>Embeded HTTP server:</strong> For HLS, api and HTTP flv/ts/mp3/aac streaming.
48 1. <strong>Variety inputs:</strong> RTMP, pull by ingest file or stream(HTTP/RTMP/RTSP), push by stream caster 50 1. <strong>Variety inputs:</strong> RTMP, pull by ingest file or stream(HTTP/RTMP/RTSP), push by stream caster
49 RTSP/MPEGTS-over-UDP. 51 RTSP/MPEGTS-over-UDP.
50 1. <strong>Popular internet delivery:</strong> RTMP/HDS for flash, HLS for mobile(IOS/IPad/MAC/Android), HTTP 52 1. <strong>Popular internet delivery:</strong> RTMP/HDS for flash, HLS for mobile(IOS/IPad/MAC/Android), HTTP
51 flv/ts/mp3/aac streaming for user prefered. 53 flv/ts/mp3/aac streaming for user prefered.
52 -1. <strong>Enhanced DVR:</strong> segment/session/append plan, customer path and HTTP callback.  
53 -1. <strong>Multiple features:</strong> transcode, forward, ingest, http hooks, dvr, hls, rtsp, http streaming, 54 +1. <strong>Enhanced DVR:</strong> Segment/session/append plan, customer path and HTTP callback.
  55 +1. <strong>Multiple features:</strong> Transcode, forward, ingest, http hooks, dvr, hls, rtsp, http streaming,
54 http raw api, refer, log, bandwith test and srs-librtmp. 56 http raw api, refer, log, bandwith test and srs-librtmp.
55 -1. <strong>Best maintainess:</strong> simple arch over state-threads(coroutine), single thread, single process 57 +1. <strong>Best maintainess:</strong> Simple arch over state-threads(coroutine), single thread, single process
56 and for linux/osx platform, common server x86-64/i386/arm/mips cpus, rich comments, strictly 58 and for linux/osx platform, common server x86-64/i386/arm/mips cpus, rich comments, strictly
57 follows RTMP/HLS/RTSP spec. 59 follows RTMP/HLS/RTSP spec.
58 -1. <strong>Easy to use:</strong> both English and Chinese wiki, typically config files in trunk/conf, traceable 60 +1. <strong>Easy to use:</strong> Both English and Chinese wiki, typically config files in trunk/conf, traceable
59 and session based log, linux service script and install script. 61 and session based log, linux service script and install script.
60 -1. <strong>MIT license:</strong> open source with product management and evolution. 62 +1. <strong>MIT license:</strong> Open source with product management and evolution.
61 63
62 Enjoy it! 64 Enjoy it!
63 65
@@ -72,7 +74,7 @@ cd srs/trunk @@ -72,7 +74,7 @@ cd srs/trunk
72 ``` 74 ```
73 75
74 <strong>Step 2:</strong> Build SRS. 76 <strong>Step 2:</strong> Build SRS.
75 -<strong>Requires Centos6.x/Ubuntu12 32/64bits, others see Build([CN][v2_CN_Build],[EN][v2_EN_Build]).</strong> 77 +<strong>Requires Centos6 32/64bits, others see Build([CN][v2_CN_Build],[EN][v2_EN_Build]).</strong>
76 78
77 ``` 79 ```
78 ./configure && make 80 ./configure && make
@@ -124,10 +126,12 @@ Please select your language: @@ -124,10 +126,12 @@ Please select your language:
124 126
125 ## Product 127 ## Product
126 128
127 -The `features`, `compare`, `release` and `performance` of SRS. 129 +The changes `history`, `features`, `compare`, `release` and `performance` of SRS.
128 130
129 ### History 131 ### History
130 132
  133 +#### 3.0
  134 +
131 * v3.0, 2016-12-15, fix #717, #691, http api/static/stream support cors. 3.0.9 135 * v3.0, 2016-12-15, fix #717, #691, http api/static/stream support cors. 3.0.9
132 * v3.0, 2016-12-08, support log rotate signal SIGUSR1. 3.0.8 136 * v3.0, 2016-12-08, support log rotate signal SIGUSR1. 3.0.8
133 * v3.0, 2016-12-07, fix typo and refine grammar. 3.0.7 137 * v3.0, 2016-12-07, fix typo and refine grammar. 3.0.7
@@ -141,6 +145,9 @@ The `features`, `compare`, `release` and `performance` of SRS. @@ -141,6 +145,9 @@ The `features`, `compare`, `release` and `performance` of SRS.
141 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost. 145 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost.
142 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2 146 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2
143 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1 147 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1
  148 +
  149 +#### 2.0
  150 +
144 * <strong>v2.0, 2016-12-13, [2.0 beta3(2.0.223)][r2.0b3] released. 86685 lines.</strong> 151 * <strong>v2.0, 2016-12-13, [2.0 beta3(2.0.223)][r2.0b3] released. 86685 lines.</strong>
145 * <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong> 152 * <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong>
146 * <strong>v2.0, 2016-09-09, [2.0 beta1(2.0.215)][r2.0b1] released. 89941 lines.</strong> 153 * <strong>v2.0, 2016-09-09, [2.0 beta1(2.0.215)][r2.0b1] released. 89941 lines.</strong>
@@ -280,6 +287,9 @@ The `features`, `compare`, `release` and `performance` of SRS. @@ -280,6 +287,9 @@ The `features`, `compare`, `release` and `performance` of SRS.
280 * v2.0, 2014-10-19, fix [#184][bug #184], support AnnexB in RTMP body for HLS. 2.0.2 287 * v2.0, 2014-10-19, fix [#184][bug #184], support AnnexB in RTMP body for HLS. 2.0.2
281 * v2.0, 2014-10-18, remove supports for OSX(darwin). 2.0.1. 288 * v2.0, 2014-10-18, remove supports for OSX(darwin). 2.0.1.
282 * v2.0, 2014-10-16, revert github srs README to English. 2.0.0. 289 * v2.0, 2014-10-16, revert github srs README to English. 2.0.0.
  290 +
  291 +#### 1.0
  292 +
283 * <strong>v1.0, 2014-12-05, [1.0 release(1.0.10)][r1.0r0] released. 59391 lines.</strong> 293 * <strong>v1.0, 2014-12-05, [1.0 release(1.0.10)][r1.0r0] released. 59391 lines.</strong>
284 * <strong>v1.0, 2014-10-09, [1.0 beta(1.0.0)][r1.0b0] released. 59316 lines.</strong> 294 * <strong>v1.0, 2014-10-09, [1.0 beta(1.0.0)][r1.0b0] released. 59316 lines.</strong>
285 * v1.0, 2014-10-08, fix [#151][bug #151], always reap ts whatever audio or video packet. 0.9.223. 295 * v1.0, 2014-10-08, fix [#151][bug #151], always reap ts whatever audio or video packet. 0.9.223.
@@ -848,6 +858,10 @@ Remark: @@ -848,6 +858,10 @@ Remark:
848 1. Streamer: SRS listen to remux some protocol to rtmp to SRS. Read [Streamer][v2_CN_Streamer]. 858 1. Streamer: SRS listen to remux some protocol to rtmp to SRS. Read [Streamer][v2_CN_Streamer].
849 1. EXEC: SRS exec external application when got event, read [ng-exec][v3_CN_NgExec]. 859 1. EXEC: SRS exec external application when got event, read [ng-exec][v3_CN_NgExec].
850 860
  861 +## Tips
  862 +
  863 +Other tips...
  864 +
851 ### AUTHORS 865 ### AUTHORS
852 866
853 There are two types of people that have contributed to the SRS project: 867 There are two types of people that have contributed to the SRS project: