胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
dfa32f9b 1 parent 555d8b9f

pre-release mainline2-0.9.79

内嵌 并排对比
正在显示 1 个修改的文件 包含 12 行增加 和 20 行删除
@@ -167,8 +167,8 @@ Supported operating systems and hardware: @@ -167,8 +167,8 @@ Supported operating systems and hardware:
167 1. Support dvr(record live to flv file for vod) 167 1. Support dvr(record live to flv file for vod)
168 1. Support live flashP2P(integrated by chnvideo VDN). 168 1. Support live flashP2P(integrated by chnvideo VDN).
169 1. Support RTMP [edge](https://github.com/winlinvip/simple-rtmp-server/wiki/Edge) server, push/pull stream from any RTMP server 169 1. Support RTMP [edge](https://github.com/winlinvip/simple-rtmp-server/wiki/Edge) server, push/pull stream from any RTMP server
  170 +1. [dev] Support system full utest on gtest.
170 1. [plan] Support file to hls vod stream. 171 1. [plan] Support file to hls vod stream.
171 -1. [plan] Support system full utest on gtest.  
172 1. [plan] Support multiple processes, for both origin and edge 172 1. [plan] Support multiple processes, for both origin and edge
173 1. [no-plan] Support adobe RTMFP(flash p2p) protocol. 173 1. [no-plan] Support adobe RTMFP(flash p2p) protocol.
174 1. [no-plan] Support adobe flash refer/token/swf verification. 174 1. [no-plan] Support adobe flash refer/token/swf verification.
@@ -179,8 +179,8 @@ Supported operating systems and hardware: @@ -179,8 +179,8 @@ Supported operating systems and hardware:
179 1. [no-plan] Support RTP/RTSP server. 179 1. [no-plan] Support RTP/RTSP server.
180 180
181 ## Releases 181 ## Releases
182 -* 2014-04-07, [Release v1.0-mainline](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline), support [arm](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm),  
183 -[init.d](https://github.com/winlinvip/simple-rtmp-server/wiki/LinuxService), http [server](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPServer)/[api](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPApi), [ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleIngest). 30000 lines.<br/> 182 +* 2014-04-28, [Release v1.0-mainline2](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline2), support [dvr](https://github.com/winlinvip/simple-rtmp-server/wiki/DVR), android, [edge](https://github.com/winlinvip/simple-rtmp-server/wiki/Edge). 35255 lines.<br/>
  183 +* 2014-04-07, [Release v1.0-mainline](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline), support [arm](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm), [init.d](https://github.com/winlinvip/simple-rtmp-server/wiki/LinuxService), http [server](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPServer)/[api](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPApi), [ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleIngest). 30000 lines.<br/>
184 * 2013-12-25, [Release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, player/encoder/chat [demos](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo). 20926 lines.<br/> 184 * 2013-12-25, [Release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, player/encoder/chat [demos](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo). 20926 lines.<br/>
185 * 2013-12-08, [Release v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8), support [http hooks callback](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback), update [st_load](https://github.com/winlinvip/st-load). 19186 lines.<br/> 185 * 2013-12-08, [Release v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8), support [http hooks callback](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback), update [st_load](https://github.com/winlinvip/st-load). 19186 lines.<br/>
186 * 2013-12-03, [Release v0.7](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.7), support [live stream transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG). 17605 lines.<br/> 186 * 2013-12-03, [Release v0.7](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.7), support [live stream transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG). 17605 lines.<br/>
@@ -193,6 +193,8 @@ Supported operating systems and hardware: @@ -193,6 +193,8 @@ Supported operating systems and hardware:
193 * 2013-10-17, Created.<br/> 193 * 2013-10-17, Created.<br/>
194 194
195 ## History 195 ## History
  196 +* v1.0, 2014-04-28, [1.0 mainline2(0.9.79)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline2) released. 35255 lines.
  197 +* v1.0, 2014-04-28, support full edge RTMP server. 0.9.79
196 * v1.0, 2014-04-27, support basic edge(play/publish) RTMP server. 0.9.78 198 * v1.0, 2014-04-27, support basic edge(play/publish) RTMP server. 0.9.78
197 * v1.0, 2014-04-25, add donation page. 0.9.76 199 * v1.0, 2014-04-25, add donation page. 0.9.76
198 * v1.0, 2014-04-24, support live flashP2P(integrated by chnvideo VDN). 0.9.75 200 * v1.0, 2014-04-24, support live flashP2P(integrated by chnvideo VDN). 0.9.75
@@ -220,26 +222,16 @@ Supported operating systems and hardware: @@ -220,26 +222,16 @@ Supported operating systems and hardware:
220 * v1.0, 2014-03-12, finish utest for amf0 codec. 222 * v1.0, 2014-03-12, finish utest for amf0 codec.
221 * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile. 223 * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile.
222 * v1.0, 2014-03-04, add gest framework for utest, build success. 224 * v1.0, 2014-03-04, add gest framework for utest, build success.
223 -* v1.0, 2014-03-02, add wiki [srs-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLibrtmp),  
224 -[SRS for arm](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm),  
225 -[product](https://github.com/winlinvip/simple-rtmp-server/wiki/Product) 225 +* v1.0, 2014-03-02, add wiki [srs-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLibrtmp), [SRS for arm](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm), [product](https://github.com/winlinvip/simple-rtmp-server/wiki/Product)
226 * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp. 226 * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp.
227 * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module. 227 * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module.
228 * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package. 228 * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package.
229 -* v1.0, 2014-02-28, add wiki [BuildArm](https://github.com/winlinvip/simple-rtmp-server/wiki/Build),  
230 -[FFMPEG](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG),  
231 -[Reload](https://github.com/winlinvip/simple-rtmp-server/wiki/Reload)  
232 -* v1.0, 2014-02-27, add wiki [LowLatency](https://github.com/winlinvip/simple-rtmp-server/wiki/LowLatency),  
233 -[HTTPCallback](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback),  
234 -[ServerSideScript](https://github.com/winlinvip/simple-rtmp-server/wiki/ServerSideScript),  
235 -[IDE](https://github.com/winlinvip/simple-rtmp-server/wiki/IDE) 229 +* v1.0, 2014-02-28, add wiki [BuildArm](https://github.com/winlinvip/simple-rtmp-server/wiki/Build), [FFMPEG](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [Reload](https://github.com/winlinvip/simple-rtmp-server/wiki/Reload)
  230 +* v1.0, 2014-02-27, add wiki [LowLatency](https://github.com/winlinvip/simple-rtmp-server/wiki/LowLatency), [HTTPCallback](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback), [ServerSideScript](https://github.com/winlinvip/simple-rtmp-server/wiki/ServerSideScript), [IDE](https://github.com/winlinvip/simple-rtmp-server/wiki/IDE)
236 * v1.0, 2014-01-19, add wiki [DeliveryHLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS) 231 * v1.0, 2014-01-19, add wiki [DeliveryHLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS)
237 -* v1.0, 2014-01-12, add wiki [HowToAskQuestion](https://github.com/winlinvip/simple-rtmp-server/wiki/HowToAskQuestion),  
238 -[RtmpUrlVhost](https://github.com/winlinvip/simple-rtmp-server/wiki/RtmpUrlVhost) 232 +* v1.0, 2014-01-12, add wiki [HowToAskQuestion](https://github.com/winlinvip/simple-rtmp-server/wiki/HowToAskQuestion), [RtmpUrlVhost](https://github.com/winlinvip/simple-rtmp-server/wiki/RtmpUrlVhost)
239 * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually. 233 * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually.
240 -* v1.0, 2014-01-05, add wiki [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build),  
241 -[Performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance),  
242 -[Cluster](https://github.com/winlinvip/simple-rtmp-server/wiki/Cluster) 234 +* v1.0, 2014-01-05, add wiki [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build), [Performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance), [Cluster](https://github.com/winlinvip/simple-rtmp-server/wiki/Cluster)
243 * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance. 235 * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance.
244 * v1.0, 2013-12-27, merge from wenjie, the bandwidth test feature. 236 * v1.0, 2013-12-27, merge from wenjie, the bandwidth test feature.
245 * v0.9, 2013-12-25, [v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9) released. 20926 lines. 237 * v0.9, 2013-12-25, [v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9) released. 20926 lines.
@@ -257,8 +249,7 @@ Supported operating systems and hardware: @@ -257,8 +249,7 @@ Supported operating systems and hardware:
257 * v0.9, 2013-12-14, refine the thread model for the retry threads. 249 * v0.9, 2013-12-14, refine the thread model for the retry threads.
258 * v0.9, 2013-12-10, auto install depends tools/libs on centos/ubuntu. 250 * v0.9, 2013-12-10, auto install depends tools/libs on centos/ubuntu.
259 * v0.8, 2013-12-08, [v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8) released. 19186 lines. 251 * v0.8, 2013-12-08, [v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8) released. 19186 lines.
260 -* v0.8, 2013-12-08, support [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback):  
261 -on_connect/close/publish/unpublish/play/stop. 252 +* v0.8, 2013-12-08, support [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback): on_connect/close/publish/unpublish/play/stop.
262 * v0.8, 2013-12-08, support multiple http hooks for a event. 253 * v0.8, 2013-12-08, support multiple http hooks for a event.
263 * v0.8, 2013-12-07, support http callback hooks, on_connect. 254 * v0.8, 2013-12-07, support http callback hooks, on_connect.
264 * v0.8, 2013-12-07, support network based cli and json result, add CherryPy 3.2.4. 255 * v0.8, 2013-12-07, support network based cli and json result, add CherryPy 3.2.4.
@@ -340,6 +331,7 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw @@ -340,6 +331,7 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw
340 * See also: [Performance for RaspberryPi](https://github.com/winlinvip/simple-rtmp-server/wiki/RaspberryPi) 331 * See also: [Performance for RaspberryPi](https://github.com/winlinvip/simple-rtmp-server/wiki/RaspberryPi)
341 332
342 ## Compare 333 ## Compare
  334 +* SRS v1.0-mainline2: 35255 lines. support android, dvr and edge.<br/>
343 * SRS v1.0-mainline: 30000 lines. support arm, init.d scripts, http server and api, ingest.<br/> 335 * SRS v1.0-mainline: 30000 lines. support arm, init.d scripts, http server and api, ingest.<br/>
344 * SRS v0.9: 20926 lines. player/encoder/chat demos. bandwidth test for encoder/CDN.<br/> 336 * SRS v0.9: 20926 lines. player/encoder/chat demos. bandwidth test for encoder/CDN.<br/>
345 * SRS v0.8: 19186 lines. implements http hooks refer to [nginx-rtmp](https://github.com/arut/nginx-rtmp-module). <br/> 337 * SRS v0.8: 19186 lines. implements http hooks refer to [nginx-rtmp](https://github.com/arut/nginx-rtmp-module). <br/>