正在显示
33 个修改的文件
包含
160 行增加
和
160 行删除
@@ -10,13 +10,13 @@ SRS定位是运营级的互联网直播服务器集群,追求更好的概念 | @@ -10,13 +10,13 @@ SRS定位是运营级的互联网直播服务器集群,追求更好的概念 | ||
10 | 其他[more...](http://www.ossrs.net/srs.release/releases/)<br/> | 10 | 其他[more...](http://www.ossrs.net/srs.release/releases/)<br/> |
11 | 同类产品:[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https://github.com/wenjiegit/Bull-Live-Encoder), [NGINX-RTMP](https://github.com/arut/nginx-rtmp-module), [CRTMPD](http://www.rtmpd.com/), [RED5](http://www.red5.org/), [WOWZA](http://www.wowza.com/), [FMS/AMS](http://www.adobe.com/products/adobe-media-server-standard.html) | 11 | 同类产品:[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https://github.com/wenjiegit/Bull-Live-Encoder), [NGINX-RTMP](https://github.com/arut/nginx-rtmp-module), [CRTMPD](http://www.rtmpd.com/), [RED5](http://www.red5.org/), [WOWZA](http://www.wowza.com/), [FMS/AMS](http://www.adobe.com/products/adobe-media-server-standard.html) |
12 | 12 | ||
13 | -获得源码(github): [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server) [GIT使用方法](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Git) | 13 | +获得源码(github): [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server) [GIT使用方法](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git) |
14 | 14 | ||
15 | ```bash | 15 | ```bash |
16 | git clone https://github.com/winlinvip/simple-rtmp-server.git | 16 | git clone https://github.com/winlinvip/simple-rtmp-server.git |
17 | ``` | 17 | ``` |
18 | 18 | ||
19 | -获得源码(国内CSDN镜像): [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn) [GIT使用方法](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Git) | 19 | +获得源码(国内CSDN镜像): [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn) [GIT使用方法](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git) |
20 | 20 | ||
21 | ```bash | 21 | ```bash |
22 | git clone https://code.csdn.net/winlinvip/srs-csdn.git | 22 | git clone https://code.csdn.net/winlinvip/srs-csdn.git |
@@ -25,7 +25,7 @@ git clone https://code.csdn.net/winlinvip/srs-csdn.git | @@ -25,7 +25,7 @@ git clone https://code.csdn.net/winlinvip/srs-csdn.git | ||
25 | 报告问题(BugReport): [https://github.com/winlinvip/simple-rtmp-server/issues/new](https://github.com/winlinvip/simple-rtmp-server/issues/new)<br/> | 25 | 报告问题(BugReport): [https://github.com/winlinvip/simple-rtmp-server/issues/new](https://github.com/winlinvip/simple-rtmp-server/issues/new)<br/> |
26 | 中文资料(Wiki): [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki) <br/> | 26 | 中文资料(Wiki): [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki) <br/> |
27 | 使用步骤(Usage): [https://github.com/winlinvip/simple-rtmp-server#usage](#usage) <br/> | 27 | 使用步骤(Usage): [https://github.com/winlinvip/simple-rtmp-server#usage](#usage) <br/> |
28 | -公用机器(LiveShow): [https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LiveShow](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LiveShow) <br/> | 28 | +公用机器(LiveShow): [https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LiveShow](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LiveShow) <br/> |
29 | 捐款(Donation): [GitHub](http://winlinvip.github.io/srs.release/donation/index.html) | 29 | 捐款(Donation): [GitHub](http://winlinvip.github.io/srs.release/donation/index.html) |
30 | 或 [阿里云镜像](http://www.ossrs.net/srs.release/donation/index.html) ,查看 | 30 | 或 [阿里云镜像](http://www.ossrs.net/srs.release/donation/index.html) ,查看 |
31 | [捐献墙(Donations)](https://github.com/winlinvip/simple-rtmp-server/blob/master/DONATIONS.txt)<br/> | 31 | [捐献墙(Donations)](https://github.com/winlinvip/simple-rtmp-server/blob/master/DONATIONS.txt)<br/> |
@@ -34,18 +34,18 @@ git clone https://code.csdn.net/winlinvip/srs-csdn.git | @@ -34,18 +34,18 @@ git clone https://code.csdn.net/winlinvip/srs-csdn.git | ||
34 | 34 | ||
35 | SRS(SIMPLE RTMP Server) over state-threads created in 2013.10. | 35 | SRS(SIMPLE RTMP Server) over state-threads created in 2013.10. |
36 | 36 | ||
37 | -SRS is a simple, [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryRTMP)/[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS), | ||
38 | -[high-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Performance), single/multiple(plan) processes, edge/origin live server, | ||
39 | -[x86/x64/arm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm), | 37 | +SRS is a simple, [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP)/[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS), |
38 | +[high-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance), single/multiple(plan) processes, edge/origin live server, | ||
39 | +[x86/x64/arm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm), | ||
40 | 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), | 40 | 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), |
41 | 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 | 41 | 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 |
42 | -minimum run. see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Build). | 42 | +minimum run. see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build). |
43 | 43 | ||
44 | -SRS supports [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RtmpUrlVhost), | ||
45 | -rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryRTMP), client/[edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge) pull), [ingester(srs pull)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Ingest), | ||
46 | -[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS), [HLS audio only](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS#hlsaudioonly), [transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG), | ||
47 | -[forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG), [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPCallback), [http api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPApi), | ||
48 | -[http server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPServer), [dvr](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DVR). | 44 | +SRS supports [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RtmpUrlVhost), |
45 | +rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP), client/[edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge) pull), [ingester(srs pull)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Ingest), | ||
46 | +[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS), [HLS audio only](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS#hlsaudioonly), [transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG), | ||
47 | +[forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG), [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback), [http api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi), | ||
48 | +[http server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer), [dvr](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR). | ||
49 | 49 | ||
50 | Release: [http://winlinvip.github.io/srs.release](http://winlinvip.github.io/srs.release) <br/> | 50 | Release: [http://winlinvip.github.io/srs.release](http://winlinvip.github.io/srs.release) <br/> |
51 | Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) <br/> | 51 | Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) <br/> |
@@ -70,7 +70,7 @@ people who have submitted patches, reported bugs, added translations, helped | @@ -70,7 +70,7 @@ people who have submitted patches, reported bugs, added translations, helped | ||
70 | answer newbie questions, and generally made SRS that much better: [AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt) | 70 | answer newbie questions, and generally made SRS that much better: [AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt) |
71 | 71 | ||
72 | A big THANK YOU goes to: | 72 | A big THANK YOU goes to: |
73 | -* [chnvideo](chnvideo.com) co-founders([wiseyoung](mailto:wiseyoung@chnvideo.com), [trueice](mailto:trueice@chnvideo.com), [leijian](mailto:leijian@chnvideo.com)) for [big supports](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Product#bigthanks). | 73 | +* [chnvideo](chnvideo.com) co-founders([wiseyoung](mailto:wiseyoung@chnvideo.com), [trueice](mailto:trueice@chnvideo.com), [leijian](mailto:leijian@chnvideo.com)) for [big supports](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#bigthanks). |
74 | * Genes amd Mabbott for creating [st](https://github.com/winlinvip/state-threads)([state-threads](http://sourceforge.net/projects/state-threads/)). | 74 | * Genes amd Mabbott for creating [st](https://github.com/winlinvip/state-threads)([state-threads](http://sourceforge.net/projects/state-threads/)). |
75 | * Michael Talyanksy for introducing us to use st. | 75 | * Michael Talyanksy for introducing us to use st. |
76 | * Roman Arutyunyan for creating [nginx-rtmp](https://github.com/arut/nginx-rtmp-module) for SRS to refer to. | 76 | * Roman Arutyunyan for creating [nginx-rtmp](https://github.com/arut/nginx-rtmp-module) for SRS to refer to. |
@@ -89,7 +89,7 @@ cd simple-rtmp-server/trunk | @@ -89,7 +89,7 @@ cd simple-rtmp-server/trunk | ||
89 | </pre> | 89 | </pre> |
90 | 90 | ||
91 | <strong>Step 2:</strong> build SRS, | 91 | <strong>Step 2:</strong> build SRS, |
92 | -<strong>Requires Centos6.x/Ubuntu12 32/64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Build)</strong> | 92 | +<strong>Requires Centos6.x/Ubuntu12 32/64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build)</strong> |
93 | 93 | ||
94 | <pre> | 94 | <pre> |
95 | ./configure && make | 95 | ./configure && make |
@@ -102,23 +102,23 @@ cd simple-rtmp-server/trunk | @@ -102,23 +102,23 @@ cd simple-rtmp-server/trunk | ||
102 | </pre> | 102 | </pre> |
103 | 103 | ||
104 | <strong>See also:</strong> | 104 | <strong>See also:</strong> |
105 | -* [Usage: How to delivery RTMP?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleRTMP) | ||
106 | -* [Usage: How to delivery HLS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHLS) | ||
107 | -* [Usage: How to delivery HLS for other codec?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleTranscode2HLS) | ||
108 | -* [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleFFMPEG) | ||
109 | -* [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleForward) | ||
110 | -* [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleRealtime) | ||
111 | -* [Usage: How to deploy SRS on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleARM) | ||
112 | -* [Usage: How to ingest file/stream/device to SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleIngest) | ||
113 | -* [Usage: How to use SRS-HTTP-server to delivery HTTP/HLS stream?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHTTP) | ||
114 | -* [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo) | ||
115 | -* [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Sample) | ||
116 | -* [Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Product) | 105 | +* [Usage: How to delivery RTMP?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRTMP) |
106 | +* [Usage: How to delivery HLS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS) | ||
107 | +* [Usage: How to delivery HLS for other codec?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleTranscode2HLS) | ||
108 | +* [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleFFMPEG) | ||
109 | +* [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleForward) | ||
110 | +* [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRealtime) | ||
111 | +* [Usage: How to deploy SRS on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleARM) | ||
112 | +* [Usage: How to ingest file/stream/device to SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleIngest) | ||
113 | +* [Usage: How to use SRS-HTTP-server to delivery HTTP/HLS stream?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHTTP) | ||
114 | +* [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo) | ||
115 | +* [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Sample) | ||
116 | +* [Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product) | ||
117 | 117 | ||
118 | ## Wiki | 118 | ## Wiki |
119 | 119 | ||
120 | Please select your language: | 120 | Please select your language: |
121 | -* [English](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_ENHome) | 121 | +* [English](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Home) |
122 | * [Chinese](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Home) | 122 | * [Chinese](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Home) |
123 | 123 | ||
124 | ## Donation | 124 | ## Donation |
@@ -136,40 +136,40 @@ Supported operating systems and hardware: | @@ -136,40 +136,40 @@ Supported operating systems and hardware: | ||
136 | 136 | ||
137 | ## Summary | 137 | ## Summary |
138 | 1. 简洁稳定:Simple, also stable enough. | 138 | 1. 简洁稳定:Simple, also stable enough. |
139 | -1. 高性能:[High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Performance): single-thread, async socket, event/st-thread driven. | ||
140 | -1. 高并发:[High-concurrency](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Performance), 1800 connections(500kbps), 900Mbps, CPU 90.2%, 41MB | ||
141 | -1. RTMP源站:Support [RTMP Origin Server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryRTMP). | ||
142 | -1. CDN边缘(上下行加速):Support [RTMP Edge Server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge) for CDN, push/pull stream from any RTMP server | 139 | +1. 高性能:[High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance): single-thread, async socket, event/st-thread driven. |
140 | +1. 高并发:[High-concurrency](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance), 1800 connections(500kbps), 900Mbps, CPU 90.2%, 41MB | ||
141 | +1. RTMP源站:Support [RTMP Origin Server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP). | ||
142 | +1. CDN边缘(上下行加速):Support [RTMP Edge Server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge) for CDN, push/pull stream from any RTMP server | ||
143 | 1. 单进程(无多进程):Support single process; no multiple processes. | 143 | 1. 单进程(无多进程):Support single process; no multiple processes. |
144 | -1. 支持Vhost:Support [Vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RtmpUrlVhost), support \_\_defaultVhost\_\_. | ||
145 | -1. 直播(无点播):Support [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryRTMP) live streaming; no vod streaming. | ||
146 | -1. 苹果HLS:Support Apple [HLS(m3u8)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS) live streaming. | ||
147 | -1. 支持纯音频HLS:Support [HLS audio-only](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS#hlsaudioonly) live streaming. | ||
148 | -1. 支持Reload:Support [Reload](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Reload) config to enable changes. | ||
149 | -1. 支持GopCache:Support [cache last gop](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LowLatency#gop-cache) for flash player to fast startup. | 144 | +1. 支持Vhost:Support [Vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RtmpUrlVhost), support \_\_defaultVhost\_\_. |
145 | +1. 直播(无点播):Support [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP) live streaming; no vod streaming. | ||
146 | +1. 苹果HLS:Support Apple [HLS(m3u8)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS) live streaming. | ||
147 | +1. 支持纯音频HLS:Support [HLS audio-only](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS#hlsaudioonly) live streaming. | ||
148 | +1. 支持Reload:Support [Reload](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Reload) config to enable changes. | ||
149 | +1. 支持GopCache:Support [cache last gop](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LowLatency#gop-cache) for flash player to fast startup. | ||
150 | 1. 侦听多端口:Support listen at multiple ports. | 150 | 1. 侦听多端口:Support listen at multiple ports. |
151 | 1. 长时间推流:Support long time(>4.6hours) publish/play. | 151 | 1. 长时间推流:Support long time(>4.6hours) publish/play. |
152 | -1. 转发流:Support [Forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Forward) in master-slave mode. | ||
153 | -1. 流转码:Support live stream [Transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG) by ffmpeg. | ||
154 | -1. 支持FFMPEG滤镜:Support [ffmpeg](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG) filters(logo/overlay/crop), x264 params, copy/vn/an. | ||
155 | -1. 只转码音频:Support audio [transcode](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG) only, speex/mp3 to aac | ||
156 | -1. 支持HTTP回调:Support [http callback api hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPCallback)(for authentication and injection). | ||
157 | -1. 带宽测速:Support [bandwidth test](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_BandwidthTestTool) api and flash client. | ||
158 | -1. 演示页面:Player, publisher(encoder), and [demo pages(jquery+bootstrap)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo). | ||
159 | -1. 视频会议演示:[Demo](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo) video meeting or chat(SRS+cherrypy+jquery+bootstrap). | 152 | +1. 转发流:Support [Forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Forward) in master-slave mode. |
153 | +1. 流转码:Support live stream [Transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG) by ffmpeg. | ||
154 | +1. 支持FFMPEG滤镜:Support [ffmpeg](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG) filters(logo/overlay/crop), x264 params, copy/vn/an. | ||
155 | +1. 只转码音频:Support audio [transcode](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG) only, speex/mp3 to aac | ||
156 | +1. 支持HTTP回调:Support [http callback api hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback)(for authentication and injection). | ||
157 | +1. 带宽测速:Support [bandwidth test](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_BandwidthTestTool) api and flash client. | ||
158 | +1. 演示页面:Player, publisher(encoder), and [demo pages(jquery+bootstrap)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo). | ||
159 | +1. 视频会议演示:[Demo](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo) video meeting or chat(SRS+cherrypy+jquery+bootstrap). | ||
160 | 1. 中文Wiki:Full documents in [wiki](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Home), in Chineses. | 160 | 1. 中文Wiki:Full documents in [wiki](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Home), in Chineses. |
161 | -1. 客户端库:Support RTMP(play-publish) library: [srs-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLibrtmp) | ||
162 | -1. 支持ARM平台:Support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm)) with rtmp/ssl/hls/librtmp. | ||
163 | -1. 支持Init.d脚本:Support [init.d](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LinuxService) and packge script, log to file. | ||
164 | -1. 支持ATC:Support [RTMP ATC](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RTMP-ATC) for HLS/HDS to support backup(failover) | ||
165 | -1. 支持HTTP-RESTful-API:Support [HTTP RESTful management api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPApi). | ||
166 | -1. 采集流:Support [Ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Ingest) FILE/HTTP/RTMP/RTSP(RTP, SDP) to RTMP using external tools(e.g ffmepg). | ||
167 | -1. 支持录制:Support [DVR](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DVR), record live to flv file for vod. | ||
168 | -1. 可追溯日志:Support [tracable log, session based log](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLog). | ||
169 | -1. 支持FMS-Token穿越:Support DRM [token traverse](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DRM#tokentraverse) for fms origin authenticate. | 161 | +1. 客户端库:Support RTMP(play-publish) library: [srs-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLibrtmp) |
162 | +1. 支持ARM平台:Support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm)) with rtmp/ssl/hls/librtmp. | ||
163 | +1. 支持Init.d脚本:Support [init.d](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LinuxService) and packge script, log to file. | ||
164 | +1. 支持ATC:Support [RTMP ATC](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RTMP-ATC) for HLS/HDS to support backup(failover) | ||
165 | +1. 支持HTTP-RESTful-API:Support [HTTP RESTful management api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi). | ||
166 | +1. 采集流:Support [Ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Ingest) FILE/HTTP/RTMP/RTSP(RTP, SDP) to RTMP using external tools(e.g ffmepg). | ||
167 | +1. 支持录制:Support [DVR](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR), record live to flv file for vod. | ||
168 | +1. 可追溯日志:Support [tracable log, session based log](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLog). | ||
169 | +1. 支持FMS-Token穿越:Support DRM [token traverse](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DRM#tokentraverse) for fms origin authenticate. | ||
170 | 1. 全面的Utest:Support system full utest on gtest. | 170 | 1. 全面的Utest:Support system full utest on gtest. |
171 | -1. (不稳定)内嵌HTTP服务器:[experiment] Support embeded [HTTP server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHTTP) for hls(live/vod) | ||
172 | -1. (不稳定)FLV点播流:[experiment] Support [vod stream(http flv/hls vod stream)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FlvVodStream). | 171 | +1. (不稳定)内嵌HTTP服务器:[experiment] Support embeded [HTTP server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHTTP) for hls(live/vod) |
172 | +1. (不稳定)FLV点播流:[experiment] Support [vod stream(http flv/hls vod stream)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FlvVodStream). | ||
173 | 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech). | 173 | 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech). |
174 | 1. [no-plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92). | 174 | 1. [no-plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92). |
175 | 1. [no-plan] Support multiple processes, for both origin and edge | 175 | 1. [no-plan] Support multiple processes, for both origin and edge |
@@ -188,22 +188,22 @@ Supported operating systems and hardware: | @@ -188,22 +188,22 @@ Supported operating systems and hardware: | ||
188 | * 2014-06-27, [Release v1.0-mainline5](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline5), refine perf 3k+ clients, edge token traverse, [srs monitor](http://ossrs.net:1977), 30days online. 41573 lines.<br/> | 188 | * 2014-06-27, [Release v1.0-mainline5](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline5), refine perf 3k+ clients, edge token traverse, [srs monitor](http://ossrs.net:1977), 30days online. 41573 lines.<br/> |
189 | * 2014-05-28, [Release v1.0-mainline4](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline4), support heartbeat, tracable log, fix mem leak and bugs. 39200 lines.<br/> | 189 | * 2014-05-28, [Release v1.0-mainline4](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline4), support heartbeat, tracable log, fix mem leak and bugs. 39200 lines.<br/> |
190 | * 2014-05-18, [Release v1.0-mainline3](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline3), support mips, fms origin, json(http-api). 37594 lines.<br/> | 190 | * 2014-05-18, [Release v1.0-mainline3](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline3), support mips, fms origin, json(http-api). 37594 lines.<br/> |
191 | -* 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/v1_DVR), android, [edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge). 35255 lines.<br/> | ||
192 | -* 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/v1_SrsLinuxArm), [init.d](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LinuxService), http [server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPServer)/[api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPApi), [ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleIngest). 30000 lines.<br/> | ||
193 | -* 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/v1_SampleDemo). 20926 lines.<br/> | ||
194 | -* 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/v1_HTTPCallback), update [st_load](https://github.com/winlinvip/st-load). 19186 lines.<br/> | ||
195 | -* 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/v1_FFMPEG). 17605 lines.<br/> | ||
196 | -* 2013-11-29, [Release v0.6](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.6), support [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Forward) stream to origin/edge. 16094 lines.<br/> | ||
197 | -* 2013-11-26, [Release v0.5](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.5), support [HLS(m3u8)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS), fragment and window. 14449 lines.<br/> | ||
198 | -* 2013-11-10, [Release v0.4](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.4), support [reload](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Reload) config, pause, longtime publish/play. 12500 lines.<br/> | ||
199 | -* 2013-11-04, [Release v0.3](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.3), support [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RtmpUrlVhost), refer, gop cache, listen multiple ports. 11773 lines.<br/> | ||
200 | -* 2013-10-25, [Release v0.2](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.2), support [rtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RTMPHandshake) flash publish, h264, time jitter correct. 10125 lines.<br/> | ||
201 | -* 2013-10-23, [Release v0.1](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.1), support [rtmp FMLE/FFMPEG publish](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryRTMP), vp6. 8287 lines.<br/> | 191 | +* 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/v1_CN_DVR), android, [edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge). 35255 lines.<br/> |
192 | +* 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/v1_CN_SrsLinuxArm), [init.d](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LinuxService), http [server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer)/[api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi), [ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleIngest). 30000 lines.<br/> | ||
193 | +* 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/v1_CN_SampleDemo). 20926 lines.<br/> | ||
194 | +* 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/v1_CN_HTTPCallback), update [st_load](https://github.com/winlinvip/st-load). 19186 lines.<br/> | ||
195 | +* 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/v1_CN_FFMPEG). 17605 lines.<br/> | ||
196 | +* 2013-11-29, [Release v0.6](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.6), support [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Forward) stream to origin/edge. 16094 lines.<br/> | ||
197 | +* 2013-11-26, [Release v0.5](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.5), support [HLS(m3u8)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS), fragment and window. 14449 lines.<br/> | ||
198 | +* 2013-11-10, [Release v0.4](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.4), support [reload](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Reload) config, pause, longtime publish/play. 12500 lines.<br/> | ||
199 | +* 2013-11-04, [Release v0.3](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.3), support [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RtmpUrlVhost), refer, gop cache, listen multiple ports. 11773 lines.<br/> | ||
200 | +* 2013-10-25, [Release v0.2](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.2), support [rtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RTMPHandshake) flash publish, h264, time jitter correct. 10125 lines.<br/> | ||
201 | +* 2013-10-23, [Release v0.1](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.1), support [rtmp FMLE/FFMPEG publish](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP), vp6. 8287 lines.<br/> | ||
202 | * 2013-10-17, Created.<br/> | 202 | * 2013-10-17, Created.<br/> |
203 | 203 | ||
204 | ## History | 204 | ## History |
205 | * v1.0, 2014-10-24, fix [#186](https://github.com/winlinvip/simple-rtmp-server/issues/186), hotfix for bug #186, drop connect args when not object. 1.0.3. | 205 | * v1.0, 2014-10-24, fix [#186](https://github.com/winlinvip/simple-rtmp-server/issues/186), hotfix for bug #186, drop connect args when not object. 1.0.3. |
206 | -* v1.0, 2014-10-24, rename wiki/xxx to wiki/v1_xxx. 1.0.2. | 206 | +* v1.0, 2014-10-24, rename wiki/xxx to wiki/v1_CN_xxx. 1.0.2. |
207 | * v1.0, 2014-10-19, fix [#183](https://github.com/winlinvip/simple-rtmp-server/issues/183), hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1. | 207 | * v1.0, 2014-10-19, fix [#183](https://github.com/winlinvip/simple-rtmp-server/issues/183), hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1. |
208 | * <strong>v1.0, 2014-10-09, [1.0 beta(1.0.0)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.beta) released. 59316 lines.</strong> | 208 | * <strong>v1.0, 2014-10-09, [1.0 beta(1.0.0)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.beta) released. 59316 lines.</strong> |
209 | * v1.0, 2014-10-08, fix [#151](https://github.com/winlinvip/simple-rtmp-server/issues/151), always reap ts whatever audio or video packet. 0.9.223. | 209 | * v1.0, 2014-10-08, fix [#151](https://github.com/winlinvip/simple-rtmp-server/issues/151), always reap ts whatever audio or video packet. 0.9.223. |
@@ -248,8 +248,8 @@ Supported operating systems and hardware: | @@ -248,8 +248,8 @@ Supported operating systems and hardware: | ||
248 | * v1.0, 2014-06-27, SRS online 30days with RTMP/HLS. | 248 | * v1.0, 2014-06-27, SRS online 30days with RTMP/HLS. |
249 | * v1.0, 2014-06-25, fix [#108](https://github.com/winlinvip/simple-rtmp-server/issues/108), support config time jitter for encoder non-monotonical stream. 0.9.133 | 249 | * v1.0, 2014-06-25, fix [#108](https://github.com/winlinvip/simple-rtmp-server/issues/108), support config time jitter for encoder non-monotonical stream. 0.9.133 |
250 | * v1.0, 2014-06-23, support report summaries in heartbeat. 0.9.132 | 250 | * v1.0, 2014-06-23, support report summaries in heartbeat. 0.9.132 |
251 | -* v1.0, 2014-06-22, performance refine, support [3k+](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Performance#%E6%80%A7%E8%83%BD%E4%BE%8B%E8%A1%8C%E6%8A%A5%E5%91%8A4k) connections(270kbps). 0.9.130 | ||
252 | -* v1.0, 2014-06-21, support edge [token traverse](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DRM#tokentraverse), fix [#104](https://github.com/winlinvip/simple-rtmp-server/issues/104). 0.9.129 | 251 | +* v1.0, 2014-06-22, performance refine, support [3k+](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance#%E6%80%A7%E8%83%BD%E4%BE%8B%E8%A1%8C%E6%8A%A5%E5%91%8A4k) connections(270kbps). 0.9.130 |
252 | +* v1.0, 2014-06-21, support edge [token traverse](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DRM#tokentraverse), fix [#104](https://github.com/winlinvip/simple-rtmp-server/issues/104). 0.9.129 | ||
253 | * v1.0, 2014-06-19, add connections count to api summaries. 0.9.127 | 253 | * v1.0, 2014-06-19, add connections count to api summaries. 0.9.127 |
254 | * v1.0, 2014-06-19, add srs bytes and kbps to api summaries. 0.9.126 | 254 | * v1.0, 2014-06-19, add srs bytes and kbps to api summaries. 0.9.126 |
255 | * v1.0, 2014-06-18, add network bytes to api summaries. 0.9.125 | 255 | * v1.0, 2014-06-18, add network bytes to api summaries. 0.9.125 |
@@ -291,11 +291,11 @@ Supported operating systems and hardware: | @@ -291,11 +291,11 @@ Supported operating systems and hardware: | ||
291 | * v1.0, 2014-04-11, add speex1.2 to transcode flash encoder stream. 0.9.58 | 291 | * v1.0, 2014-04-11, add speex1.2 to transcode flash encoder stream. 0.9.58 |
292 | * v1.0, 2014-04-10, support reload ingesters(add/remov/update). 0.9.57 | 292 | * v1.0, 2014-04-10, support reload ingesters(add/remov/update). 0.9.57 |
293 | * <strong>v1.0, 2014-04-07, [1.0 mainline(0.9.55)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline) released. 30000 lines.</strong> | 293 | * <strong>v1.0, 2014-04-07, [1.0 mainline(0.9.55)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline) released. 30000 lines.</strong> |
294 | -* v1.0, 2014-04-07, support [ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleIngest) file/stream/device. | ||
295 | -* v1.0, 2014-04-05, support [http api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPApi) and [http server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPServer). | 294 | +* v1.0, 2014-04-07, support [ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleIngest) file/stream/device. |
295 | +* v1.0, 2014-04-05, support [http api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi) and [http server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer). | ||
296 | * v1.0, 2014-04-03, implements http framework and api/v1/version. | 296 | * v1.0, 2014-04-03, implements http framework and api/v1/version. |
297 | * v1.0, 2014-03-30, fix bug for st detecting epoll failed, force st to use epoll. | 297 | * v1.0, 2014-03-30, fix bug for st detecting epoll failed, force st to use epoll. |
298 | -* v1.0, 2014-03-29, add wiki [Performance for RaspberryPi](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RaspberryPi). | 298 | +* v1.0, 2014-03-29, add wiki [Performance for RaspberryPi](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RaspberryPi). |
299 | * v1.0, 2014-03-29, add release binary package for raspberry-pi. | 299 | * v1.0, 2014-03-29, add release binary package for raspberry-pi. |
300 | * v1.0, 2014-03-26, support RTMP ATC for HLS/HDS to support backup(failover). | 300 | * v1.0, 2014-03-26, support RTMP ATC for HLS/HDS to support backup(failover). |
301 | * v1.0, 2014-03-23, support daemon, default start in daemon. | 301 | * v1.0, 2014-03-23, support daemon, default start in daemon. |
@@ -306,20 +306,20 @@ Supported operating systems and hardware: | @@ -306,20 +306,20 @@ Supported operating systems and hardware: | ||
306 | * v1.0, 2014-03-19, add vn/an for FFMPEG to drop video/audio for radio stream. | 306 | * v1.0, 2014-03-19, add vn/an for FFMPEG to drop video/audio for radio stream. |
307 | * v1.0, 2014-03-19, refine handshake, client support complex handshake, add utest. | 307 | * v1.0, 2014-03-19, refine handshake, client support complex handshake, add utest. |
308 | * 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/winlinvip/simple-rtmp-server/commit/5a4373d4835758188b9a1f03005cea0b6ddc62aa) | 308 | * 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/winlinvip/simple-rtmp-server/commit/5a4373d4835758188b9a1f03005cea0b6ddc62aa) |
309 | -* v1.0, 2014-03-16, support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm)) with rtmp/ssl/hls/librtmp. | 309 | +* v1.0, 2014-03-16, support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm)) with rtmp/ssl/hls/librtmp. |
310 | * v1.0, 2014-03-12, finish utest for amf0 codec. | 310 | * v1.0, 2014-03-12, finish utest for amf0 codec. |
311 | * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile. | 311 | * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile. |
312 | * v1.0, 2014-03-04, add gest framework for utest, build success. | 312 | * v1.0, 2014-03-04, add gest framework for utest, build success. |
313 | -* v1.0, 2014-03-02, add wiki [srs-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLibrtmp), [SRS for arm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm), [product](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Product) | 313 | +* v1.0, 2014-03-02, add wiki [srs-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLibrtmp), [SRS for arm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm), [product](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product) |
314 | * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp. | 314 | * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp. |
315 | * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module. | 315 | * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module. |
316 | * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package. | 316 | * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package. |
317 | -* v1.0, 2014-02-28, add wiki [BuildArm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Build), [FFMPEG](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG), [Reload](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Reload) | ||
318 | -* v1.0, 2014-02-27, add wiki [LowLatency](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LowLatency), [HTTPCallback](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPCallback), [ServerSideScript](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_ServerSideScript), [IDE](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE) | ||
319 | -* v1.0, 2014-01-19, add wiki [DeliveryHLS](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS) | ||
320 | -* v1.0, 2014-01-12, add wiki [HowToAskQuestion](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HowToAskQuestion), [RtmpUrlVhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RtmpUrlVhost) | 317 | +* v1.0, 2014-02-28, add wiki [BuildArm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build), [FFMPEG](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG), [Reload](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Reload) |
318 | +* v1.0, 2014-02-27, add wiki [LowLatency](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LowLatency), [HTTPCallback](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback), [ServerSideScript](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_ServerSideScript), [IDE](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE) | ||
319 | +* v1.0, 2014-01-19, add wiki [DeliveryHLS](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS) | ||
320 | +* v1.0, 2014-01-12, add wiki [HowToAskQuestion](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HowToAskQuestion), [RtmpUrlVhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RtmpUrlVhost) | ||
321 | * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually. | 321 | * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually. |
322 | -* v1.0, 2014-01-05, add wiki [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Build), [Performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Performance), [Forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Forward) | 322 | +* v1.0, 2014-01-05, add wiki [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build), [Performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance), [Forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Forward) |
323 | * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance. | 323 | * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance. |
324 | * v1.0, 2013-12-27, merge from wenjie, the bandwidth test feature. | 324 | * v1.0, 2013-12-27, merge from wenjie, the bandwidth test feature. |
325 | * <strong>v0.9, 2013-12-25, [v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9) released. 20926 lines.</strong> | 325 | * <strong>v0.9, 2013-12-25, [v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9) released. 20926 lines.</strong> |
@@ -337,7 +337,7 @@ Supported operating systems and hardware: | @@ -337,7 +337,7 @@ Supported operating systems and hardware: | ||
337 | * v0.9, 2013-12-14, refine the thread model for the retry threads. | 337 | * v0.9, 2013-12-14, refine the thread model for the retry threads. |
338 | * v0.9, 2013-12-10, auto install depends tools/libs on centos/ubuntu. | 338 | * v0.9, 2013-12-10, auto install depends tools/libs on centos/ubuntu. |
339 | * <strong>v0.8, 2013-12-08, [v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8) released. 19186 lines.</strong> | 339 | * <strong>v0.8, 2013-12-08, [v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8) released. 19186 lines.</strong> |
340 | -* v0.8, 2013-12-08, support [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPCallback): on_connect/close/publish/unpublish/play/stop. | 340 | +* v0.8, 2013-12-08, support [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback): on_connect/close/publish/unpublish/play/stop. |
341 | * v0.8, 2013-12-08, support multiple http hooks for a event. | 341 | * v0.8, 2013-12-08, support multiple http hooks for a event. |
342 | * v0.8, 2013-12-07, support http callback hooks, on_connect. | 342 | * v0.8, 2013-12-07, support http callback hooks, on_connect. |
343 | * v0.8, 2013-12-07, support network based cli and json result, add CherryPy 3.2.4. | 343 | * v0.8, 2013-12-07, support network based cli and json result, add CherryPy 3.2.4. |
@@ -427,8 +427,8 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw | @@ -427,8 +427,8 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw | ||
427 | 32 17 33 0 0 18| 0 410B| 169M 169M| 0 0 |4518 3788 | 427 | 32 17 33 0 0 18| 0 410B| 169M 169M| 0 0 |4518 3788 |
428 | </pre> | 428 | </pre> |
429 | 429 | ||
430 | -* See also: [Performance for x86/x64 Test Guide](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Performance) | ||
431 | -* See also: [Performance for RaspberryPi](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RaspberryPi) | 430 | +* See also: [Performance for x86/x64 Test Guide](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance) |
431 | +* See also: [Performance for RaspberryPi](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RaspberryPi) | ||
432 | 432 | ||
433 | ## Architecture | 433 | ## Architecture |
434 | 434 | ||
@@ -502,7 +502,7 @@ Remark: | @@ -502,7 +502,7 @@ Remark: | ||
502 | to ingest any input to rtmp, push to SRS. | 502 | to ingest any input to rtmp, push to SRS. |
503 | </pre> | 503 | </pre> |
504 | 504 | ||
505 | -### [HDS/HLS origin backup](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RTMP-ATC) | 505 | +### [HDS/HLS origin backup](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RTMP-ATC) |
506 | 506 | ||
507 | <pre> | 507 | <pre> |
508 | +----------+ +----------+ | 508 | +----------+ +----------+ |
@@ -514,10 +514,10 @@ to ingest any input to rtmp, push to SRS. | @@ -514,10 +514,10 @@ to ingest any input to rtmp, push to SRS. | ||
514 | RTMP +----------+ RTMP +----------+ | 514 | RTMP +----------+ RTMP +----------+ |
515 | </pre> | 515 | </pre> |
516 | 516 | ||
517 | -### [RTMP cluster(origin/edge) Architecture](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge) | 517 | +### [RTMP cluster(origin/edge) Architecture](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge) |
518 | 518 | ||
519 | -Remark: cluster over edge, see [Edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge) | ||
520 | -Remark: cluster over forward, see [Forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Forward) | 519 | +Remark: cluster over edge, see [Edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge) |
520 | +Remark: cluster over forward, see [Forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Forward) | ||
521 | 521 | ||
522 | <pre> | 522 | <pre> |
523 | +---------+ +-----------------+ +-----------------------+ | 523 | +---------+ +-----------------+ +-----------------------+ |
@@ -21,31 +21,31 @@ IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/objs/st/libst.a) | @@ -21,31 +21,31 @@ IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/objs/st/libst.a) | ||
21 | EXEC_PROGRAM(./configure) | 21 | EXEC_PROGRAM(./configure) |
22 | ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/objs/st/libst.a) | 22 | ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/objs/st/libst.a) |
23 | 23 | ||
24 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
25 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
26 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
27 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
28 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
29 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
30 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
31 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
32 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
33 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
34 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
35 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
36 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
37 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
38 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
39 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
40 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
41 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
42 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
43 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
44 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
45 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
46 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
47 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
48 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | ||
49 | -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") | 24 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") |
25 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
26 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
27 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
28 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
29 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
30 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
31 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
32 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
33 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
34 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
35 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
36 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
37 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
38 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
39 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
40 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
41 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
42 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
43 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
44 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
45 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
46 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
47 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
48 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
49 | +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") | ||
50 | MESSAGE(STATUS "use ./configure && make, @see https://github.com/winlinvip/simple-rtmp-server#usage") | 50 | MESSAGE(STATUS "use ./configure && make, @see https://github.com/winlinvip/simple-rtmp-server#usage") |
51 | 51 |
@@ -311,7 +311,7 @@ if [ $SRS_EMBEDED_CPU = YES ]; then | @@ -311,7 +311,7 @@ if [ $SRS_EMBEDED_CPU = YES ]; then | ||
311 | echo "st-1.9t for arm is ok."; | 311 | echo "st-1.9t for arm is ok."; |
312 | else | 312 | else |
313 | # TODO: FIXME: patch the bug. | 313 | # TODO: FIXME: patch the bug. |
314 | - # patch st for arm, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm#st-arm-bug-fix | 314 | + # patch st for arm, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix |
315 | echo "build st-1.9t for arm"; | 315 | echo "build st-1.9t for arm"; |
316 | ( | 316 | ( |
317 | rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && | 317 | rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && |
@@ -73,7 +73,7 @@ SRS_MIPS_UBUNTU12=NO | @@ -73,7 +73,7 @@ SRS_MIPS_UBUNTU12=NO | ||
73 | SRS_DEV=NO | 73 | SRS_DEV=NO |
74 | # dev, open main server feature for dev, no utest/research/librtmp | 74 | # dev, open main server feature for dev, no utest/research/librtmp |
75 | SRS_FAST_DEV=NO | 75 | SRS_FAST_DEV=NO |
76 | -# demo, for the demo of srs, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo | 76 | +# demo, for the demo of srs, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo |
77 | SRS_DEMO=NO | 77 | SRS_DEMO=NO |
78 | # raspberry-pi, open hls/ssl/static | 78 | # raspberry-pi, open hls/ssl/static |
79 | SRS_PI=NO | 79 | SRS_PI=NO |
@@ -172,7 +172,7 @@ Presets: | @@ -172,7 +172,7 @@ Presets: | ||
172 | --disable-all disable all features, only support vp6 RTMP. | 172 | --disable-all disable all features, only support vp6 RTMP. |
173 | --dev for dev, open all features, no nginx/gperf/gprof/arm. | 173 | --dev for dev, open all features, no nginx/gperf/gprof/arm. |
174 | --fast-dev for dev fast compile, the RTMP server, without librtmp/utest/research. | 174 | --fast-dev for dev fast compile, the RTMP server, without librtmp/utest/research. |
175 | - --demo for srs demo, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo | 175 | + --demo for srs demo, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo |
176 | --full enable all features, no gperf/gprof/arm. | 176 | --full enable all features, no gperf/gprof/arm. |
177 | 177 | ||
178 | Conflicts: | 178 | Conflicts: |
1 | # the config for srs demo | 1 | # the config for srs demo |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 19350; | 5 | listen 19350; |
1 | # the config for srs demo | 1 | # the config for srs demo |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # the config for srs to dvr in segment mode | 1 | # the config for srs to dvr in segment mode |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DVR | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # the config for srs to dvr in session mode | 1 | # the config for srs to dvr in session mode |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DVR | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # the config for srs origin-edge cluster | 1 | # the config for srs origin-edge cluster |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # the config for srs for token traverse authentication | 1 | # the config for srs for token traverse authentication |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DRM | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DRM |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935 | 5 | listen 1935 |
1 | # the config for srs use ffmpeg to transcode | 1 | # the config for srs use ffmpeg to transcode |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleFFMPEG | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleFFMPEG |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # the config for srs to forward | 1 | # the config for srs to forward |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleForward | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleForward |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # the config for srs to forward | 1 | # the config for srs to forward |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleForward | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleForward |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 19350; | 5 | listen 19350; |
@@ -406,7 +406,7 @@ vhost debug.srs.com { | @@ -406,7 +406,7 @@ vhost debug.srs.com { | ||
406 | # it's strongly recommend to open the debug_srs_upnode, | 406 | # it's strongly recommend to open the debug_srs_upnode, |
407 | # when connect to upnode, it will take the debug info, | 407 | # when connect to upnode, it will take the debug info, |
408 | # for example, the id, source id, pid. | 408 | # for example, the id, source id, pid. |
409 | - # please see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLog | 409 | + # please see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLog |
410 | # default: on | 410 | # default: on |
411 | debug_srs_upnode on; | 411 | debug_srs_upnode on; |
412 | } | 412 | } |
1 | # the config for srs to delivery hls | 1 | # the config for srs to delivery hls |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHLS | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # the config for srs to delivery hls | 1 | # the config for srs to delivery hls |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHLS | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # use ffmpeg to ingest file/stream/device to SRS | 1 | # use ffmpeg to ingest file/stream/device to SRS |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleIngest | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleIngest |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # the config for srs origin-edge cluster | 1 | # the config for srs origin-edge cluster |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 19350; | 5 | listen 19350; |
1 | # the config for srs to delivery realtime RTMP stream | 1 | # the config for srs to delivery realtime RTMP stream |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleRealtime | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRealtime |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # the config for srs to delivery RTMP | 1 | # the config for srs to delivery RTMP |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleRTMP | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRTMP |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
1 | # the config for srs to delivery hls | 1 | # the config for srs to delivery hls |
2 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHLS | 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS |
3 | # @see full.conf for detail config. | 3 | # @see full.conf for detail config. |
4 | 4 | ||
5 | listen 1935; | 5 | listen 1935; |
@@ -134,7 +134,7 @@ BLACK="\\${BLACK}" | @@ -134,7 +134,7 @@ BLACK="\\${BLACK}" | ||
134 | 134 | ||
135 | echo -e "\${GREEN}build summary:\${BLACK}" | 135 | echo -e "\${GREEN}build summary:\${BLACK}" |
136 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" | 136 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" |
137 | -echo -e " |${SrsGperfSummaryColor}gperf @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_GPERF\${BLACK}" | 137 | +echo -e " |${SrsGperfSummaryColor}gperf @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_GPERF\${BLACK}" |
138 | echo -e " | ${SrsGperfMCSummaryColor}gmc @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\${BLACK}" | 138 | echo -e " | ${SrsGperfMCSummaryColor}gmc @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\${BLACK}" |
139 | echo -e " | ${SrsGperfMCSummaryColor}gmc: gperf memory check\${BLACK}" | 139 | echo -e " | ${SrsGperfMCSummaryColor}gmc: gperf memory check\${BLACK}" |
140 | echo -e " | ${SrsGperfMCSummaryColor}env PPROF_PATH=./objs/pprof HEAPCHECK=normal ./objs/srs -c conf/console.conf # start gmc\${BLACK}" | 140 | echo -e " | ${SrsGperfMCSummaryColor}env PPROF_PATH=./objs/pprof HEAPCHECK=normal ./objs/srs -c conf/console.conf # start gmc\${BLACK}" |
@@ -150,7 +150,7 @@ echo -e " | ${SrsGperfCPSummaryColor}rm -f gperf.srs.gcp*; ./obj | @@ -150,7 +150,7 @@ echo -e " | ${SrsGperfCPSummaryColor}rm -f gperf.srs.gcp*; ./obj | ||
150 | echo -e " | ${SrsGperfCPSummaryColor}killall -2 srs # or CTRL+C to stop gcp\${BLACK}" | 150 | echo -e " | ${SrsGperfCPSummaryColor}killall -2 srs # or CTRL+C to stop gcp\${BLACK}" |
151 | echo -e " | ${SrsGperfCPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gcp* # to analysis cpu profile\${BLACK}" | 151 | echo -e " | ${SrsGperfCPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gcp* # to analysis cpu profile\${BLACK}" |
152 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" | 152 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" |
153 | -echo -e " |${SrsGprofSummaryColor}gprof @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_GPROF\${BLACK}" | 153 | +echo -e " |${SrsGprofSummaryColor}gprof @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_GPROF\${BLACK}" |
154 | echo -e " |${SrsGprofSummaryColor}gprof: GNU profile tool, @see: http://www.cs.utah.edu/dept/old/texinfo/as/gprof.html\${BLACK}" | 154 | echo -e " |${SrsGprofSummaryColor}gprof: GNU profile tool, @see: http://www.cs.utah.edu/dept/old/texinfo/as/gprof.html\${BLACK}" |
155 | echo -e " | ${SrsGprofSummaryColor}rm -f gmon.out; ./objs/srs -c conf/console.conf # start gprof\${BLACK}" | 155 | echo -e " | ${SrsGprofSummaryColor}rm -f gmon.out; ./objs/srs -c conf/console.conf # start gprof\${BLACK}" |
156 | echo -e " | ${SrsGprofSummaryColor}killall -2 srs # or CTRL+C to stop gprof\${BLACK}" | 156 | echo -e " | ${SrsGprofSummaryColor}killall -2 srs # or CTRL+C to stop gprof\${BLACK}" |
@@ -160,7 +160,7 @@ echo -e " |${SrsResearchSummaryColor}research: ./objs/research, api server, | @@ -160,7 +160,7 @@ echo -e " |${SrsResearchSummaryColor}research: ./objs/research, api server, | ||
160 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" | 160 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" |
161 | echo -e " |${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\${BLACK}" | 161 | echo -e " |${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\${BLACK}" |
162 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" | 162 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" |
163 | -echo -e " |${SrsLibrtmpSummaryColor}librtmp @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLibrtmp\${BLACK}" | 163 | +echo -e " |${SrsLibrtmpSummaryColor}librtmp @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLibrtmp\${BLACK}" |
164 | echo -e " |${SrsLibrtmpSummaryColor}librtmp: ./objs/include, ./objs/lib, the srs-librtmp library\${BLACK}" | 164 | echo -e " |${SrsLibrtmpSummaryColor}librtmp: ./objs/include, ./objs/lib, the srs-librtmp library\${BLACK}" |
165 | echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stream with simple handshake to server\${BLACK}" | 165 | echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stream with simple handshake to server\${BLACK}" |
166 | echo -e " | ${SrsLibrtmpSSLSummaryColor}complex handshake: it's not required for client, recommend disable it\${BLACK}" | 166 | echo -e " | ${SrsLibrtmpSSLSummaryColor}complex handshake: it's not required for client, recommend disable it\${BLACK}" |
@@ -171,30 +171,30 @@ echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/ | @@ -171,30 +171,30 @@ echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/ | ||
171 | echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_bandwidth_check\${BLACK}" | 171 | echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_bandwidth_check\${BLACK}" |
172 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" | 172 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" |
173 | echo -e " |\${GREEN}server: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}" | 173 | echo -e " |\${GREEN}server: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}" |
174 | -echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS\${BLACK}" | 174 | +echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS\${BLACK}" |
175 | echo -e " | ${SrsHlsSummaryColor}hls: generate m3u8 and ts from rtmp stream\${BLACK}" | 175 | echo -e " | ${SrsHlsSummaryColor}hls: generate m3u8 and ts from rtmp stream\${BLACK}" |
176 | -echo -e " | ${SrsDvrSummaryColor}dvr @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DVR\${BLACK}" | 176 | +echo -e " | ${SrsDvrSummaryColor}dvr @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR\${BLACK}" |
177 | echo -e " | ${SrsDvrSummaryColor}dvr: record RTMP stream to flv files.\${BLACK}" | 177 | echo -e " | ${SrsDvrSummaryColor}dvr: record RTMP stream to flv files.\${BLACK}" |
178 | -echo -e " | ${SrsNginxSummaryColor}nginx @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS\${BLACK}" | 178 | +echo -e " | ${SrsNginxSummaryColor}nginx @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS\${BLACK}" |
179 | echo -e " | ${SrsNginxSummaryColor}nginx: delivery HLS stream by nginx\${BLACK}" | 179 | echo -e " | ${SrsNginxSummaryColor}nginx: delivery HLS stream by nginx\${BLACK}" |
180 | echo -e " | ${SrsNginxSummaryColor}nginx: sudo ./objs/nginx/sbin/nginx\${BLACK}" | 180 | echo -e " | ${SrsNginxSummaryColor}nginx: sudo ./objs/nginx/sbin/nginx\${BLACK}" |
181 | -echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RTMPHandshake\${BLACK}" | 181 | +echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RTMPHandshake\${BLACK}" |
182 | echo -e " | ${SrsSslSummaryColor}ssl: support RTMP complex handshake for client required, for instance, flash\${BLACK}" | 182 | echo -e " | ${SrsSslSummaryColor}ssl: support RTMP complex handshake for client required, for instance, flash\${BLACK}" |
183 | -echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG\${BLACK}" | 183 | +echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG\${BLACK}" |
184 | echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: transcode, mux, ingest tool\${BLACK}" | 184 | echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: transcode, mux, ingest tool\${BLACK}" |
185 | echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: ./objs/ffmpeg/bin/ffmpeg\${BLACK}" | 185 | echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: ./objs/ffmpeg/bin/ffmpeg\${BLACK}" |
186 | -echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG\${BLACK}" | 186 | +echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG\${BLACK}" |
187 | echo -e " | ${SrsTranscodeSummaryColor}transcode: support transcoding RTMP stream\${BLACK}" | 187 | echo -e " | ${SrsTranscodeSummaryColor}transcode: support transcoding RTMP stream\${BLACK}" |
188 | -echo -e " | ${SrsIngestSummaryColor}ingest @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Ingest\${BLACK}" | 188 | +echo -e " | ${SrsIngestSummaryColor}ingest @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Ingest\${BLACK}" |
189 | echo -e " | ${SrsIngestSummaryColor}ingest: support ingest file/stream/device then push to SRS by RTMP stream\${BLACK}" | 189 | echo -e " | ${SrsIngestSummaryColor}ingest: support ingest file/stream/device then push to SRS by RTMP stream\${BLACK}" |
190 | -echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPCallback\${BLACK}" | 190 | +echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback\${BLACK}" |
191 | echo -e " | ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}" | 191 | echo -e " | ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}" |
192 | -echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPServer\${BLACK}" | 192 | +echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer\${BLACK}" |
193 | echo -e " | ${SrsHttpServerSummaryColor}http-server: support http server to delivery http stream\${BLACK}" | 193 | echo -e " | ${SrsHttpServerSummaryColor}http-server: support http server to delivery http stream\${BLACK}" |
194 | -echo -e " | ${SrsHttpApiSummaryColor}http-api @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPApi\${BLACK}" | 194 | +echo -e " | ${SrsHttpApiSummaryColor}http-api @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi\${BLACK}" |
195 | echo -e " | ${SrsHttpApiSummaryColor}http-api: support http api to manage server\${BLACK}" | 195 | echo -e " | ${SrsHttpApiSummaryColor}http-api: support http api to manage server\${BLACK}" |
196 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" | 196 | echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" |
197 | -echo -e "\${GREEN}binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Build\${BLACK}" | 197 | +echo -e "\${GREEN}binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build\${BLACK}" |
198 | 198 | ||
199 | echo "you can:" | 199 | echo "you can:" |
200 | echo " ./objs/srs -c conf/srs.conf" | 200 | echo " ./objs/srs -c conf/srs.conf" |
@@ -286,7 +286,7 @@ install-api: install | @@ -286,7 +286,7 @@ install-api: install | ||
286 | @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs-api /etc/init.d/srs-api" | 286 | @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs-api /etc/init.d/srs-api" |
287 | @echo " /etc/init.d/srs-api start" | 287 | @echo " /etc/init.d/srs-api start" |
288 | @echo " http://\$(shell bash auto/local_ip.sh):8085" | 288 | @echo " http://\$(shell bash auto/local_ip.sh):8085" |
289 | - @echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LinuxService" | 289 | + @echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LinuxService" |
290 | 290 | ||
291 | install: | 291 | install: |
292 | @echo "mkdir \$(__REAL_INSTALL)" | 292 | @echo "mkdir \$(__REAL_INSTALL)" |
@@ -308,7 +308,7 @@ install: | @@ -308,7 +308,7 @@ install: | ||
308 | @echo "srs installed, to link and start srs:" | 308 | @echo "srs installed, to link and start srs:" |
309 | @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs /etc/init.d/srs" | 309 | @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs /etc/init.d/srs" |
310 | @echo " /etc/init.d/srs start" | 310 | @echo " /etc/init.d/srs start" |
311 | - @echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LinuxService" | 311 | + @echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LinuxService" |
312 | 312 | ||
313 | END | 313 | END |
314 | 314 |
1 | /* | 1 | /* |
2 | -# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm | 2 | +# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm |
3 | arm-linux-gnueabi-g++ -o jmp jmp.cpp -static | 3 | arm-linux-gnueabi-g++ -o jmp jmp.cpp -static |
4 | arm-linux-gnueabi-strip jmp | 4 | arm-linux-gnueabi-strip jmp |
5 | */ | 5 | */ |
1 | /* | 1 | /* |
2 | -# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm | 2 | +# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm |
3 | arm-linux-gnueabi-g++ -g -o jmp_sp jmp_sp.cpp -static | 3 | arm-linux-gnueabi-g++ -g -o jmp_sp jmp_sp.cpp -static |
4 | arm-linux-gnueabi-strip jmp_sp | 4 | arm-linux-gnueabi-strip jmp_sp |
5 | */ | 5 | */ |
1 | /* | 1 | /* |
2 | -# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm | 2 | +# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm |
3 | arm-linux-gnueabi-g++ -o test test.cpp -static | 3 | arm-linux-gnueabi-g++ -o test test.cpp -static |
4 | arm-linux-gnueabi-strip test | 4 | arm-linux-gnueabi-strip test |
5 | */ | 5 | */ |
@@ -32,7 +32,7 @@ help: | @@ -32,7 +32,7 @@ help: | ||
32 | @echo "Remark: srs Makefile will auto invoke this by --with/without-ssl, " | 32 | @echo "Remark: srs Makefile will auto invoke this by --with/without-ssl, " |
33 | @echo " that is, if user specified ssl(by --with-ssl), srs will make this by 'make ssl'" | 33 | @echo " that is, if user specified ssl(by --with-ssl), srs will make this by 'make ssl'" |
34 | @echo " that is, if user not use ssl(by --without-ssl), use 'make nossl'" | 34 | @echo " that is, if user not use ssl(by --without-ssl), use 'make nossl'" |
35 | - @echo " see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_v1_Build" | 35 | + @echo " see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_v1_Build" |
36 | @echo "Remark: before make this sample, user must make the srs, with/without ssl" | 36 | @echo "Remark: before make this sample, user must make the srs, with/without ssl" |
37 | 37 | ||
38 | clean: | 38 | clean: |
@@ -108,7 +108,7 @@ else | @@ -108,7 +108,7 @@ else | ||
108 | fi | 108 | fi |
109 | 109 | ||
110 | echo "" | 110 | echo "" |
111 | -echo "see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LinuxService" | 111 | +echo "see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LinuxService" |
112 | echo "install success, you can:" | 112 | echo "install success, you can:" |
113 | echo -e "${GREEN} sudo /etc/init.d/srs start${BLACK}" | 113 | echo -e "${GREEN} sudo /etc/init.d/srs start${BLACK}" |
114 | echo "srs root is ${INSTALL}" | 114 | echo "srs root is ${INSTALL}" |
@@ -108,7 +108,7 @@ fi | @@ -108,7 +108,7 @@ fi | ||
108 | ok_msg "real os is ${os_name}-${os_major_version} ${os_release} ${os_machine}" | 108 | ok_msg "real os is ${os_name}-${os_major_version} ${os_release} ${os_machine}" |
109 | 109 | ||
110 | # build srs | 110 | # build srs |
111 | -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Build | 111 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build |
112 | ok_msg "start build srs" | 112 | ok_msg "start build srs" |
113 | if [ $ARM = YES ]; then | 113 | if [ $ARM = YES ]; then |
114 | ( | 114 | ( |
@@ -51,4 +51,4 @@ echo -e "${GREEN}请在hosts中添加一行:${BLACK}" | @@ -51,4 +51,4 @@ echo -e "${GREEN}请在hosts中添加一行:${BLACK}" | ||
51 | echo -e "${RED} $ip demo.srs.com${BLACK}" | 51 | echo -e "${RED} $ip demo.srs.com${BLACK}" |
52 | echo -e "${GREEN}演示地址:${BLACK}" | 52 | echo -e "${GREEN}演示地址:${BLACK}" |
53 | echo -e "${RED} http://$ip:$port${BLACK}" | 53 | echo -e "${RED} http://$ip:$port${BLACK}" |
54 | -echo -e "@see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo" | 54 | +echo -e "@see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo" |
@@ -48,7 +48,7 @@ using namespace std; | @@ -48,7 +48,7 @@ using namespace std; | ||
48 | 48 | ||
49 | using namespace _srs_internal; | 49 | using namespace _srs_internal; |
50 | 50 | ||
51 | -#define SRS_WIKI_URL_LOG "https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLog" | 51 | +#define SRS_WIKI_URL_LOG "https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLog" |
52 | 52 | ||
53 | // '\n' | 53 | // '\n' |
54 | #define __LF (char)0x0a | 54 | #define __LF (char)0x0a |
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
36 | * when reload callback, the config is updated yet. | 36 | * when reload callback, the config is updated yet. |
37 | * | 37 | * |
38 | * features not support reload, | 38 | * features not support reload, |
39 | -* @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Reload#notsupportedfeatures | 39 | +* @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Reload#notsupportedfeatures |
40 | */ | 40 | */ |
41 | class ISrsReloadHandler | 41 | class ISrsReloadHandler |
42 | { | 42 | { |
@@ -194,7 +194,7 @@ int main(int argc, char** argv) | @@ -194,7 +194,7 @@ int main(int argc, char** argv) | ||
194 | // for special features. | 194 | // for special features. |
195 | #ifdef SRS_AUTO_HTTP_SERVER | 195 | #ifdef SRS_AUTO_HTTP_SERVER |
196 | srs_warn("http server is dev feature, " | 196 | srs_warn("http server is dev feature, " |
197 | - "@see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPServer#feature"); | 197 | + "@see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer#feature"); |
198 | #endif | 198 | #endif |
199 | 199 | ||
200 | /** | 200 | /** |
@@ -505,7 +505,7 @@ std::string __full_conf = "" | @@ -505,7 +505,7 @@ std::string __full_conf = "" | ||
505 | " # it's strongly recommend to open the debug_srs_upnode, \n" | 505 | " # it's strongly recommend to open the debug_srs_upnode, \n" |
506 | " # when connect to upnode, it will take the debug info, \n" | 506 | " # when connect to upnode, it will take the debug info, \n" |
507 | " # for example, the id, source id, pid. \n" | 507 | " # for example, the id, source id, pid. \n" |
508 | - " # please see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLog \n" | 508 | + " # please see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLog \n" |
509 | " # default: on \n" | 509 | " # default: on \n" |
510 | " debug_srs_upnode on; \n" | 510 | " debug_srs_upnode on; \n" |
511 | "} \n" | 511 | "} \n" |
-
请 注册 或 登录 后发表评论