正在显示
1 个修改的文件
包含
52 行增加
和
52 行删除
| @@ -159,32 +159,32 @@ Supported operating systems and hardware: | @@ -159,32 +159,32 @@ Supported operating systems and hardware: | ||
| 159 | 1. High-performance([CN][v1_CN_Performance], [EN][v1_EN_Performance]): single-thread, async socket, event/st-thread driven. | 159 | 1. High-performance([CN][v1_CN_Performance], [EN][v1_EN_Performance]): single-thread, async socket, event/st-thread driven. |
| 160 | 1. High-concurrency([CN][v1_CN_Performance], [EN][v1_EN_Performance]), 6000+ connections(500kbps), 900Mbps, CPU 90.2%, 41MB | 160 | 1. High-concurrency([CN][v1_CN_Performance], [EN][v1_EN_Performance]), 6000+ connections(500kbps), 900Mbps, CPU 90.2%, 41MB |
| 161 | 1. Support RTMP Origin Server([CN][v1_CN_DeliveryRTMP],[EN][v1_EN_DeliveryRTMP]) | 161 | 1. Support RTMP Origin Server([CN][v1_CN_DeliveryRTMP],[EN][v1_EN_DeliveryRTMP]) |
| 162 | -1. Support RTMP Edge Server([CN][v1_CN_Edge], [EN][v1_EN_Edge]) for CDN, push/pull stream from any RTMP server | 162 | +1. Support RTMP Edge Server([CN][v2_CN_Edge], [EN][v2_EN_Edge]) for CDN, push/pull stream from any RTMP server |
| 163 | 1. Support single process; no multiple processes. | 163 | 1. Support single process; no multiple processes. |
| 164 | 1. Support Vhost([CN][v1_CN_RtmpUrlVhost], [EN][v1_EN_RtmpUrlVhost]), support \_\_defaultVhost\_\_. | 164 | 1. Support Vhost([CN][v1_CN_RtmpUrlVhost], [EN][v1_EN_RtmpUrlVhost]), support \_\_defaultVhost\_\_. |
| 165 | 1. Support RTMP([CN][v1_CN_DeliveryRTMP], [EN][v1_EN_DeliveryRTMP]) live streaming; no vod streaming. | 165 | 1. Support RTMP([CN][v1_CN_DeliveryRTMP], [EN][v1_EN_DeliveryRTMP]) live streaming; no vod streaming. |
| 166 | -1. Support Apple HLS(m3u8)([CN][v1_CN_DeliveryHLS], [EN][v1_EN_DeliveryHLS]) live streaming. | ||
| 167 | -1. Support HLS audio-only([CN][v1_CN_DeliveryHLS2], [EN][v1_EN_DeliveryHLS2]) live streaming. | 166 | +1. Support Apple HLS(m3u8)([CN][v2_CN_DeliveryHLS], [EN][v2_EN_DeliveryHLS]) live streaming. |
| 167 | +1. Support HLS audio-only([CN][v2_CN_DeliveryHLS2], [EN][v2_EN_DeliveryHLS2]) live streaming. | ||
| 168 | 1. Support Reload([CN][v1_CN_Reload], [EN][v1_EN_Reload]) config to enable changes. | 168 | 1. Support Reload([CN][v1_CN_Reload], [EN][v1_EN_Reload]) config to enable changes. |
| 169 | -1. Support cache last gop([CN][v1_CN_LowLatency2], [EN][v1_EN_LowLatency2]) for flash player to fast startup. | 169 | +1. Support cache last gop([CN][v2_CN_LowLatency2], [EN][v2_EN_LowLatency2]) for flash player to fast startup. |
| 170 | 1. Support listen at multiple ports. | 170 | 1. Support listen at multiple ports. |
| 171 | 1. Support long time(>4.6hours) publish/play. | 171 | 1. Support long time(>4.6hours) publish/play. |
| 172 | 1. Support Forward([CN][v1_CN_Forward], [EN][v1_EN_Forward]) in master-slave mode. | 172 | 1. Support Forward([CN][v1_CN_Forward], [EN][v1_EN_Forward]) in master-slave mode. |
| 173 | -1. Support live stream Transcoding([CN][v1_CN_FFMPEG], [EN][v1_EN_FFMPEG]) by ffmpeg. | ||
| 174 | -1. Support ffmpeg([CN][v1_CN_FFMPEG], [EN][v1_EN_FFMPEG]) filters(logo/overlay/crop), x264 params, copy/vn/an. | ||
| 175 | -1. Support audio transcode([CN][v1_CN_FFMPEG], [EN][v1_EN_FFMPEG]) only, speex/mp3 to aac | ||
| 176 | -1. Support http callback api hooks([CN][v1_CN_HTTPCallback], [EN][v1_EN_HTTPCallback])(for authentication and injection). | 173 | +1. Support live stream Transcoding([CN][v2_CN_FFMPEG], [EN][v2_EN_FFMPEG]) by ffmpeg. |
| 174 | +1. Support ffmpeg([CN][v2_CN_FFMPEG], [EN][v2_EN_FFMPEG]) filters(logo/overlay/crop), x264 params, copy/vn/an. | ||
| 175 | +1. Support audio transcode([CN][v2_CN_FFMPEG], [EN][v2_EN_FFMPEG]) only, speex/mp3 to aac | ||
| 176 | +1. Support http callback api hooks([CN][v2_CN_HTTPCallback], [EN][v2_EN_HTTPCallback])(for authentication and injection). | ||
| 177 | 1. Support bandwidth test([CN][v1_CN_BandwidthTestTool], [EN][v1_EN_BandwidthTestTool]) api and flash client. | 177 | 1. Support bandwidth test([CN][v1_CN_BandwidthTestTool], [EN][v1_EN_BandwidthTestTool]) api and flash client. |
| 178 | 1. Player, publisher(encoder), and demo pages(jquery+bootstrap)([CN][v1_CN_SampleDemo],[EN][v1_EN_SampleDemo]). | 178 | 1. Player, publisher(encoder), and demo pages(jquery+bootstrap)([CN][v1_CN_SampleDemo],[EN][v1_EN_SampleDemo]). |
| 179 | 1. Demo([CN][v1_CN_SampleDemo], [EN][v1_EN_SampleDemo]) video meeting or chat(SRS+cherrypy+jquery+bootstrap). | 179 | 1. Demo([CN][v1_CN_SampleDemo], [EN][v1_EN_SampleDemo]) video meeting or chat(SRS+cherrypy+jquery+bootstrap). |
| 180 | -1. Full documents in wiki([CN][v1_CN_Home], [EN][v1_EN_Home]), both Chinese and English. | 180 | +1. Full documents in wiki([CN][v2_CN_Home], [EN][v2_EN_Home]), both Chinese and English. |
| 181 | 1. Support RTMP(play-publish) library: srs-librtmp([CN][v2_CN_SrsLibrtmp], [EN][v2_EN_SrsLibrtmp]) | 181 | 1. Support RTMP(play-publish) library: srs-librtmp([CN][v2_CN_SrsLibrtmp], [EN][v2_EN_SrsLibrtmp]) |
| 182 | 1. Support ARM cpu arch([CN][v1_CN_SrsLinuxArm], [EN][v1_EN_SrsLinuxArm]) with rtmp/ssl/hls/librtmp. | 182 | 1. Support ARM cpu arch([CN][v1_CN_SrsLinuxArm], [EN][v1_EN_SrsLinuxArm]) with rtmp/ssl/hls/librtmp. |
| 183 | 1. Support init.d([CN][v1_CN_LinuxService], [EN][v1_EN_LinuxService]) and packge script, log to file. | 183 | 1. Support init.d([CN][v1_CN_LinuxService], [EN][v1_EN_LinuxService]) and packge script, log to file. |
| 184 | 1. Support RTMP ATC([CN][v1_CN_RTMP-ATC], [EN][v1_EN_RTMP-ATC]) for HLS/HDS to support backup(failover) | 184 | 1. Support RTMP ATC([CN][v1_CN_RTMP-ATC], [EN][v1_EN_RTMP-ATC]) for HLS/HDS to support backup(failover) |
| 185 | -1. Support HTTP RESTful management api([CN][v1_CN_HTTPApi], [EN][v1_EN_HTTPApi]). | 185 | +1. Support HTTP RESTful management api([CN][v2_CN_HTTPApi], [EN][v2_EN_HTTPApi]). |
| 186 | 1. Support Ingest([CN][v1_CN_Ingest], [EN][v1_EN_Ingest]) FILE/HTTP/RTMP/RTSP(RTP, SDP) to RTMP using external tools(e.g ffmepg). | 186 | 1. Support Ingest([CN][v1_CN_Ingest], [EN][v1_EN_Ingest]) FILE/HTTP/RTMP/RTSP(RTP, SDP) to RTMP using external tools(e.g ffmepg). |
| 187 | -1. Support DVR([CN][v1_CN_DVR], [EN][v1_EN_DVR]), record live to flv file for vod. | 187 | +1. Support DVR([CN][v2_CN_DVR], [EN][v2_EN_DVR]), record live to flv file for vod. |
| 188 | 1. Support tracable log, session based log([CN][v1_CN_SrsLog], [EN][v1_EN_SrsLog]). | 188 | 1. Support tracable log, session based log([CN][v1_CN_SrsLog], [EN][v1_EN_SrsLog]). |
| 189 | 1. Support DRM token traverse([CN][v1_CN_DRM2], [EN][v1_EN_DRM2]) for fms origin authenticate. | 189 | 1. Support DRM token traverse([CN][v1_CN_DRM2], [EN][v1_EN_DRM2]) for fms origin authenticate. |
| 190 | 1. Support system full utest on gtest. | 190 | 1. Support system full utest on gtest. |
| @@ -193,7 +193,7 @@ Supported operating systems and hardware: | @@ -193,7 +193,7 @@ Supported operating systems and hardware: | ||
| 193 | 1. Stable [1.0release branch][branch1]. | 193 | 1. Stable [1.0release branch][branch1]. |
| 194 | 1. Support publish h264 raw stream([CN][v2_CN_SrsLibrtmp2], [EN][v2_EN_SrsLibrtmp2]) by srs-librtmp. | 194 | 1. Support publish h264 raw stream([CN][v2_CN_SrsLibrtmp2], [EN][v2_EN_SrsLibrtmp2]) by srs-librtmp. |
| 195 | 1. Support [6k+ clients][bug #194], 3Gbps per process. | 195 | 1. Support [6k+ clients][bug #194], 3Gbps per process. |
| 196 | -1. Suppport [English wiki][v1_EN_Home]. | 196 | +1. Suppport [English wiki][v2_EN_Home]. |
| 197 | 1. Research and simplify st, [bug #182][bug #182]. | 197 | 1. Research and simplify st, [bug #182][bug #182]. |
| 198 | 1. Support compile [srs-librtmp on windows][srs-librtmp], [bug #213][bug #213]. | 198 | 1. Support compile [srs-librtmp on windows][srs-librtmp], [bug #213][bug #213]. |
| 199 | 1. Support [10k+ clients][bug #251], 4Gbps per process. | 199 | 1. Support [10k+ clients][bug #251], 4Gbps per process. |
| @@ -205,7 +205,7 @@ Supported operating systems and hardware: | @@ -205,7 +205,7 @@ Supported operating systems and hardware: | ||
| 205 | 1. Support HLS(h.264+mp3) streaming, read [bug #301][bug #301]. | 205 | 1. Support HLS(h.264+mp3) streaming, read [bug #301][bug #301]. |
| 206 | 1. Rewrite HLS(h.264+aac/mp3) streaming, read [bug #304][bug #304]. | 206 | 1. Rewrite HLS(h.264+aac/mp3) streaming, read [bug #304][bug #304]. |
| 207 | 1. [dev] Realease [2.0release branch][branch2]. | 207 | 1. [dev] Realease [2.0release branch][branch2]. |
| 208 | -1. [experiment] Support Adobe HDS(f4m)([CN][v1_CN_DeliveryHDS], [EN][v1_EN_DeliveryHDS]) dynamic streaming. | 208 | +1. [experiment] Support Adobe HDS(f4m)([CN][v2_CN_DeliveryHDS], [EN][v2_EN_DeliveryHDS]) dynamic streaming. |
| 209 | 1. [experiment] Support push MPEG-TS over UDP to SRS, read [bug #250][bug #250]. | 209 | 1. [experiment] Support push MPEG-TS over UDP to SRS, read [bug #250][bug #250]. |
| 210 | 1. [experiment] Support push RTSP to SRS, read [bug #133][bug #133]. | 210 | 1. [experiment] Support push RTSP to SRS, read [bug #133][bug #133]. |
| 211 | 1. [experiment] Support push flv stream over HTTP POST to SRS, read [wiki]([CN][v2_CN_Streamer2], [EN][v2_EN_Streamer2]). | 211 | 1. [experiment] Support push flv stream over HTTP POST to SRS, read [wiki]([CN][v2_CN_Streamer2], [EN][v2_EN_Streamer2]). |
| @@ -320,13 +320,13 @@ Remark: | @@ -320,13 +320,13 @@ Remark: | ||
| 320 | * 2014-06-27, [Release v0.9.5][r1.0a5], refine perf 3k+ clients, edge token traverse, [srs monitor](http://ossrs.net:1977), 30days online. 41573 lines. | 320 | * 2014-06-27, [Release v0.9.5][r1.0a5], refine perf 3k+ clients, edge token traverse, [srs monitor](http://ossrs.net:1977), 30days online. 41573 lines. |
| 321 | * 2014-05-28, [Release v0.9.4][r1.0a4], support heartbeat, tracable log, fix mem leak and bugs. 39200 lines. | 321 | * 2014-05-28, [Release v0.9.4][r1.0a4], support heartbeat, tracable log, fix mem leak and bugs. 39200 lines. |
| 322 | * 2014-05-18, [Release v0.9.3][r1.0a3], support mips, fms origin, json(http-api). 37594 lines. | 322 | * 2014-05-18, [Release v0.9.3][r1.0a3], support mips, fms origin, json(http-api). 37594 lines. |
| 323 | -* 2014-04-28, [Release v0.9.2][r1.0a2], support [dvr][v1_CN_DVR], android, [edge][v1_CN_Edge]. 35255 lines. | ||
| 324 | -* 2014-04-07, [Release v0.9.1][r1.0a0], support [arm][v1_CN_SrsLinuxArm], [init.d][v1_CN_LinuxService], http [server][v1_CN_HTTPServer]/[api][v1_CN_HTTPApi], [ingest][v1_CN_SampleIngest]. 30000 lines. | 323 | +* 2014-04-28, [Release v0.9.2][r1.0a2], support [dvr][v2_CN_DVR], android, [edge][v2_CN_Edge]. 35255 lines. |
| 324 | +* 2014-04-07, [Release v0.9.1][r1.0a0], support [arm][v1_CN_SrsLinuxArm], [init.d][v1_CN_LinuxService], http [server][v2_CN_HTTPServer]/[api][v2_CN_HTTPApi], [ingest][v1_CN_SampleIngest]. 30000 lines. | ||
| 325 | * 2013-12-25, [Release v0.9.0][r0.9], support bandwidth test, player/encoder/chat [demos][v1_CN_SampleDemo]. 20926 lines. | 325 | * 2013-12-25, [Release v0.9.0][r0.9], support bandwidth test, player/encoder/chat [demos][v1_CN_SampleDemo]. 20926 lines. |
| 326 | -* 2013-12-08, [Release v0.8.0][r0.8], support [http hooks callback][v1_CN_HTTPCallback], update [SB][srs-bench]. 19186 lines. | ||
| 327 | -* 2013-12-03, [Release v0.7.0][r0.7], support [live stream transcoding][v1_CN_FFMPEG]. 17605 lines. | 326 | +* 2013-12-08, [Release v0.8.0][r0.8], support [http hooks callback][v2_CN_HTTPCallback], update [SB][srs-bench]. 19186 lines. |
| 327 | +* 2013-12-03, [Release v0.7.0][r0.7], support [live stream transcoding][v2_CN_FFMPEG]. 17605 lines. | ||
| 328 | * 2013-11-29, [Release v0.6.0][r0.6], support [forward][v1_CN_Forward] stream to origin/edge. 16094 lines. | 328 | * 2013-11-29, [Release v0.6.0][r0.6], support [forward][v1_CN_Forward] stream to origin/edge. 16094 lines. |
| 329 | -* 2013-11-26, [Release v0.5.0][r0.5], support [HLS(m3u8)][v1_CN_DeliveryHLS], fragment and window. 14449 lines. | 329 | +* 2013-11-26, [Release v0.5.0][r0.5], support [HLS(m3u8)][v2_CN_DeliveryHLS], fragment and window. 14449 lines. |
| 330 | * 2013-11-10, [Release v0.4.0][r0.4], support [reload][v1_CN_Reload] config, pause, longtime publish/play. 12500 lines. | 330 | * 2013-11-10, [Release v0.4.0][r0.4], support [reload][v1_CN_Reload] config, pause, longtime publish/play. 12500 lines. |
| 331 | * 2013-11-04, [Release v0.3.0][r0.3], support [vhost][v1_CN_RtmpUrlVhost], refer, gop cache, listen multiple ports. 11773 lines. | 331 | * 2013-11-04, [Release v0.3.0][r0.3], support [vhost][v1_CN_RtmpUrlVhost], refer, gop cache, listen multiple ports. 11773 lines. |
| 332 | * 2013-10-25, [Release v0.2.0][r0.2], support [rtmp][v1_CN_RTMPHandshake] flash publish, h264, time jitter correct. 10125 lines. | 332 | * 2013-10-25, [Release v0.2.0][r0.2], support [rtmp][v1_CN_RTMPHandshake] flash publish, h264, time jitter correct. 10125 lines. |
| @@ -620,7 +620,7 @@ Remark: | @@ -620,7 +620,7 @@ Remark: | ||
| 620 | * v1.0, 2014-04-10, support reload ingesters(add/remov/update). 0.9.57 | 620 | * v1.0, 2014-04-10, support reload ingesters(add/remov/update). 0.9.57 |
| 621 | * <strong>v1.0, 2014-04-07, [1.0 mainline(0.9.55)][r1.0a0] released. 30000 lines.</strong> | 621 | * <strong>v1.0, 2014-04-07, [1.0 mainline(0.9.55)][r1.0a0] released. 30000 lines.</strong> |
| 622 | * v1.0, 2014-04-07, support [ingest][v1_CN_SampleIngest] file/stream/device. | 622 | * v1.0, 2014-04-07, support [ingest][v1_CN_SampleIngest] file/stream/device. |
| 623 | -* v1.0, 2014-04-05, support [http api][v1_CN_HTTPApi] and [http server][v1_CN_HTTPServer]. | 623 | +* v1.0, 2014-04-05, support [http api][v2_CN_HTTPApi] and [http server][v2_CN_HTTPServer]. |
| 624 | * v1.0, 2014-04-03, implements http framework and api/v1/version. | 624 | * v1.0, 2014-04-03, implements http framework and api/v1/version. |
| 625 | * v1.0, 2014-03-30, fix bug for st detecting epoll failed, force st to use epoll. | 625 | * v1.0, 2014-03-30, fix bug for st detecting epoll failed, force st to use epoll. |
| 626 | * v1.0, 2014-03-29, add wiki [Performance for RaspberryPi][v1_CN_RaspberryPi]. | 626 | * v1.0, 2014-03-29, add wiki [Performance for RaspberryPi][v1_CN_RaspberryPi]. |
| @@ -638,16 +638,16 @@ Remark: | @@ -638,16 +638,16 @@ Remark: | ||
| 638 | * v1.0, 2014-03-12, finish utest for amf0 codec. | 638 | * v1.0, 2014-03-12, finish utest for amf0 codec. |
| 639 | * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile. | 639 | * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile. |
| 640 | * v1.0, 2014-03-04, add gest framework for utest, build success. | 640 | * v1.0, 2014-03-04, add gest framework for utest, build success. |
| 641 | -* v1.0, 2014-03-02, add wiki [srs-librtmp][v1_CN_SrsLibrtmp], [SRS for arm][v1_CN_SrsLinuxArm], [product][v1_CN_Product] | 641 | +* v1.0, 2014-03-02, add wiki [srs-librtmp][v2_CN_SrsLibrtmp], [SRS for arm][v1_CN_SrsLinuxArm], [product][v1_CN_Product] |
| 642 | * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp. | 642 | * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp. |
| 643 | * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module. | 643 | * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module. |
| 644 | * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package. | 644 | * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package. |
| 645 | -* v1.0, 2014-02-28, add wiki [BuildArm][v1_CN_Build], [FFMPEG][v1_CN_FFMPEG], [Reload][v1_CN_Reload] | ||
| 646 | -* v1.0, 2014-02-27, add wiki [LowLatency][v1_CN_LowLatency], [HTTPCallback][v1_CN_HTTPCallback], [ServerSideScript][v1_CN_ServerSideScript], [IDE][v1_CN_IDE] | ||
| 647 | -* v1.0, 2014-01-19, add wiki [DeliveryHLS][v1_CN_DeliveryHLS] | 645 | +* v1.0, 2014-02-28, add wiki [BuildArm][v2_CN_Build], [FFMPEG][v2_CN_FFMPEG], [Reload][v1_CN_Reload] |
| 646 | +* v1.0, 2014-02-27, add wiki [LowLatency][v2_CN_LowLatency], [HTTPCallback][v2_CN_HTTPCallback], [ServerSideScript][v1_CN_ServerSideScript], [IDE][v2_CN_IDE] | ||
| 647 | +* v1.0, 2014-01-19, add wiki [DeliveryHLS][v2_CN_DeliveryHLS] | ||
| 648 | * v1.0, 2014-01-12, add wiki [HowToAskQuestion][v1_CN_HowToAskQuestion], [RtmpUrlVhost][v1_CN_RtmpUrlVhost] | 648 | * v1.0, 2014-01-12, add wiki [HowToAskQuestion][v1_CN_HowToAskQuestion], [RtmpUrlVhost][v1_CN_RtmpUrlVhost] |
| 649 | * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually. | 649 | * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually. |
| 650 | -* v1.0, 2014-01-05, add wiki [Build][v1_CN_Build], [Performance][v1_CN_Performance], [Forward][v1_CN_Forward] | 650 | +* v1.0, 2014-01-05, add wiki [Build][v2_CN_Build], [Performance][v1_CN_Performance], [Forward][v1_CN_Forward] |
| 651 | * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance. | 651 | * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance. |
| 652 | * v1.0, 2013-12-27, merge from wenjie, the bandwidth test feature. | 652 | * v1.0, 2013-12-27, merge from wenjie, the bandwidth test feature. |
| 653 | * <strong>v0.9, 2013-12-25, [v0.9][r0.9] released. 20926 lines.</strong> | 653 | * <strong>v0.9, 2013-12-25, [v0.9][r0.9] released. 20926 lines.</strong> |
| @@ -665,7 +665,7 @@ Remark: | @@ -665,7 +665,7 @@ Remark: | ||
| 665 | * v0.9, 2013-12-14, refine the thread model for the retry threads. | 665 | * v0.9, 2013-12-14, refine the thread model for the retry threads. |
| 666 | * v0.9, 2013-12-10, auto install depends tools/libs on centos/ubuntu. | 666 | * v0.9, 2013-12-10, auto install depends tools/libs on centos/ubuntu. |
| 667 | * <strong>v0.8, 2013-12-08, [v0.8][r0.8] released. 19186 lines.</strong> | 667 | * <strong>v0.8, 2013-12-08, [v0.8][r0.8] released. 19186 lines.</strong> |
| 668 | -* v0.8, 2013-12-08, support [http hooks][v1_CN_HTTPCallback]: on_connect/close/publish/unpublish/play/stop. | 668 | +* v0.8, 2013-12-08, support [http hooks][v2_CN_HTTPCallback]: on_connect/close/publish/unpublish/play/stop. |
| 669 | * v0.8, 2013-12-08, support multiple http hooks for a event. | 669 | * v0.8, 2013-12-08, support multiple http hooks for a event. |
| 670 | * v0.8, 2013-12-07, support http callback hooks, on_connect. | 670 | * v0.8, 2013-12-07, support http callback hooks, on_connect. |
| 671 | * v0.8, 2013-12-07, support network based cli and json result, add CherryPy 3.2.4. | 671 | * v0.8, 2013-12-07, support network based cli and json result, add CherryPy 3.2.4. |
| @@ -966,8 +966,8 @@ Winlin | @@ -966,8 +966,8 @@ Winlin | ||
| 966 | [v1_EN_SampleARM]: https://github.com/ossrs/srs/wiki/v1_EN_SampleARM | 966 | [v1_EN_SampleARM]: https://github.com/ossrs/srs/wiki/v1_EN_SampleARM |
| 967 | [v1_CN_SampleIngest]: https://github.com/ossrs/srs/wiki/v1_CN_SampleIngest | 967 | [v1_CN_SampleIngest]: https://github.com/ossrs/srs/wiki/v1_CN_SampleIngest |
| 968 | [v1_EN_SampleIngest]: https://github.com/ossrs/srs/wiki/v1_EN_SampleIngest | 968 | [v1_EN_SampleIngest]: https://github.com/ossrs/srs/wiki/v1_EN_SampleIngest |
| 969 | -[v1_CN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v1_CN_SampleHTTP | ||
| 970 | -[v1_EN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v1_EN_SampleHTTP | 969 | +[v2_CN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHTTP |
| 970 | +[v2_EN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v2_EN_SampleHTTP | ||
| 971 | [v1_CN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo | 971 | [v1_CN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo |
| 972 | [v1_EN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_EN_SampleDemo | 972 | [v1_EN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_EN_SampleDemo |
| 973 | [v2_CN_SrsLibrtmp2]: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data | 973 | [v2_CN_SrsLibrtmp2]: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data |
| @@ -990,28 +990,28 @@ Winlin | @@ -990,28 +990,28 @@ Winlin | ||
| 990 | [v1_EN_Performance]: https://github.com/ossrs/srs/wiki/v1_EN_Performance | 990 | [v1_EN_Performance]: https://github.com/ossrs/srs/wiki/v1_EN_Performance |
| 991 | [v1_CN_DeliveryRTMP]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryRTMP | 991 | [v1_CN_DeliveryRTMP]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryRTMP |
| 992 | [v1_EN_DeliveryRTMP]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryRTMP | 992 | [v1_EN_DeliveryRTMP]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryRTMP |
| 993 | -[v1_CN_Edge]: https://github.com/ossrs/srs/wiki/v1_CN_Edge | ||
| 994 | -[v1_EN_Edge]: https://github.com/ossrs/srs/wiki/v1_EN_Edge | 993 | +[v2_CN_Edge]: https://github.com/ossrs/srs/wiki/v2_CN_Edge |
| 994 | +[v2_EN_Edge]: https://github.com/ossrs/srs/wiki/v2_EN_Edge | ||
| 995 | [v1_CN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_CN_RtmpUrlVhost | 995 | [v1_CN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_CN_RtmpUrlVhost |
| 996 | [v1_EN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_EN_RtmpUrlVhost | 996 | [v1_EN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_EN_RtmpUrlVhost |
| 997 | [v1_CN_RTMPHandshake]: https://github.com/ossrs/srs/wiki/v1_CN_RTMPHandshake | 997 | [v1_CN_RTMPHandshake]: https://github.com/ossrs/srs/wiki/v1_CN_RTMPHandshake |
| 998 | [v1_EN_RTMPHandshake]: https://github.com/ossrs/srs/wiki/v1_EN_RTMPHandshake | 998 | [v1_EN_RTMPHandshake]: https://github.com/ossrs/srs/wiki/v1_EN_RTMPHandshake |
| 999 | -[v1_CN_HTTPServer]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPServer | ||
| 1000 | -[v1_EN_HTTPServer]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPServer | ||
| 1001 | -[v1_CN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHLS | ||
| 1002 | -[v1_EN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHLS | ||
| 1003 | -[v1_CN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHLS#hlsaudioonly | ||
| 1004 | -[v1_EN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHLS#hlsaudioonly | 999 | +[v2_CN_HTTPServer]: https://github.com/ossrs/srs/wiki/v2_CN_HTTPServer |
| 1000 | +[v2_EN_HTTPServer]: https://github.com/ossrs/srs/wiki/v2_EN_HTTPServer | ||
| 1001 | +[v2_CN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS | ||
| 1002 | +[v2_EN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHLS | ||
| 1003 | +[v2_CN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS#hlsaudioonly | ||
| 1004 | +[v2_EN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHLS#hlsaudioonly | ||
| 1005 | [v1_CN_Reload]: https://github.com/ossrs/srs/wiki/v1_CN_Reload | 1005 | [v1_CN_Reload]: https://github.com/ossrs/srs/wiki/v1_CN_Reload |
| 1006 | [v1_EN_Reload]: https://github.com/ossrs/srs/wiki/v1_EN_Reload | 1006 | [v1_EN_Reload]: https://github.com/ossrs/srs/wiki/v1_EN_Reload |
| 1007 | -[v1_CN_LowLatency2]: https://github.com/ossrs/srs/wiki/v1_CN_LowLatency#gop-cache | ||
| 1008 | -[v1_EN_LowLatency2]: https://github.com/ossrs/srs/wiki/v1_EN_LowLatency#gop-cache | 1007 | +[v2_CN_LowLatency2]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#gop-cache |
| 1008 | +[v2_EN_LowLatency2]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency#gop-cache | ||
| 1009 | [v1_CN_Forward]: https://github.com/ossrs/srs/wiki/v1_CN_Forward | 1009 | [v1_CN_Forward]: https://github.com/ossrs/srs/wiki/v1_CN_Forward |
| 1010 | [v1_EN_Forward]: https://github.com/ossrs/srs/wiki/v1_EN_Forward | 1010 | [v1_EN_Forward]: https://github.com/ossrs/srs/wiki/v1_EN_Forward |
| 1011 | -[v1_CN_FFMPEG]: https://github.com/ossrs/srs/wiki/v1_CN_FFMPEG | ||
| 1012 | -[v1_EN_FFMPEG]: https://github.com/ossrs/srs/wiki/v1_EN_FFMPEG | ||
| 1013 | -[v1_CN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPCallback | ||
| 1014 | -[v1_EN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPCallback | 1011 | +[v2_CN_FFMPEG]: https://github.com/ossrs/srs/wiki/v2_CN_FFMPEG |
| 1012 | +[v2_EN_FFMPEG]: https://github.com/ossrs/srs/wiki/v2_EN_FFMPEG | ||
| 1013 | +[v2_CN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v2_CN_HTTPCallback | ||
| 1014 | +[v2_EN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v2_EN_HTTPCallback | ||
| 1015 | [v1_CN_BandwidthTestTool]: https://github.com/ossrs/srs/wiki/v1_CN_BandwidthTestTool | 1015 | [v1_CN_BandwidthTestTool]: https://github.com/ossrs/srs/wiki/v1_CN_BandwidthTestTool |
| 1016 | [v1_EN_BandwidthTestTool]: https://github.com/ossrs/srs/wiki/v1_EN_BandwidthTestTool | 1016 | [v1_EN_BandwidthTestTool]: https://github.com/ossrs/srs/wiki/v1_EN_BandwidthTestTool |
| 1017 | [v1_CN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo | 1017 | [v1_CN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo |
| @@ -1024,12 +1024,12 @@ Winlin | @@ -1024,12 +1024,12 @@ Winlin | ||
| 1024 | [v1_EN_LinuxService]: https://github.com/ossrs/srs/wiki/v1_EN_LinuxService | 1024 | [v1_EN_LinuxService]: https://github.com/ossrs/srs/wiki/v1_EN_LinuxService |
| 1025 | [v1_CN_RTMP-ATC]: https://github.com/ossrs/srs/wiki/v1_CN_RTMP-ATC | 1025 | [v1_CN_RTMP-ATC]: https://github.com/ossrs/srs/wiki/v1_CN_RTMP-ATC |
| 1026 | [v1_EN_RTMP-ATC]: https://github.com/ossrs/srs/wiki/v1_EN_RTMP-ATC | 1026 | [v1_EN_RTMP-ATC]: https://github.com/ossrs/srs/wiki/v1_EN_RTMP-ATC |
| 1027 | -[v1_CN_HTTPApi]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPApi | ||
| 1028 | -[v1_EN_HTTPApi]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPApi | 1027 | +[v2_CN_HTTPApi]: https://github.com/ossrs/srs/wiki/v2_CN_HTTPApi |
| 1028 | +[v2_EN_HTTPApi]: https://github.com/ossrs/srs/wiki/v2_EN_HTTPApi | ||
| 1029 | [v1_CN_Ingest]: https://github.com/ossrs/srs/wiki/v1_CN_Ingest | 1029 | [v1_CN_Ingest]: https://github.com/ossrs/srs/wiki/v1_CN_Ingest |
| 1030 | [v1_EN_Ingest]: https://github.com/ossrs/srs/wiki/v1_EN_Ingest | 1030 | [v1_EN_Ingest]: https://github.com/ossrs/srs/wiki/v1_EN_Ingest |
| 1031 | -[v1_CN_DVR]: https://github.com/ossrs/srs/wiki/v1_CN_DVR | ||
| 1032 | -[v1_EN_DVR]: https://github.com/ossrs/srs/wiki/v1_EN_DVR | 1031 | +[v2_CN_DVR]: https://github.com/ossrs/srs/wiki/v2_CN_DVR |
| 1032 | +[v2_EN_DVR]: https://github.com/ossrs/srs/wiki/v2_EN_DVR | ||
| 1033 | [v1_CN_SrsLog]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLog | 1033 | [v1_CN_SrsLog]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLog |
| 1034 | [v1_EN_SrsLog]: https://github.com/ossrs/srs/wiki/v1_EN_SrsLog | 1034 | [v1_EN_SrsLog]: https://github.com/ossrs/srs/wiki/v1_EN_SrsLog |
| 1035 | [v1_CN_DRM2]: https://github.com/ossrs/srs/wiki/v1_CN_DRM#tokentraverse | 1035 | [v1_CN_DRM2]: https://github.com/ossrs/srs/wiki/v1_CN_DRM#tokentraverse |
| @@ -1046,8 +1046,8 @@ Winlin | @@ -1046,8 +1046,8 @@ Winlin | ||
| 1046 | [v2_EN_Security]: https://github.com/ossrs/srs/wiki/v2_EN_Security | 1046 | [v2_EN_Security]: https://github.com/ossrs/srs/wiki/v2_EN_Security |
| 1047 | [v2_CN_DeliveryHttpStream]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream | 1047 | [v2_CN_DeliveryHttpStream]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream |
| 1048 | [v2_EN_DeliveryHttpStream]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHttpStream | 1048 | [v2_EN_DeliveryHttpStream]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHttpStream |
| 1049 | -[v1_CN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHDS | ||
| 1050 | -[v1_EN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHDS | 1049 | +[v2_CN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHDS |
| 1050 | +[v2_EN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHDS | ||
| 1051 | [v2_CN_Streamer2]: https://github.com/ossrs/srs/wiki/v2_CN_Streamer#push-http-flv-to-srs | 1051 | [v2_CN_Streamer2]: https://github.com/ossrs/srs/wiki/v2_CN_Streamer#push-http-flv-to-srs |
| 1052 | [v2_EN_Streamer2]: https://github.com/ossrs/srs/wiki/v2_EN_Streamer#push-http-flv-to-srs | 1052 | [v2_EN_Streamer2]: https://github.com/ossrs/srs/wiki/v2_EN_Streamer#push-http-flv-to-srs |
| 1053 | [v2_CN_SampleHttpFlv]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHttpFlv | 1053 | [v2_CN_SampleHttpFlv]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHttpFlv |
| @@ -1060,18 +1060,18 @@ Winlin | @@ -1060,18 +1060,18 @@ Winlin | ||
| 1060 | [v1_CN_Performance#performancereport4k]: https://github.com/ossrs/srs/wiki/v1_CN_Performance#performancereport4k | 1060 | [v1_CN_Performance#performancereport4k]: https://github.com/ossrs/srs/wiki/v1_CN_Performance#performancereport4k |
| 1061 | [v1_CN_DRM#tokentraverse]: https://github.com/ossrs/srs/wiki/v1_CN_DRM#tokentraverse | 1061 | [v1_CN_DRM#tokentraverse]: https://github.com/ossrs/srs/wiki/v1_CN_DRM#tokentraverse |
| 1062 | [v1_CN_RaspberryPi]: https://github.com/ossrs/srs/wiki/v1_CN_RaspberryPi | 1062 | [v1_CN_RaspberryPi]: https://github.com/ossrs/srs/wiki/v1_CN_RaspberryPi |
| 1063 | -[v1_CN_SrsLibrtmp]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLibrtmp | ||
| 1064 | -[v1_CN_Build]: https://github.com/ossrs/srs/wiki/v1_CN_Build | ||
| 1065 | -[v1_CN_LowLatency]: https://github.com/ossrs/srs/wiki/v1_CN_LowLatency | 1063 | +[v2_CN_SrsLibrtmp]: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp |
| 1064 | +[v2_CN_Build]: https://github.com/ossrs/srs/wiki/v2_CN_Build | ||
| 1065 | +[v2_CN_LowLatency]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency | ||
| 1066 | [v1_CN_HowToAskQuestion]: https://github.com/ossrs/srs/wiki/v1_CN_HowToAskQuestion | 1066 | [v1_CN_HowToAskQuestion]: https://github.com/ossrs/srs/wiki/v1_CN_HowToAskQuestion |
| 1067 | -[v1_CN_Build]: https://github.com/ossrs/srs/wiki/v1_CN_Build | 1067 | +[v2_CN_Build]: https://github.com/ossrs/srs/wiki/v2_CN_Build |
| 1068 | [v1_CN_Performance]: https://github.com/ossrs/srs/wiki/v1_CN_Performance | 1068 | [v1_CN_Performance]: https://github.com/ossrs/srs/wiki/v1_CN_Performance |
| 1069 | [v1_CN_RaspberryPi]: https://github.com/ossrs/srs/wiki/v1_CN_RaspberryPi | 1069 | [v1_CN_RaspberryPi]: https://github.com/ossrs/srs/wiki/v1_CN_RaspberryPi |
| 1070 | [v2_CN_LowLatency#merged-read]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#merged-read | 1070 | [v2_CN_LowLatency#merged-read]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#merged-read |
| 1071 | [v1_CN_Product]: https://github.com/ossrs/srs/wiki/v1_CN_Product | 1071 | [v1_CN_Product]: https://github.com/ossrs/srs/wiki/v1_CN_Product |
| 1072 | [v1_CN_ServerSideScript]: https://github.com/ossrs/srs/wiki/v1_CN_ServerSideScript | 1072 | [v1_CN_ServerSideScript]: https://github.com/ossrs/srs/wiki/v1_CN_ServerSideScript |
| 1073 | [v2_EN_LowLatency#merged-write]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency#merged-write | 1073 | [v2_EN_LowLatency#merged-write]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency#merged-write |
| 1074 | -[v1_CN_IDE]: https://github.com/ossrs/srs/wiki/v1_CN_IDE | 1074 | +[v2_CN_IDE]: https://github.com/ossrs/srs/wiki/v2_CN_IDE |
| 1075 | [v2_CN_LowLatency#merged-write]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#merged-write | 1075 | [v2_CN_LowLatency#merged-write]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#merged-write |
| 1076 | 1076 | ||
| 1077 | [bug #213]: https://github.com/ossrs/srs/issues/213 | 1077 | [bug #213]: https://github.com/ossrs/srs/issues/213 |
-
请 注册 或 登录 后发表评论