正在显示
1 个修改的文件
包含
4 行增加
和
4 行删除
@@ -37,14 +37,14 @@ git clone https://code.csdn.net/winlinvip/srs-csdn.git | @@ -37,14 +37,14 @@ git clone https://code.csdn.net/winlinvip/srs-csdn.git | ||
37 | SRS(SIMPLE RTMP Server) over state-threads created in 2013.10. | 37 | SRS(SIMPLE RTMP Server) over state-threads created in 2013.10. |
38 | 38 | ||
39 | SRS is a simple, [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryRTMP)/[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS), | 39 | SRS is a simple, [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryRTMP)/[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS), |
40 | -[high-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance), single/multiple(plan) processes, edge(plan)/origin live server, | 40 | +[high-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance), single/multiple(plan) processes, edge/origin live server, |
41 | [x86/x64/arm](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm), | 41 | [x86/x64/arm](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm), |
42 | compile depends on [st](http://sourceforge.net/projects/state-threads)(required), [ssl](http://www.openssl.org/) and [http-parser](https://github.com/joyent/http-parser), | 42 | compile depends on [st](http://sourceforge.net/projects/state-threads)(required), [ssl](http://www.openssl.org/) and [http-parser](https://github.com/joyent/http-parser), |
43 | use [nginx](http://nginx.org/), [ffmpeg](http://ffmpeg.org/) and [cherrypy](http://www.cherrypy.org/) as external tools. that is, only need st to run srs for | 43 | use [nginx](http://nginx.org/), [ffmpeg](http://ffmpeg.org/) and [cherrypy](http://www.cherrypy.org/) as external tools. that is, only need st to run srs for |
44 | minimum run. see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build). | 44 | minimum run. see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build). |
45 | 45 | ||
46 | SRS supports [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/RtmpUrlVhost), | 46 | SRS supports [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/RtmpUrlVhost), |
47 | -rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryRTMP), client/edge pull), [ingester(srs pull)](https://github.com/winlinvip/simple-rtmp-server/wiki/Ingest), | 47 | +rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryRTMP), client/[edge](https://github.com/winlinvip/simple-rtmp-server/wiki/Edge) pull), [ingester(srs pull)](https://github.com/winlinvip/simple-rtmp-server/wiki/Ingest), |
48 | [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), | 48 | [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), |
49 | [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback), [http api](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPApi), | 49 | [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback), [http api](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPApi), |
50 | [http server](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPServer), [dvr](https://github.com/winlinvip/simple-rtmp-server/wiki/DVR), [FlashP2P](https://github.com/winlinvip/simple-rtmp-server/wiki/FlashP2P). | 50 | [http server](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPServer), [dvr](https://github.com/winlinvip/simple-rtmp-server/wiki/DVR), [FlashP2P](https://github.com/winlinvip/simple-rtmp-server/wiki/FlashP2P). |
@@ -127,7 +127,7 @@ Supported operating systems and hardware: | @@ -127,7 +127,7 @@ Supported operating systems and hardware: | ||
127 | ## Summary | 127 | ## Summary |
128 | 1. Simple: also stable enough. | 128 | 1. Simple: also stable enough. |
129 | 1. [High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance): single-thread, async socket, event/st-thread driven. | 129 | 1. [High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance): single-thread, async socket, event/st-thread driven. |
130 | -1. Support RTMP edge server(plan), support origin server. | 130 | +1. Support RTMP [edge](https://github.com/winlinvip/simple-rtmp-server/wiki/Edge) server, support origin server. |
131 | 1. RTMP without vod streaming, live streaming only. | 131 | 1. RTMP without vod streaming, live streaming only. |
132 | 1. Support multiple processes, support single process. | 132 | 1. Support multiple processes, support single process. |
133 | 1. Support vhost, support \_\_defaultVhost\_\_. | 133 | 1. Support vhost, support \_\_defaultVhost\_\_. |
@@ -160,9 +160,9 @@ Supported operating systems and hardware: | @@ -160,9 +160,9 @@ Supported operating systems and hardware: | ||
160 | 1. Support ingest RTSP(RTP, SDP) stream to RTMP. | 160 | 1. Support ingest RTSP(RTP, SDP) stream to RTMP. |
161 | 1. Support dvr(record live to flv file for vod) | 161 | 1. Support dvr(record live to flv file for vod) |
162 | 1. Support live flashP2P(integrated by chnvideo VDN). | 162 | 1. Support live flashP2P(integrated by chnvideo VDN). |
163 | +1. [dev] Support RTMP [edge](https://github.com/winlinvip/simple-rtmp-server/wiki/Edge) server, push/pull stream from any RTMP server | ||
163 | 1. [plan] Support file to hls vod stream. | 164 | 1. [plan] Support file to hls vod stream. |
164 | 1. [plan] Support system full utest on gtest. | 165 | 1. [plan] Support system full utest on gtest. |
165 | -1. [plan] Support RTMP edge server, push/pull stream from any RTMP server | ||
166 | 1. [plan] Support multiple processes, for both origin and edge | 166 | 1. [plan] Support multiple processes, for both origin and edge |
167 | 1. [no-plan] Support adobe RTMFP(flash p2p) protocol. | 167 | 1. [no-plan] Support adobe RTMFP(flash p2p) protocol. |
168 | 1. [no-plan] Support adobe flash refer/token/swf verification. | 168 | 1. [no-plan] Support adobe flash refer/token/swf verification. |
-
请 注册 或 登录 后发表评论