winlin

refine links

正在显示 1 个修改的文件 包含 85 行增加42 行删除
@@ -195,12 +195,12 @@ Supported operating systems and hardware: @@ -195,12 +195,12 @@ Supported operating systems and hardware:
195 1. Support system full utest on gtest. 195 1. Support system full utest on gtest.
196 1. Support embeded HTTP server([CN][v2_CN_SampleHTTP], [EN][v2_EN_SampleHTTP]) for hls(live/vod) 196 1. Support embeded HTTP server([CN][v2_CN_SampleHTTP], [EN][v2_EN_SampleHTTP]) for hls(live/vod)
197 1. Support vod stream(http flv/hls vod stream)([CN][v2_CN_FlvVodStream], [EN][v2_EN_FlvVodStream]). 197 1. Support vod stream(http flv/hls vod stream)([CN][v2_CN_FlvVodStream], [EN][v2_EN_FlvVodStream]).
198 -1. Stable [1.0release branch](https://github.com/simple-rtmp-server/srs/tree/1.0release). 198 +1. Stable [1.0release branch][branch1].
199 1. Support publish h264 raw stream([CN][v2_CN_SrsLibrtmp2], [EN][v2_EN_SrsLibrtmp2]) by srs-librtmp. 199 1. Support publish h264 raw stream([CN][v2_CN_SrsLibrtmp2], [EN][v2_EN_SrsLibrtmp2]) by srs-librtmp.
200 1. Support [6k+ clients][bug #194], 3Gbps per process. 200 1. Support [6k+ clients][bug #194], 3Gbps per process.
201 1. Suppport [English wiki][v1_EN_Home). 201 1. Suppport [English wiki][v1_EN_Home).
202 1. Research and simplify st, [bug #182][bug #182]. 202 1. Research and simplify st, [bug #182][bug #182].
203 -1. Support compile [srs-librtmp on windows](https://github.com/winlinvip/srs.librtmp), [bug #213][bug #213]. 203 +1. Support compile [srs-librtmp on windows][srs-librtmp], [bug #213][bug #213].
204 1. Support [10k+ clients][bug #251], 4Gbps per process. 204 1. Support [10k+ clients][bug #251], 4Gbps per process.
205 1. Support publish aac adts raw stream([CN][v2_CN_SrsLibrtmp3], [EN][v2_EN_SrsLibrtmp3]) by srs-librtmp. 205 1. Support publish aac adts raw stream([CN][v2_CN_SrsLibrtmp3], [EN][v2_EN_SrsLibrtmp3]) by srs-librtmp.
206 1. Support 0.1s+ latency, read [bug #257][bug #257]. 206 1. Support 0.1s+ latency, read [bug #257][bug #257].
@@ -215,7 +215,7 @@ Supported operating systems and hardware: @@ -215,7 +215,7 @@ Supported operating systems and hardware:
215 1. [experiment] Support push RTSP to SRS, read [bug #133][bug #133]. 215 1. [experiment] Support push RTSP to SRS, read [bug #133][bug #133].
216 1. [experiment] Support push flv stream over HTTP POST to SRS, read [wiki]([CN][v2_CN_Streamer2], [EN][v2_EN_Streamer2]). 216 1. [experiment] Support push flv stream over HTTP POST to SRS, read [wiki]([CN][v2_CN_Streamer2], [EN][v2_EN_Streamer2]).
217 1. [experiment] Support [srs-dolphin][srs-dolphin], the multiple-process SRS. 217 1. [experiment] Support [srs-dolphin][srs-dolphin], the multiple-process SRS.
218 -1. [experiment] Support [remote console](http://ossrs.net:1985/console), read [srs-ngb][srs-ngb]. 218 +1. [experiment] Support [remote console][console], read [srs-ngb][srs-ngb].
219 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech). 219 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech).
220 1. [no-plan] Support RTMP 302 redirect [bug #92][bug #92]. 220 1. [no-plan] Support RTMP 302 redirect [bug #92][bug #92].
221 1. [no-plan] Support multiple processes, for both origin and edge 221 1. [no-plan] Support multiple processes, for both origin and edge
@@ -384,7 +384,7 @@ Remark: @@ -384,7 +384,7 @@ Remark:
384 * v2.0, 2015-03-31, enhanced hls, support deviation for duration. 2.0.151. 384 * v2.0, 2015-03-31, enhanced hls, support deviation for duration. 2.0.151.
385 * v2.0, 2015-03-30, for [#351][bug #351], support config the m3u8/ts path for hls. 2.0.149. 385 * v2.0, 2015-03-30, for [#351][bug #351], support config the m3u8/ts path for hls. 2.0.149.
386 * v2.0, 2015-03-17, for [#155][bug #155], osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 386 * v2.0, 2015-03-17, for [#155][bug #155], osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
387 -* v2.0, 2015-03-15, start [2.0release branch](https://github.com/simple-rtmp-server/srs/tree/2.0release), 80773 lines. 387 +* v2.0, 2015-03-15, start [2.0release branch][branch2], 80773 lines.
388 * v2.0, 2015-03-14, fix [#324][bug #324], support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 388 * v2.0, 2015-03-14, fix [#324][bug #324], support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.
389 * v2.0, 2015-03-14, for [#324][bug #324], support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 389 * v2.0, 2015-03-14, for [#324][bug #324], support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.
390 * v2.0, 2015-03-12, fix [#328][bug #328], support adobe hds. 2.0.138. 390 * v2.0, 2015-03-12, fix [#328][bug #328], support adobe hds. 2.0.138.
@@ -404,7 +404,7 @@ Remark: @@ -404,7 +404,7 @@ Remark:
404 * v2.0, 2015-02-12, for [#304][bug #304], use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 404 * v2.0, 2015-02-12, for [#304][bug #304], use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.
405 * v2.0, 2015-02-11, dev code ZhouGuowen for 2.0.115. 405 * v2.0, 2015-02-11, dev code ZhouGuowen for 2.0.115.
406 * v2.0, 2015-02-10, for [#311][bug #311], set pcr_base to dts. 2.0.114. 406 * v2.0, 2015-02-10, for [#311][bug #311], set pcr_base to dts. 2.0.114.
407 -* v2.0, 2015-02-10, fix [the bug](https://github.com/simple-rtmp-server/srs/commit/87519aaae835199e5adb60c0ae2c1cd24939448c) of ibmf format which decoded in annexb. 407 +* v2.0, 2015-02-10, fix [the bug][p21] of ibmf format which decoded in annexb.
408 * v2.0, 2015-02-10, for [#310][bug #310], downcast aac SSR to LC. 2.0.113 408 * v2.0, 2015-02-10, for [#310][bug #310], downcast aac SSR to LC. 2.0.113
409 * v2.0, 2015-02-03, fix [#136][bug #136], support hls without io(in ram). 2.0.112 409 * v2.0, 2015-02-03, fix [#136][bug #136], support hls without io(in ram). 2.0.112
410 * v2.0, 2015-01-31, for [#250][bug #250], support push MPEGTS over UDP to SRS. 2.0.111 410 * v2.0, 2015-01-31, for [#250][bug #250], support push MPEGTS over UDP to SRS. 2.0.111
@@ -436,7 +436,7 @@ Remark: @@ -436,7 +436,7 @@ Remark:
436 * v2.0, 2014-12-22, hotfix [#264][bug #264], ignore NALU when sequence header to make HLS happy. 2.0.76 436 * v2.0, 2014-12-22, hotfix [#264][bug #264], ignore NALU when sequence header to make HLS happy. 2.0.76
437 * v2.0, 2014-12-20, hotfix [#264][bug #264], support disconnect publish connect when hls error. 2.0.75 437 * v2.0, 2014-12-20, hotfix [#264][bug #264], support disconnect publish connect when hls error. 2.0.75
438 * v2.0, 2014-12-12, fix [#257][bug #257], support 0.1s+ latency. 2.0.70 438 * v2.0, 2014-12-12, fix [#257][bug #257], support 0.1s+ latency. 2.0.70
439 -* v2.0, 2014-12-08, update wiki for mr([EN](https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency#merged-read), [CN](https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency#merged-read)) and mw([EN](https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency#merged-write), [CN](https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency#merged-write)). 439 +* v2.0, 2014-12-08, update wiki for mr([EN][v2_EN_LowLatency#merged-read], [CN][v2_CN_LowLatency#merged-read]) and mw([EN][v2_EN_LowLatency#merged-write], [CN][v2_CN_LowLatency#merged-write]).
440 * v2.0, 2014-12-07, fix [#251][bug #251], 10k+ clients, use queue cond wait and fast vector. 2.0.67 440 * v2.0, 2014-12-07, fix [#251][bug #251], 10k+ clients, use queue cond wait and fast vector. 2.0.67
441 * v2.0, 2014-12-05, fix [#251][bug #251], 9k+ clients, use fast cache for msgs queue. 2.0.57 441 * v2.0, 2014-12-05, fix [#251][bug #251], 9k+ clients, use fast cache for msgs queue. 2.0.57
442 * v2.0, 2014-12-04, fix [#241][bug #241], add mw(merged-write) config. 2.0.53 442 * v2.0, 2014-12-04, fix [#241][bug #241], add mw(merged-write) config. 2.0.53
@@ -444,7 +444,7 @@ Remark: @@ -444,7 +444,7 @@ Remark:
444 * v2.0, 2014-12-04, enable [#241][bug #241] and [#248][bug #248], +25% performance, 2.5k publisher. 2.0.50 444 * v2.0, 2014-12-04, enable [#241][bug #241] and [#248][bug #248], +25% performance, 2.5k publisher. 2.0.50
445 * v2.0, 2014-12-04, fix [#248][bug #248], improve about 15% performance for fast buffer. 2.0.49 445 * v2.0, 2014-12-04, fix [#248][bug #248], improve about 15% performance for fast buffer. 2.0.49
446 * v2.0, 2014-12-03, fix [#244][bug #244], conn thread use cond to wait for recv thread error. 2.0.47. 446 * v2.0, 2014-12-03, fix [#244][bug #244], conn thread use cond to wait for recv thread error. 2.0.47.
447 -* v2.0, 2014-12-02, merge [#239](https://github.com/simple-rtmp-server/srs/pull/239), traverse the token before response connect. 2.0.45. 447 +* v2.0, 2014-12-02, merge [#239][p23], traverse the token before response connect. 2.0.45.
448 * v2.0, 2014-12-02, srs-librtmp support hijack io apis for st-load. 2.0.42. 448 * v2.0, 2014-12-02, srs-librtmp support hijack io apis for st-load. 2.0.42.
449 * v2.0, 2014-12-01, for [#237][bug #237], refine syscall for recv, supports 1.5k clients. 2.0.41. 449 * v2.0, 2014-12-01, for [#237][bug #237], refine syscall for recv, supports 1.5k clients. 2.0.41.
450 * v2.0, 2014-11-30, add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39. 450 * v2.0, 2014-11-30, add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39.
@@ -473,7 +473,7 @@ Remark: @@ -473,7 +473,7 @@ Remark:
473 * v2.0, 2014-10-19, fix [#184][bug #184], support AnnexB in RTMP body for HLS. 2.0.2 473 * v2.0, 2014-10-19, fix [#184][bug #184], support AnnexB in RTMP body for HLS. 2.0.2
474 * v2.0, 2014-10-18, remove supports for OSX(darwin). 2.0.1. 474 * v2.0, 2014-10-18, remove supports for OSX(darwin). 2.0.1.
475 * v2.0, 2014-10-16, revert github srs README to English. 2.0.0. 475 * v2.0, 2014-10-16, revert github srs README to English. 2.0.0.
476 -* <strong>v1.0, 2014-12-05, [1.0 release(1.0.10)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0) released. 59391 lines.</strong> 476 +* <strong>v1.0, 2014-12-05, [1.0 release(1.0.10)][r1.0r0] released. 59391 lines.</strong>
477 * <strong>v1.0, 2014-10-09, [1.0 beta(1.0.0)][r1.0b0] released. 59316 lines.</strong> 477 * <strong>v1.0, 2014-10-09, [1.0 beta(1.0.0)][r1.0b0] released. 59316 lines.</strong>
478 * v1.0, 2014-10-08, fix [#151][bug #151], always reap ts whatever audio or video packet. 0.9.223. 478 * v1.0, 2014-10-08, fix [#151][bug #151], always reap ts whatever audio or video packet. 0.9.223.
479 * v1.0, 2014-10-08, fix [#162][bug #162], failed if no epoll. 0.9.222. 479 * v1.0, 2014-10-08, fix [#162][bug #162], failed if no epoll. 0.9.222.
@@ -511,44 +511,44 @@ Remark: @@ -511,44 +511,44 @@ Remark:
511 * v1.0, 2014-07-05, complete kernel utest. 0.9.149 511 * v1.0, 2014-07-05, complete kernel utest. 0.9.149
512 * v1.0, 2014-06-30, fix [#111][bug #111], always use 31bits timestamp. 0.9.143. 512 * v1.0, 2014-06-30, fix [#111][bug #111], always use 31bits timestamp. 0.9.143.
513 * v1.0, 2014-06-28, response the call message with null. 0.9.137 513 * v1.0, 2014-06-28, response the call message with null. 0.9.137
514 -* v1.0, 2014-06-28, fix [#110](https://github.com/simple-rtmp-server/srs/issues/110), thread start segment fault, thread cycle stop destroy thread. 0.9.136  
515 -* v1.0, 2014-06-27, fix [#109](https://github.com/simple-rtmp-server/srs/issues/109), fix the system jump time, adjust system startup time. 0.9.135 514 +* v1.0, 2014-06-28, fix [#110][bug #110], thread start segment fault, thread cycle stop destroy thread. 0.9.136
  515 +* v1.0, 2014-06-27, fix [#109][bug #109], fix the system jump time, adjust system startup time. 0.9.135
516 * <strong>v1.0, 2014-06-27, [1.0 mainline5(0.9.134)][r1.0a5] released. 41573 lines.</strong> 516 * <strong>v1.0, 2014-06-27, [1.0 mainline5(0.9.134)][r1.0a5] released. 41573 lines.</strong>
517 * v1.0, 2014-06-27, SRS online 30days with RTMP/HLS. 517 * v1.0, 2014-06-27, SRS online 30days with RTMP/HLS.
518 -* v1.0, 2014-06-25, fix [#108](https://github.com/simple-rtmp-server/srs/issues/108), support config time jitter for encoder non-monotonical stream. 0.9.133 518 +* v1.0, 2014-06-25, fix [#108][bug #108], support config time jitter for encoder non-monotonical stream. 0.9.133
519 * v1.0, 2014-06-23, support report summaries in heartbeat. 0.9.132 519 * v1.0, 2014-06-23, support report summaries in heartbeat. 0.9.132
520 -* v1.0, 2014-06-22, performance refine, support [3k+](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Performance#performancereport4k) connections(270kbps). 0.9.130  
521 -* v1.0, 2014-06-21, support edge [token traverse](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DRM#tokentraverse), fix [#104](https://github.com/simple-rtmp-server/srs/issues/104). 0.9.129 520 +* v1.0, 2014-06-22, performance refine, support [3k+][v1_CN_Performance#performancereport4k] connections(270kbps). 0.9.130
  521 +* v1.0, 2014-06-21, support edge [token traverse][v1_CN_DRM#tokentraverse], fix [#104][bug #104]. 0.9.129
522 * v1.0, 2014-06-19, add connections count to api summaries. 0.9.127 522 * v1.0, 2014-06-19, add connections count to api summaries. 0.9.127
523 * v1.0, 2014-06-19, add srs bytes and kbps to api summaries. 0.9.126 523 * v1.0, 2014-06-19, add srs bytes and kbps to api summaries. 0.9.126
524 * v1.0, 2014-06-18, add network bytes to api summaries. 0.9.125 524 * v1.0, 2014-06-18, add network bytes to api summaries. 0.9.125
525 -* v1.0, 2014-06-14, fix [#98](https://github.com/simple-rtmp-server/srs/issues/98), workaround for librtmp ping(fmt=1,cid=2 fresh stream). 0.9.124 525 +* v1.0, 2014-06-14, fix [#98][bug #98], workaround for librtmp ping(fmt=1,cid=2 fresh stream). 0.9.124
526 * v1.0, 2014-05-29, support flv inject and flv http streaming with start=bytes. 0.9.122 526 * v1.0, 2014-05-29, support flv inject and flv http streaming with start=bytes. 0.9.122
527 * <strong>v1.0, 2014-05-28, [1.0 mainline4(0.9.120)][r1.0a4] released. 39200 lines.</strong> 527 * <strong>v1.0, 2014-05-28, [1.0 mainline4(0.9.120)][r1.0a4] released. 39200 lines.</strong>
528 -* v1.0, 2014-05-27, fix [#87](https://github.com/simple-rtmp-server/srs/issues/87), add source id for full trackable log. 0.9.120  
529 -* v1.0, 2014-05-27, fix [#84](https://github.com/simple-rtmp-server/srs/issues/84), unpublish when edge disconnect. 0.9.119  
530 -* v1.0, 2014-05-27, fix [#89](https://github.com/simple-rtmp-server/srs/issues/89), config to /dev/null to disable ffmpeg log. 0.9.117  
531 -* v1.0, 2014-05-25, fix [#76](https://github.com/simple-rtmp-server/srs/issues/76), allow edge vhost to add or remove. 0.9.114 528 +* v1.0, 2014-05-27, fix [#87][bug #87], add source id for full trackable log. 0.9.120
  529 +* v1.0, 2014-05-27, fix [#84][bug #84], unpublish when edge disconnect. 0.9.119
  530 +* v1.0, 2014-05-27, fix [#89][bug #89], config to /dev/null to disable ffmpeg log. 0.9.117
  531 +* v1.0, 2014-05-25, fix [#76][bug #76], allow edge vhost to add or remove. 0.9.114
532 * v1.0, 2014-05-24, Johnny contribute [ossrs.net](http://ossrs.net). karthikeyan start to translate wiki to English. 532 * v1.0, 2014-05-24, Johnny contribute [ossrs.net](http://ossrs.net). karthikeyan start to translate wiki to English.
533 -* v1.0, 2014-05-22, fix [#78](https://github.com/simple-rtmp-server/srs/issues/78), st joinable thread must be stop by other threads, 0.9.113 533 +* v1.0, 2014-05-22, fix [#78][bug #78], st joinable thread must be stop by other threads, 0.9.113
534 * v1.0, 2014-05-22, support amf0 StrictArray(0x0a). 0.9.111. 534 * v1.0, 2014-05-22, support amf0 StrictArray(0x0a). 0.9.111.
535 * v1.0, 2014-05-22, support flv parser, add amf0 to librtmp. 0.9.110 535 * v1.0, 2014-05-22, support flv parser, add amf0 to librtmp. 0.9.110
536 -* v1.0, 2014-05-22, fix [#74](https://github.com/simple-rtmp-server/srs/issues/74), add tcUrl for http callback on_connect, 0.9.109 536 +* v1.0, 2014-05-22, fix [#74][bug #74], add tcUrl for http callback on_connect, 0.9.109
537 * v1.0, 2014-05-19, support http heartbeat, 0.9.107 537 * v1.0, 2014-05-19, support http heartbeat, 0.9.107
538 * <strong>v1.0, 2014-05-18, [1.0 mainline3(0.9.105)][r1.0a3] released. 37594 lines.</strong> 538 * <strong>v1.0, 2014-05-18, [1.0 mainline3(0.9.105)][r1.0a3] released. 37594 lines.</strong>
539 * v1.0, 2014-05-18, support http api json, to PUT/POST. 0.9.105 539 * v1.0, 2014-05-18, support http api json, to PUT/POST. 0.9.105
540 -* v1.0, 2014-05-17, fix [#72](https://github.com/simple-rtmp-server/srs/issues/72), also need stream_id for send_and_free_message. 0.9.101 540 +* v1.0, 2014-05-17, fix [#72][bug #72], also need stream_id for send_and_free_message. 0.9.101
541 * v1.0, 2014-05-17, rename struct to class. 0.9.100 541 * v1.0, 2014-05-17, rename struct to class. 0.9.100
542 -* v1.0, 2014-05-14, fix [#67](https://github.com/simple-rtmp-server/srs/issues/67) pithy print, stage must has a age. 0.9.98 542 +* v1.0, 2014-05-14, fix [#67][bug #67] pithy print, stage must has a age. 0.9.98
543 * v1.0, 2014-05-13, fix mem leak for delete[] SharedPtrMessage array. 0.9.95 543 * v1.0, 2014-05-13, fix mem leak for delete[] SharedPtrMessage array. 0.9.95
544 * v1.0, 2014-05-12, refine the kbps calc module. 0.9.93 544 * v1.0, 2014-05-12, refine the kbps calc module. 0.9.93
545 -* v1.0, 2014-05-12, fix bug [#64](https://github.com/simple-rtmp-server/srs/issues/64): install_dir=DESTDIR+PREFIX  
546 -* v1.0, 2014-05-08, fix [#36](https://github.com/simple-rtmp-server/srs/issues/36): never directly use \*(int32_t\*) for arm.  
547 -* v1.0, 2014-05-08, fix [#60](https://github.com/simple-rtmp-server/srs/issues/60): support aggregate message  
548 -* v1.0, 2014-05-08, fix [#59](https://github.com/simple-rtmp-server/srs/issues/59), edge support FMS origin server. 0.9.92  
549 -* v1.0, 2014-05-06, fix [#50](https://github.com/simple-rtmp-server/srs/issues/50), ubuntu14 build error. 545 +* v1.0, 2014-05-12, fix bug [#64][bug #64]: install_dir=DESTDIR+PREFIX
  546 +* v1.0, 2014-05-08, fix [#36][bug #36]: never directly use \*(int32_t\*) for arm.
  547 +* v1.0, 2014-05-08, fix [#60][bug #60]: support aggregate message
  548 +* v1.0, 2014-05-08, fix [#59][bug #59], edge support FMS origin server. 0.9.92
  549 +* v1.0, 2014-05-06, fix [#50][bug #50], ubuntu14 build error.
550 * v1.0, 2014-05-04, support mips linux. 550 * v1.0, 2014-05-04, support mips linux.
551 -* v1.0, 2014-04-30, fix bug [#34](https://github.com/simple-rtmp-server/srs/issues/34): convert signal to io thread. 0.9.85 551 +* v1.0, 2014-04-30, fix bug [#34][bug #34]: convert signal to io thread. 0.9.85
552 * v1.0, 2014-04-29, refine RTMP protocol completed, to 0.9.81 552 * v1.0, 2014-04-29, refine RTMP protocol completed, to 0.9.81
553 * <strong>v1.0, 2014-04-28, [1.0 mainline2(0.9.79)][r1.0a2] released. 35255 lines.</strong> 553 * <strong>v1.0, 2014-04-28, [1.0 mainline2(0.9.79)][r1.0a2] released. 35255 lines.</strong>
554 * v1.0, 2014-04-28, support full edge RTMP server. 0.9.79 554 * v1.0, 2014-04-28, support full edge RTMP server. 0.9.79
@@ -564,7 +564,7 @@ Remark: @@ -564,7 +564,7 @@ Remark:
564 * v1.0, 2014-04-05, support [http api][v1_CN_HTTPApi] and [http server][v1_CN_HTTPServer]. 564 * v1.0, 2014-04-05, support [http api][v1_CN_HTTPApi] and [http server][v1_CN_HTTPServer].
565 * v1.0, 2014-04-03, implements http framework and api/v1/version. 565 * v1.0, 2014-04-03, implements http framework and api/v1/version.
566 * v1.0, 2014-03-30, fix bug for st detecting epoll failed, force st to use epoll. 566 * v1.0, 2014-03-30, fix bug for st detecting epoll failed, force st to use epoll.
567 -* v1.0, 2014-03-29, add wiki [Performance for RaspberryPi](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RaspberryPi). 567 +* v1.0, 2014-03-29, add wiki [Performance for RaspberryPi][v1_CN_RaspberryPi].
568 * v1.0, 2014-03-29, add release binary package for raspberry-pi. 568 * v1.0, 2014-03-29, add release binary package for raspberry-pi.
569 * v1.0, 2014-03-26, support RTMP ATC for HLS/HDS to support backup(failover). 569 * v1.0, 2014-03-26, support RTMP ATC for HLS/HDS to support backup(failover).
570 * v1.0, 2014-03-23, support daemon, default start in daemon. 570 * v1.0, 2014-03-23, support daemon, default start in daemon.
@@ -574,21 +574,21 @@ Remark: @@ -574,21 +574,21 @@ Remark:
574 * v1.0, 2014-03-20, refine hls code, support pure audio HLS. 574 * v1.0, 2014-03-20, refine hls code, support pure audio HLS.
575 * v1.0, 2014-03-19, add vn/an for FFMPEG to drop video/audio for radio stream. 575 * v1.0, 2014-03-19, add vn/an for FFMPEG to drop video/audio for radio stream.
576 * v1.0, 2014-03-19, refine handshake, client support complex handshake, add utest. 576 * v1.0, 2014-03-19, refine handshake, client support complex handshake, add utest.
577 -* v1.0, 2014-03-16, fix bug on arm of st, the sp change from 20 to 8, for respberry-pi, @see [commit](https://github.com/simple-rtmp-server/srs/commit/5a4373d4835758188b9a1f03005cea0b6ddc62aa) 577 +* v1.0, 2014-03-16, fix bug on arm of st, the sp change from 20 to 8, for respberry-pi, @see [commit][p22]
578 * v1.0, 2014-03-16, support ARM([debian armhf, v7cpu][v1_CN_SrsLinuxArm]) with rtmp/ssl/hls/librtmp. 578 * v1.0, 2014-03-16, support ARM([debian armhf, v7cpu][v1_CN_SrsLinuxArm]) with rtmp/ssl/hls/librtmp.
579 * v1.0, 2014-03-12, finish utest for amf0 codec. 579 * v1.0, 2014-03-12, finish utest for amf0 codec.
580 * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile. 580 * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile.
581 * v1.0, 2014-03-04, add gest framework for utest, build success. 581 * v1.0, 2014-03-04, add gest framework for utest, build success.
582 -* v1.0, 2014-03-02, add wiki [srs-librtmp](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLibrtmp), [SRS for arm][v1_CN_SrsLinuxArm], [product](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product) 582 +* v1.0, 2014-03-02, add wiki [srs-librtmp][v1_CN_SrsLibrtmp], [SRS for arm][v1_CN_SrsLinuxArm], [product][v1_CN_Product]
583 * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp. 583 * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp.
584 * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module. 584 * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module.
585 * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package. 585 * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package.
586 -* v1.0, 2014-02-28, add wiki [BuildArm](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Build), [FFMPEG][v1_CN_FFMPEG], [Reload][v1_CN_Reload]  
587 -* v1.0, 2014-02-27, add wiki [LowLatency](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LowLatency), [HTTPCallback][v1_CN_HTTPCallback], [ServerSideScript](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_ServerSideScript), [IDE](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE) 586 +* v1.0, 2014-02-28, add wiki [BuildArm][v1_CN_Build], [FFMPEG][v1_CN_FFMPEG], [Reload][v1_CN_Reload]
  587 +* v1.0, 2014-02-27, add wiki [LowLatency][v1_CN_LowLatency], [HTTPCallback][v1_CN_HTTPCallback], [ServerSideScript][v1_CN_ServerSideScript], [IDE][v1_CN_IDE]
588 * v1.0, 2014-01-19, add wiki [DeliveryHLS][v1_CN_DeliveryHLS] 588 * v1.0, 2014-01-19, add wiki [DeliveryHLS][v1_CN_DeliveryHLS]
589 -* v1.0, 2014-01-12, add wiki [HowToAskQuestion](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_HowToAskQuestion), [RtmpUrlVhost][v1_CN_RtmpUrlVhost] 589 +* v1.0, 2014-01-12, add wiki [HowToAskQuestion][v1_CN_HowToAskQuestion], [RtmpUrlVhost][v1_CN_RtmpUrlVhost]
590 * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually. 590 * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually.
591 -* v1.0, 2014-01-05, add wiki [Build](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Build), [Performance](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Performance), [Forward][v1_CN_Forward] 591 +* v1.0, 2014-01-05, add wiki [Build][v1_CN_Build], [Performance][v1_CN_Performance], [Forward][v1_CN_Forward]
592 * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance. 592 * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance.
593 * v1.0, 2013-12-27, merge from wenjie, the bandwidth test feature. 593 * v1.0, 2013-12-27, merge from wenjie, the bandwidth test feature.
594 * <strong>v0.9, 2013-12-25, [v0.9][r0.9] released. 20926 lines.</strong> 594 * <strong>v0.9, 2013-12-25, [v0.9][r0.9] released. 20926 lines.</strong>
@@ -665,8 +665,8 @@ Remark: @@ -665,8 +665,8 @@ Remark:
665 665
666 Performance benchmark history, on virtual box. 666 Performance benchmark history, on virtual box.
667 667
668 -* See also: [Performance for x86/x64 Test Guide](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Performance)  
669 -* See also: [Performance for RaspberryPi](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RaspberryPi) 668 +* See also: [Performance for x86/x64 Test Guide][v1_CN_Performance]
  669 +* See also: [Performance for RaspberryPi][v1_CN_RaspberryPi]
670 * About multiple-process performance, read [srs-dolphin][srs-dolphin]. 670 * About multiple-process performance, read [srs-dolphin][srs-dolphin].
671 671
672 ### Play RTMP benchmark 672 ### Play RTMP benchmark
@@ -720,10 +720,7 @@ The play HTTP FLV benchmark by [SB][srs-bench]: @@ -720,10 +720,7 @@ The play HTTP FLV benchmark by [SB][srs-bench]:
720 720
721 ### Latency benchmark 721 ### Latency benchmark
722 722
723 -The latency between encoder and player with realtime config(  
724 -[CN](https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency),  
725 -[EN](https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency)  
726 -): 723 +The latency between encoder and player with realtime config([CN][v2_CN_LowLatency], [EN][v2_EN_LowLatency]):
727 | 724 |
728 725
729 | Update | SRS | VP6 | H.264 | VP6+MP3 | H.264+MP3 | 726 | Update | SRS | VP6 | H.264 | VP6+MP3 | H.264+MP3 |
@@ -734,7 +731,7 @@ The latency between encoder and player with realtime config( @@ -734,7 +731,7 @@ The latency between encoder and player with realtime config(
734 731
735 We use FMLE as encoder for benchmark. The latency of server is 0.1s+, 732 We use FMLE as encoder for benchmark. The latency of server is 0.1s+,
736 and the bottleneck is the encoder. For more information, read 733 and the bottleneck is the encoder. For more information, read
737 -[bug #257](https://github.com/simple-rtmp-server/srs/issues/257#issuecomment-66864413). 734 +[bug #257][bug #257#issuecomment-66864413].
738 735
739 ### HLS overhead 736 ### HLS overhead
740 737
@@ -862,6 +859,9 @@ Winlin @@ -862,6 +859,9 @@ Winlin
862 [p18]: https://github.com/simple-rtmp-server/srs/commit/960341b9b2b9646270ccfd113b4dd784d9826c73 859 [p18]: https://github.com/simple-rtmp-server/srs/commit/960341b9b2b9646270ccfd113b4dd784d9826c73
863 [p19]: https://github.com/simple-rtmp-server/srs/commit/4df19ba99a4e4d80cd89b304f9298d343497bec9 860 [p19]: https://github.com/simple-rtmp-server/srs/commit/4df19ba99a4e4d80cd89b304f9298d343497bec9
864 [p20]: https://github.com/simple-rtmp-server/srs/commit/d12fc7fcc5b2e9e3c8ee5c7da01d0e41c8f8ca4a 861 [p20]: https://github.com/simple-rtmp-server/srs/commit/d12fc7fcc5b2e9e3c8ee5c7da01d0e41c8f8ca4a
  862 +[p21]: https://github.com/simple-rtmp-server/srs/commit/87519aaae835199e5adb60c0ae2c1cd24939448c
  863 +[p22]: https://github.com/simple-rtmp-server/srs/commit/5a4373d4835758188b9a1f03005cea0b6ddc62aa
  864 +[p23]: https://github.com/simple-rtmp-server/srs/pull/239
865 865
866 [authors]: https://github.com/simple-rtmp-server/srs/blob/develop/AUTHORS.txt 866 [authors]: https://github.com/simple-rtmp-server/srs/blob/develop/AUTHORS.txt
867 [bigthanks]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#bigthanks 867 [bigthanks]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#bigthanks
@@ -879,7 +879,10 @@ Winlin @@ -879,7 +879,10 @@ Winlin
879 [srs-dolphin]: https://github.com/simple-rtmp-server/srs-dolphin 879 [srs-dolphin]: https://github.com/simple-rtmp-server/srs-dolphin
880 [srs-bench]: https://github.com/simple-rtmp-server/srs-bench 880 [srs-bench]: https://github.com/simple-rtmp-server/srs-bench
881 [srs-ngb]: https://github.com/simple-rtmp-server/srs-ngb 881 [srs-ngb]: https://github.com/simple-rtmp-server/srs-ngb
  882 +[srs-librtmp]: https://github.com/simple-rtmp-server/srs-librtmp
882 [gitlab]: https://gitlab.com/winlinvip/srs-gitlab 883 [gitlab]: https://gitlab.com/winlinvip/srs-gitlab
  884 +[console]: http://ossrs.net:1985/console
  885 +
883 [v1_CN_Git]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Git 886 [v1_CN_Git]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Git
884 [v1_EN_Git]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Git 887 [v1_EN_Git]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Git
885 [v1_CN_SampleRTMP]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleRTMP 888 [v1_CN_SampleRTMP]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleRTMP
@@ -984,6 +987,25 @@ Winlin @@ -984,6 +987,25 @@ Winlin
984 [v2_EN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlv 987 [v2_EN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlv
985 [v2_CN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlvCluster 988 [v2_CN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlvCluster
986 [v2_EN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlvCluster 989 [v2_EN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlvCluster
  990 +[v2_CN_LowLatency]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency
  991 +[v2_EN_LowLatency]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency
  992 +[v2_EN_LowLatency#merged-read]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency#merged-read
  993 +[v1_CN_Performance#performancereport4k]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Performance#performancereport4k
  994 +[v1_CN_DRM#tokentraverse]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DRM#tokentraverse
  995 +[v1_CN_RaspberryPi]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RaspberryPi
  996 +[v1_CN_SrsLibrtmp]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLibrtmp
  997 +[v1_CN_Build]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Build
  998 +[v1_CN_LowLatency]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LowLatency
  999 +[v1_CN_HowToAskQuestion]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_HowToAskQuestion
  1000 +[v1_CN_Build]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Build
  1001 +[v1_CN_Performance]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Performance
  1002 +[v1_CN_RaspberryPi]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RaspberryPi
  1003 +[v2_CN_LowLatency#merged-read]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency#merged-read
  1004 +[v1_CN_Product]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product
  1005 +[v1_CN_ServerSideScript]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_ServerSideScript
  1006 +[v2_EN_LowLatency#merged-write]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency#merged-write
  1007 +[v1_CN_IDE]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE
  1008 +[v2_CN_LowLatency#merged-write]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency#merged-write
987 1009
988 [bug #213]: https://github.com/simple-rtmp-server/srs/issues/213 1010 [bug #213]: https://github.com/simple-rtmp-server/srs/issues/213
989 [bug #194]: https://github.com/simple-rtmp-server/srs/issues/194 1011 [bug #194]: https://github.com/simple-rtmp-server/srs/issues/194
@@ -1136,6 +1158,26 @@ Winlin @@ -1136,6 +1158,26 @@ Winlin
1136 [bug #50]: https://github.com/simple-rtmp-server/srs/issues/50 1158 [bug #50]: https://github.com/simple-rtmp-server/srs/issues/50
1137 [bug #34]: https://github.com/simple-rtmp-server/srs/issues/34 1159 [bug #34]: https://github.com/simple-rtmp-server/srs/issues/34
1138 [bug #257-c0]: https://github.com/simple-rtmp-server/srs/issues/257#issuecomment-66864413 1160 [bug #257-c0]: https://github.com/simple-rtmp-server/srs/issues/257#issuecomment-66864413
  1161 +[bug #110]: https://github.com/simple-rtmp-server/srs/issues/110
  1162 +[bug #109]: https://github.com/simple-rtmp-server/srs/issues/109
  1163 +[bug #108]: https://github.com/simple-rtmp-server/srs/issues/108
  1164 +[bug #104]: https://github.com/simple-rtmp-server/srs/issues/104
  1165 +[bug #98]: https://github.com/simple-rtmp-server/srs/issues/98
  1166 +[bug #87]: https://github.com/simple-rtmp-server/srs/issues/87
  1167 +[bug #84]: https://github.com/simple-rtmp-server/srs/issues/84
  1168 +[bug #89]: https://github.com/simple-rtmp-server/srs/issues/89
  1169 +[bug #76]: https://github.com/simple-rtmp-server/srs/issues/76
  1170 +[bug #78]: https://github.com/simple-rtmp-server/srs/issues/78
  1171 +[bug #74]: https://github.com/simple-rtmp-server/srs/issues/74
  1172 +[bug #72]: https://github.com/simple-rtmp-server/srs/issues/72
  1173 +[bug #67]: https://github.com/simple-rtmp-server/srs/issues/67
  1174 +[bug #64]: https://github.com/simple-rtmp-server/srs/issues/64
  1175 +[bug #36]: https://github.com/simple-rtmp-server/srs/issues/36
  1176 +[bug #60]: https://github.com/simple-rtmp-server/srs/issues/60
  1177 +[bug #59]: https://github.com/simple-rtmp-server/srs/issues/59
  1178 +[bug #50]: https://github.com/simple-rtmp-server/srs/issues/50
  1179 +[bug #34]: https://github.com/simple-rtmp-server/srs/issues/34
  1180 +[bug #257#issuecomment-66864413]: https://github.com/simple-rtmp-server/srs/issues/257#issuecomment-66864413
1139 1181
1140 [r2.0a0]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a0 1182 [r2.0a0]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a0
1141 [r1.0r4]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4 1183 [r1.0r4]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4
@@ -1166,6 +1208,7 @@ Winlin @@ -1166,6 +1208,7 @@ Winlin
1166 [more0]: http://winlinvip.github.io/srs.release/releases/ 1208 [more0]: http://winlinvip.github.io/srs.release/releases/
1167 [more1]: http://www.ossrs.net/srs.release/releases/ 1209 [more1]: http://www.ossrs.net/srs.release/releases/
1168 1210
  1211 +[branch1]: https://github.com/simple-rtmp-server/srs/tree/1.0release
1169 [branch2]: https://github.com/simple-rtmp-server/srs/tree/2.0release 1212 [branch2]: https://github.com/simple-rtmp-server/srs/tree/2.0release
1170 [release2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release20 1213 [release2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release20
1171 [release3]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release30 1214 [release3]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release30