diff --git a/README.md b/README.md
index 14a365967..1d7e9dfd1 100755
--- a/README.md
+++ b/README.md
@@ -10,13 +10,13 @@ SRS定位是运营级的互联网直播服务器集群,追求更好的概念
其他[more...](http://www.ossrs.net/srs.release/releases/)
同类产品:[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)
-获得源码(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)
+获得源码(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)
```bash
git clone https://github.com/winlinvip/simple-rtmp-server.git
```
-获得源码(国内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)
+获得源码(国内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)
```bash
git clone https://code.csdn.net/winlinvip/srs-csdn.git
@@ -25,7 +25,7 @@ git clone https://code.csdn.net/winlinvip/srs-csdn.git
报告问题(BugReport): [https://github.com/winlinvip/simple-rtmp-server/issues/new](https://github.com/winlinvip/simple-rtmp-server/issues/new)
中文资料(Wiki): [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki)
使用步骤(Usage): [https://github.com/winlinvip/simple-rtmp-server#usage](#usage)
-公用机器(LiveShow): [https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LiveShow](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LiveShow)
+公用机器(LiveShow): [https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LiveShow](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LiveShow)
捐款(Donation): [GitHub](http://winlinvip.github.io/srs.release/donation/index.html)
或 [阿里云镜像](http://www.ossrs.net/srs.release/donation/index.html) ,查看
[捐献墙(Donations)](https://github.com/winlinvip/simple-rtmp-server/blob/master/DONATIONS.txt)
@@ -34,18 +34,18 @@ git clone https://code.csdn.net/winlinvip/srs-csdn.git
SRS(SIMPLE RTMP Server) over state-threads created in 2013.10.
-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),
-[high-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Performance), single/multiple(plan) processes, edge/origin live server,
-[x86/x64/arm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm),
+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),
+[high-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance), single/multiple(plan) processes, edge/origin live server,
+[x86/x64/arm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm),
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),
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
-minimum run. see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Build).
+minimum run. see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build).
-SRS supports [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RtmpUrlVhost),
-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),
-[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),
-[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),
-[http server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPServer), [dvr](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DVR).
+SRS supports [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RtmpUrlVhost),
+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),
+[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),
+[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),
+[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).
Release: [http://winlinvip.github.io/srs.release](http://winlinvip.github.io/srs.release)
Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)
@@ -70,7 +70,7 @@ people who have submitted patches, reported bugs, added translations, helped
answer newbie questions, and generally made SRS that much better: [AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt)
A big THANK YOU goes to:
-* [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).
+* [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).
* Genes amd Mabbott for creating [st](https://github.com/winlinvip/state-threads)([state-threads](http://sourceforge.net/projects/state-threads/)).
* Michael Talyanksy for introducing us to use st.
* 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
Step 2: build SRS,
-Requires Centos6.x/Ubuntu12 32/64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Build)
+Requires Centos6.x/Ubuntu12 32/64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build)
./configure && make @@ -102,23 +102,23 @@ cd simple-rtmp-server/trunkSee also: -* [Usage: How to delivery RTMP?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleRTMP) -* [Usage: How to delivery HLS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHLS) -* [Usage: How to delivery HLS for other codec?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleTranscode2HLS) -* [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleFFMPEG) -* [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleForward) -* [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleRealtime) -* [Usage: How to deploy SRS on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleARM) -* [Usage: How to ingest file/stream/device to SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleIngest) -* [Usage: How to use SRS-HTTP-server to delivery HTTP/HLS stream?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHTTP) -* [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo) -* [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Sample) -* [Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Product) +* [Usage: How to delivery RTMP?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRTMP) +* [Usage: How to delivery HLS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS) +* [Usage: How to delivery HLS for other codec?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleTranscode2HLS) +* [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleFFMPEG) +* [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleForward) +* [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRealtime) +* [Usage: How to deploy SRS on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleARM) +* [Usage: How to ingest file/stream/device to SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleIngest) +* [Usage: How to use SRS-HTTP-server to delivery HTTP/HLS stream?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHTTP) +* [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo) +* [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Sample) +* [Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product) ## Wiki Please select your language: -* [English](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_ENHome) +* [English](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Home) * [Chinese](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Home) ## Donation @@ -136,40 +136,40 @@ Supported operating systems and hardware: ## Summary 1. 简洁稳定:Simple, also stable enough. -1. 高性能:[High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Performance): single-thread, async socket, event/st-thread driven. -1. 高并发:[High-concurrency](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Performance), 1800 connections(500kbps), 900Mbps, CPU 90.2%, 41MB -1. RTMP源站:Support [RTMP Origin Server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryRTMP). -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 +1. 高性能:[High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance): single-thread, async socket, event/st-thread driven. +1. 高并发:[High-concurrency](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance), 1800 connections(500kbps), 900Mbps, CPU 90.2%, 41MB +1. RTMP源站:Support [RTMP Origin Server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP). +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 1. 单进程(无多进程):Support single process; no multiple processes. -1. 支持Vhost:Support [Vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RtmpUrlVhost), support \_\_defaultVhost\_\_. -1. 直播(无点播):Support [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryRTMP) live streaming; no vod streaming. -1. 苹果HLS:Support Apple [HLS(m3u8)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS) live streaming. -1. 支持纯音频HLS:Support [HLS audio-only](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS#hlsaudioonly) live streaming. -1. 支持Reload:Support [Reload](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Reload) config to enable changes. -1. 支持GopCache:Support [cache last gop](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LowLatency#gop-cache) for flash player to fast startup. +1. 支持Vhost:Support [Vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RtmpUrlVhost), support \_\_defaultVhost\_\_. +1. 直播(无点播):Support [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP) live streaming; no vod streaming. +1. 苹果HLS:Support Apple [HLS(m3u8)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS) live streaming. +1. 支持纯音频HLS:Support [HLS audio-only](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS#hlsaudioonly) live streaming. +1. 支持Reload:Support [Reload](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Reload) config to enable changes. +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. 1. 侦听多端口:Support listen at multiple ports. 1. 长时间推流:Support long time(>4.6hours) publish/play. -1. 转发流:Support [Forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Forward) in master-slave mode. -1. 流转码:Support live stream [Transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG) by ffmpeg. -1. 支持FFMPEG滤镜:Support [ffmpeg](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG) filters(logo/overlay/crop), x264 params, copy/vn/an. -1. 只转码音频:Support audio [transcode](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG) only, speex/mp3 to aac -1. 支持HTTP回调:Support [http callback api hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPCallback)(for authentication and injection). -1. 带宽测速:Support [bandwidth test](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_BandwidthTestTool) api and flash client. -1. 演示页面:Player, publisher(encoder), and [demo pages(jquery+bootstrap)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo). -1. 视频会议演示:[Demo](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo) video meeting or chat(SRS+cherrypy+jquery+bootstrap). +1. 转发流:Support [Forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Forward) in master-slave mode. +1. 流转码:Support live stream [Transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG) by ffmpeg. +1. 支持FFMPEG滤镜:Support [ffmpeg](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG) filters(logo/overlay/crop), x264 params, copy/vn/an. +1. 只转码音频:Support audio [transcode](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG) only, speex/mp3 to aac +1. 支持HTTP回调:Support [http callback api hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback)(for authentication and injection). +1. 带宽测速:Support [bandwidth test](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_BandwidthTestTool) api and flash client. +1. 演示页面:Player, publisher(encoder), and [demo pages(jquery+bootstrap)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo). +1. 视频会议演示:[Demo](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo) video meeting or chat(SRS+cherrypy+jquery+bootstrap). 1. 中文Wiki:Full documents in [wiki](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Home), in Chineses. -1. 客户端库:Support RTMP(play-publish) library: [srs-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLibrtmp) -1. 支持ARM平台:Support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm)) with rtmp/ssl/hls/librtmp. -1. 支持Init.d脚本:Support [init.d](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LinuxService) and packge script, log to file. -1. 支持ATC:Support [RTMP ATC](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RTMP-ATC) for HLS/HDS to support backup(failover) -1. 支持HTTP-RESTful-API:Support [HTTP RESTful management api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPApi). -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). -1. 支持录制:Support [DVR](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DVR), record live to flv file for vod. -1. 可追溯日志:Support [tracable log, session based log](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLog). -1. 支持FMS-Token穿越:Support DRM [token traverse](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DRM#tokentraverse) for fms origin authenticate. +1. 客户端库:Support RTMP(play-publish) library: [srs-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLibrtmp) +1. 支持ARM平台:Support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm)) with rtmp/ssl/hls/librtmp. +1. 支持Init.d脚本:Support [init.d](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LinuxService) and packge script, log to file. +1. 支持ATC:Support [RTMP ATC](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RTMP-ATC) for HLS/HDS to support backup(failover) +1. 支持HTTP-RESTful-API:Support [HTTP RESTful management api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi). +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). +1. 支持录制:Support [DVR](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR), record live to flv file for vod. +1. 可追溯日志:Support [tracable log, session based log](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLog). +1. 支持FMS-Token穿越:Support DRM [token traverse](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DRM#tokentraverse) for fms origin authenticate. 1. 全面的Utest:Support system full utest on gtest. -1. (不稳定)内嵌HTTP服务器:[experiment] Support embeded [HTTP server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHTTP) for hls(live/vod) -1. (不稳定)FLV点播流:[experiment] Support [vod stream(http flv/hls vod stream)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FlvVodStream). +1. (不稳定)内嵌HTTP服务器:[experiment] Support embeded [HTTP server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHTTP) for hls(live/vod) +1. (不稳定)FLV点播流:[experiment] Support [vod stream(http flv/hls vod stream)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FlvVodStream). 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech). 1. [no-plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92). 1. [no-plan] Support multiple processes, for both origin and edge @@ -188,22 +188,22 @@ Supported operating systems and hardware: * 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.
+----------+ +----------+ @@ -514,10 +514,10 @@ to ingest any input to rtmp, push to SRS. RTMP +----------+ RTMP +----------+-### [RTMP cluster(origin/edge) Architecture](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge) +### [RTMP cluster(origin/edge) Architecture](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge) -Remark: cluster over edge, see [Edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge) -Remark: cluster over forward, see [Forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Forward) +Remark: cluster over edge, see [Edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge) +Remark: cluster over forward, see [Forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Forward)
+---------+ +-----------------+ +-----------------------+ diff --git a/trunk/CMakeLists.txt b/trunk/CMakeLists.txt index fa80bcd47..5d7ea46cc 100644 --- a/trunk/CMakeLists.txt +++ b/trunk/CMakeLists.txt @@ -21,31 +21,31 @@ IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/objs/st/libst.a) EXEC_PROGRAM(./configure) ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/objs/st/libst.a) -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") -MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "use ./configure && make, @see https://github.com/winlinvip/simple-rtmp-server#usage") diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 94e659cc7..05ccc196d 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -311,7 +311,7 @@ if [ $SRS_EMBEDED_CPU = YES ]; then echo "st-1.9t for arm is ok."; else # TODO: FIXME: patch the bug. - # patch st for arm, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm#st-arm-bug-fix + # patch st for arm, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix echo "build st-1.9t for arm"; ( rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 024b22c34..66d358edd 100644 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -73,7 +73,7 @@ SRS_MIPS_UBUNTU12=NO SRS_DEV=NO # dev, open main server feature for dev, no utest/research/librtmp SRS_FAST_DEV=NO -# demo, for the demo of srs, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo +# demo, for the demo of srs, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo SRS_DEMO=NO # raspberry-pi, open hls/ssl/static SRS_PI=NO @@ -172,7 +172,7 @@ Presets: --disable-all disable all features, only support vp6 RTMP. --dev for dev, open all features, no nginx/gperf/gprof/arm. --fast-dev for dev fast compile, the RTMP server, without librtmp/utest/research. - --demo for srs demo, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo + --demo for srs demo, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo --full enable all features, no gperf/gprof/arm. Conflicts: diff --git a/trunk/conf/demo.19350.conf b/trunk/conf/demo.19350.conf index e65001fe4..0aada8e33 100644 --- a/trunk/conf/demo.19350.conf +++ b/trunk/conf/demo.19350.conf @@ -1,5 +1,5 @@ # the config for srs demo -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo # @see full.conf for detail config. listen 19350; diff --git a/trunk/conf/demo.conf b/trunk/conf/demo.conf index bf5468bd8..191ff87f0 100644 --- a/trunk/conf/demo.conf +++ b/trunk/conf/demo.conf @@ -1,5 +1,5 @@ # the config for srs demo -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/dvr.segment.conf b/trunk/conf/dvr.segment.conf index 865dc1ed8..f29c28d30 100644 --- a/trunk/conf/dvr.segment.conf +++ b/trunk/conf/dvr.segment.conf @@ -1,5 +1,5 @@ # the config for srs to dvr in segment mode -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DVR +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/dvr.session.conf b/trunk/conf/dvr.session.conf index c93059f46..8b16b32eb 100644 --- a/trunk/conf/dvr.session.conf +++ b/trunk/conf/dvr.session.conf @@ -1,5 +1,5 @@ # the config for srs to dvr in session mode -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DVR +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/edge.conf b/trunk/conf/edge.conf index c90a3ee5c..a77986b6e 100644 --- a/trunk/conf/edge.conf +++ b/trunk/conf/edge.conf @@ -1,5 +1,5 @@ # the config for srs origin-edge cluster -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/edge.token.traverse.conf b/trunk/conf/edge.token.traverse.conf index c92ff61f4..bff8749f6 100644 --- a/trunk/conf/edge.token.traverse.conf +++ b/trunk/conf/edge.token.traverse.conf @@ -1,5 +1,5 @@ # the config for srs for token traverse authentication -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DRM +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DRM # @see full.conf for detail config. listen 1935 diff --git a/trunk/conf/ffmpeg.transcode.conf b/trunk/conf/ffmpeg.transcode.conf index 63a0a0975..04c434982 100644 --- a/trunk/conf/ffmpeg.transcode.conf +++ b/trunk/conf/ffmpeg.transcode.conf @@ -1,5 +1,5 @@ # the config for srs use ffmpeg to transcode -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleFFMPEG +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleFFMPEG # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/forward.master.conf b/trunk/conf/forward.master.conf index 9480e52de..8200b1c5f 100644 --- a/trunk/conf/forward.master.conf +++ b/trunk/conf/forward.master.conf @@ -1,5 +1,5 @@ # the config for srs to forward -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleForward +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleForward # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/forward.slave.conf b/trunk/conf/forward.slave.conf index 52649fd15..ff2dd53ed 100644 --- a/trunk/conf/forward.slave.conf +++ b/trunk/conf/forward.slave.conf @@ -1,5 +1,5 @@ # the config for srs to forward -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleForward +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleForward # @see full.conf for detail config. listen 19350; diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index dbb9586da..61c8b3d49 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -406,7 +406,7 @@ vhost debug.srs.com { # it's strongly recommend to open the debug_srs_upnode, # when connect to upnode, it will take the debug info, # for example, the id, source id, pid. - # please see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLog + # please see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLog # default: on debug_srs_upnode on; } diff --git a/trunk/conf/hls.conf b/trunk/conf/hls.conf index 9044956c2..375bc3629 100644 --- a/trunk/conf/hls.conf +++ b/trunk/conf/hls.conf @@ -1,5 +1,5 @@ # the config for srs to delivery hls -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHLS +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/http.hls.conf b/trunk/conf/http.hls.conf index 27dbfb44a..8c2c4cdc9 100644 --- a/trunk/conf/http.hls.conf +++ b/trunk/conf/http.hls.conf @@ -1,5 +1,5 @@ # the config for srs to delivery hls -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHLS +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/ingest.conf b/trunk/conf/ingest.conf index d82922fde..12fa2b8e5 100644 --- a/trunk/conf/ingest.conf +++ b/trunk/conf/ingest.conf @@ -1,5 +1,5 @@ # use ffmpeg to ingest file/stream/device to SRS -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleIngest +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleIngest # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/origin.conf b/trunk/conf/origin.conf index 439e9071a..401c5cd25 100644 --- a/trunk/conf/origin.conf +++ b/trunk/conf/origin.conf @@ -1,5 +1,5 @@ # the config for srs origin-edge cluster -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Edge +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge # @see full.conf for detail config. listen 19350; diff --git a/trunk/conf/realtime.conf b/trunk/conf/realtime.conf index 3adf218d1..6fd74b60e 100644 --- a/trunk/conf/realtime.conf +++ b/trunk/conf/realtime.conf @@ -1,5 +1,5 @@ # the config for srs to delivery realtime RTMP stream -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleRealtime +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRealtime # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/rtmp.conf b/trunk/conf/rtmp.conf index 96f232d29..38212b79e 100644 --- a/trunk/conf/rtmp.conf +++ b/trunk/conf/rtmp.conf @@ -1,5 +1,5 @@ # the config for srs to delivery RTMP -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleRTMP +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRTMP # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/transcode2hls.audio.only.conf b/trunk/conf/transcode2hls.audio.only.conf index e5fd8318b..69eb9525c 100644 --- a/trunk/conf/transcode2hls.audio.only.conf +++ b/trunk/conf/transcode2hls.audio.only.conf @@ -1,5 +1,5 @@ # the config for srs to delivery hls -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleHLS +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS # @see full.conf for detail config. listen 1935; diff --git a/trunk/configure b/trunk/configure index a985b7c05..632e2bf0f 100755 --- a/trunk/configure +++ b/trunk/configure @@ -134,7 +134,7 @@ BLACK="\\${BLACK}" echo -e "\${GREEN}build summary:\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e " |${SrsGperfSummaryColor}gperf @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_GPERF\${BLACK}" +echo -e " |${SrsGperfSummaryColor}gperf @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_GPERF\${BLACK}" echo -e " | ${SrsGperfMCSummaryColor}gmc @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\${BLACK}" echo -e " | ${SrsGperfMCSummaryColor}gmc: gperf memory check\${BLACK}" 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 echo -e " | ${SrsGperfCPSummaryColor}killall -2 srs # or CTRL+C to stop gcp\${BLACK}" echo -e " | ${SrsGperfCPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gcp* # to analysis cpu profile\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e " |${SrsGprofSummaryColor}gprof @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_GPROF\${BLACK}" +echo -e " |${SrsGprofSummaryColor}gprof @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_GPROF\${BLACK}" echo -e " |${SrsGprofSummaryColor}gprof: GNU profile tool, @see: http://www.cs.utah.edu/dept/old/texinfo/as/gprof.html\${BLACK}" echo -e " | ${SrsGprofSummaryColor}rm -f gmon.out; ./objs/srs -c conf/console.conf # start gprof\${BLACK}" 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, echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " |${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e " |${SrsLibrtmpSummaryColor}librtmp @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLibrtmp\${BLACK}" +echo -e " |${SrsLibrtmpSummaryColor}librtmp @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLibrtmp\${BLACK}" echo -e " |${SrsLibrtmpSummaryColor}librtmp: ./objs/include, ./objs/lib, the srs-librtmp library\${BLACK}" echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stream with simple handshake to server\${BLACK}" 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/ echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_bandwidth_check\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " |\${GREEN}server: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}" -echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS\${BLACK}" +echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS\${BLACK}" echo -e " | ${SrsHlsSummaryColor}hls: generate m3u8 and ts from rtmp stream\${BLACK}" -echo -e " | ${SrsDvrSummaryColor}dvr @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DVR\${BLACK}" +echo -e " | ${SrsDvrSummaryColor}dvr @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR\${BLACK}" echo -e " | ${SrsDvrSummaryColor}dvr: record RTMP stream to flv files.\${BLACK}" -echo -e " | ${SrsNginxSummaryColor}nginx @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_DeliveryHLS\${BLACK}" +echo -e " | ${SrsNginxSummaryColor}nginx @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS\${BLACK}" echo -e " | ${SrsNginxSummaryColor}nginx: delivery HLS stream by nginx\${BLACK}" echo -e " | ${SrsNginxSummaryColor}nginx: sudo ./objs/nginx/sbin/nginx\${BLACK}" -echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_RTMPHandshake\${BLACK}" +echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RTMPHandshake\${BLACK}" echo -e " | ${SrsSslSummaryColor}ssl: support RTMP complex handshake for client required, for instance, flash\${BLACK}" -echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG\${BLACK}" +echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG\${BLACK}" echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: transcode, mux, ingest tool\${BLACK}" echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: ./objs/ffmpeg/bin/ffmpeg\${BLACK}" -echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_FFMPEG\${BLACK}" +echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG\${BLACK}" echo -e " | ${SrsTranscodeSummaryColor}transcode: support transcoding RTMP stream\${BLACK}" -echo -e " | ${SrsIngestSummaryColor}ingest @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Ingest\${BLACK}" +echo -e " | ${SrsIngestSummaryColor}ingest @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Ingest\${BLACK}" echo -e " | ${SrsIngestSummaryColor}ingest: support ingest file/stream/device then push to SRS by RTMP stream\${BLACK}" -echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPCallback\${BLACK}" +echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback\${BLACK}" echo -e " | ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}" -echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPServer\${BLACK}" +echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer\${BLACK}" echo -e " | ${SrsHttpServerSummaryColor}http-server: support http server to delivery http stream\${BLACK}" -echo -e " | ${SrsHttpApiSummaryColor}http-api @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPApi\${BLACK}" +echo -e " | ${SrsHttpApiSummaryColor}http-api @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi\${BLACK}" echo -e " | ${SrsHttpApiSummaryColor}http-api: support http api to manage server\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e "\${GREEN}binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Build\${BLACK}" +echo -e "\${GREEN}binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build\${BLACK}" echo "you can:" echo " ./objs/srs -c conf/srs.conf" @@ -286,7 +286,7 @@ install-api: install @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs-api /etc/init.d/srs-api" @echo " /etc/init.d/srs-api start" @echo " http://\$(shell bash auto/local_ip.sh):8085" - @echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LinuxService" + @echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LinuxService" install: @echo "mkdir \$(__REAL_INSTALL)" @@ -308,7 +308,7 @@ install: @echo "srs installed, to link and start srs:" @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs /etc/init.d/srs" @echo " /etc/init.d/srs start" - @echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LinuxService" + @echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LinuxService" END diff --git a/trunk/research/arm/jmp.cpp b/trunk/research/arm/jmp.cpp index 2b2a59913..d9469405d 100644 --- a/trunk/research/arm/jmp.cpp +++ b/trunk/research/arm/jmp.cpp @@ -1,5 +1,5 @@ /* -# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm +# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm arm-linux-gnueabi-g++ -o jmp jmp.cpp -static arm-linux-gnueabi-strip jmp */ diff --git a/trunk/research/arm/jmp_sp.cpp b/trunk/research/arm/jmp_sp.cpp index 24ea4bc9b..1fb0be89d 100644 --- a/trunk/research/arm/jmp_sp.cpp +++ b/trunk/research/arm/jmp_sp.cpp @@ -1,5 +1,5 @@ /* -# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm +# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm arm-linux-gnueabi-g++ -g -o jmp_sp jmp_sp.cpp -static arm-linux-gnueabi-strip jmp_sp */ diff --git a/trunk/research/arm/test.cpp b/trunk/research/arm/test.cpp index 970d04283..1bad17d1c 100644 --- a/trunk/research/arm/test.cpp +++ b/trunk/research/arm/test.cpp @@ -1,5 +1,5 @@ /* -# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLinuxArm +# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm arm-linux-gnueabi-g++ -o test test.cpp -static arm-linux-gnueabi-strip test */ diff --git a/trunk/research/librtmp/Makefile b/trunk/research/librtmp/Makefile index af2b477cb..7e0dc35bc 100755 --- a/trunk/research/librtmp/Makefile +++ b/trunk/research/librtmp/Makefile @@ -32,7 +32,7 @@ help: @echo "Remark: srs Makefile will auto invoke this by --with/without-ssl, " @echo " that is, if user specified ssl(by --with-ssl), srs will make this by 'make ssl'" @echo " that is, if user not use ssl(by --without-ssl), use 'make nossl'" - @echo " see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_v1_Build" + @echo " see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_v1_Build" @echo "Remark: before make this sample, user must make the srs, with/without ssl" clean: diff --git a/trunk/scripts/install.sh b/trunk/scripts/install.sh index 9f935e5dd..54b0900a9 100755 --- a/trunk/scripts/install.sh +++ b/trunk/scripts/install.sh @@ -108,7 +108,7 @@ else fi echo "" -echo "see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_LinuxService" +echo "see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LinuxService" echo "install success, you can:" echo -e "${GREEN} sudo /etc/init.d/srs start${BLACK}" echo "srs root is ${INSTALL}" diff --git a/trunk/scripts/package.sh b/trunk/scripts/package.sh index 2a6072bf3..901b342e6 100755 --- a/trunk/scripts/package.sh +++ b/trunk/scripts/package.sh @@ -108,7 +108,7 @@ fi ok_msg "real os is ${os_name}-${os_major_version} ${os_release} ${os_machine}" # build srs -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Build +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build ok_msg "start build srs" if [ $ARM = YES ]; then ( diff --git a/trunk/scripts/run.sh b/trunk/scripts/run.sh index 2f0082e3b..4f4849547 100755 --- a/trunk/scripts/run.sh +++ b/trunk/scripts/run.sh @@ -51,4 +51,4 @@ echo -e "${GREEN}请在hosts中添加一行:${BLACK}" echo -e "${RED} $ip demo.srs.com${BLACK}" echo -e "${GREEN}演示地址:${BLACK}" echo -e "${RED} http://$ip:$port${BLACK}" -echo -e "@see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SampleDemo" +echo -e "@see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo" diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 84ed4ef57..a0facee1a 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -48,7 +48,7 @@ using namespace std; using namespace _srs_internal; -#define SRS_WIKI_URL_LOG "https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLog" +#define SRS_WIKI_URL_LOG "https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLog" // '\n' #define __LF (char)0x0a diff --git a/trunk/src/app/srs_app_reload.hpp b/trunk/src/app/srs_app_reload.hpp index 48b2715a0..85d5be016 100644 --- a/trunk/src/app/srs_app_reload.hpp +++ b/trunk/src/app/srs_app_reload.hpp @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * when reload callback, the config is updated yet. * * features not support reload, -* @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_Reload#notsupportedfeatures +* @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Reload#notsupportedfeatures */ class ISrsReloadHandler { diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index bd7f068f2..6cef9d9dd 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -194,7 +194,7 @@ int main(int argc, char** argv) // for special features. #ifdef SRS_AUTO_HTTP_SERVER srs_warn("http server is dev feature, " - "@see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_HTTPServer#feature"); + "@see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer#feature"); #endif /** diff --git a/trunk/src/utest/srs_utest_config.cpp b/trunk/src/utest/srs_utest_config.cpp index c6b235fb1..072a16a7a 100644 --- a/trunk/src/utest/srs_utest_config.cpp +++ b/trunk/src/utest/srs_utest_config.cpp @@ -505,7 +505,7 @@ std::string __full_conf = "" " # it's strongly recommend to open the debug_srs_upnode, \n" " # when connect to upnode, it will take the debug info, \n" " # for example, the id, source id, pid. \n" - " # please see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_SrsLog \n" + " # please see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLog \n" " # default: on \n" " debug_srs_upnode on; \n" "} \n"