胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
55d4c713 1 parent 273ba9c2

update readme for wiki

内嵌 并排对比
正在显示 1 个修改的文件 包含 91 行增加 和 25 行删除
@@ -54,29 +54,86 @@ minimum run. see Build( @@ -54,29 +54,86 @@ minimum run. see Build(
54 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Build) 54 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Build)
55 ). 55 ).
56 56
57 -SRS supports [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RtmpUrlVhost),  
58 -rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP),  
59 -client/[edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge) pull),  
60 -[ingester(srs pull)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Ingest),  
61 -[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS),  
62 -[HLS audio only](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS#hlsaudioonly),  
63 -[transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG),  
64 -[forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG),  
65 -[http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback),  
66 -[http api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi),  
67 -[http server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer),  
68 -[dvr](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR) and  
69 -[SRS-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp).  
70 -  
71 -[SRS-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp) 57 +SRS supports vhost(
  58 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RtmpUrlVhost),
  59 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_RtmpUrlVhost)
  60 +),
  61 +rtmp(encoder push(
  62 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP),
  63 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_DeliveryRTMP)
  64 +),
  65 +client/edge(
  66 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge),
  67 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Edge),
  68 +) pull),
  69 +ingester(srs pull)(
  70 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Ingest),
  71 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Ingest)
  72 +),
  73 +HLS(
  74 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS),
  75 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_DeliveryHLS)
  76 +),
  77 +HLS audio only(
  78 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS#hlsaudioonly),
  79 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_DeliveryHLS#hlsaudioonly)
  80 +),
  81 +transcoding(
  82 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG),
  83 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_FFMPEG)
  84 +),
  85 +forward(
  86 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG),
  87 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_FFMPEG)
  88 +),
  89 +http hooks(
  90 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback),
  91 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_HTTPCallback)
  92 +),
  93 +http api(
  94 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi),
  95 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_HTTPApi)
  96 +),
  97 +http server(
  98 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer),
  99 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_HTTPServer)
  100 +),
  101 +dvr(
  102 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR),
  103 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_DVR)
  104 +) and
  105 +SRS-librtmp(
  106 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp),
  107 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SrsLibrtmp)
  108 +).
  109 +
  110 +SRS-librtmp(
  111 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp),
  112 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SrsLibrtmp)
  113 +)
72 is a client library, only depends on c++ and socket, with 114 is a client library, only depends on c++ and socket, with
73 -[examples](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples)(to play, 115 +examples(
  116 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples),
  117 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SrsLibrtmp#srs-librtmp-examples)
  118 +)(to play,
74 publish, ingest flv/rtmp, inject flv, 119 publish, ingest flv/rtmp, inject flv,
75 -[publish h264 raw stream](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data)),  
76 -[exported as seperate project or single cpp file by configure](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#export-srs-librtmp).  
77 -[SRS-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp) 120 +publish h264 raw stream(
  121 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data),
  122 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SrsLibrtmp#publish-h264-raw-data)
  123 +),
  124 +exported as seperate project or single cpp file by configure(
  125 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#export-srs-librtmp),
  126 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SrsLibrtmp#export-srs-librtmp)
  127 +).
  128 +SRS-librtmp(
  129 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp),
  130 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SrsLibrtmp)
  131 +)
78 provides apis to support RTMP, FLV, AMF0 and 132 provides apis to support RTMP, FLV, AMF0 and
79 -[h.264 raw stream](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data). 133 +h.264 raw stream(
  134 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data),
  135 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SrsLibrtmp#publish-h264-raw-data)
  136 +).
80 137
81 WebSite: [http://ossrs.net](http://ossrs.net) <br/> 138 WebSite: [http://ossrs.net](http://ossrs.net) <br/>
82 Release: [http://winlinvip.github.io/srs.release](http://winlinvip.github.io/srs.release) <br/> 139 Release: [http://winlinvip.github.io/srs.release](http://winlinvip.github.io/srs.release) <br/>
@@ -118,21 +175,24 @@ A big THANK YOU goes to: @@ -118,21 +175,24 @@ A big THANK YOU goes to:
118 ## Mirrors 175 ## Mirrors
119 176
120 Github: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server) 177 Github: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server)
121 -[Git Usage](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git) 178 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git),
  179 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Git)
122 180
123 ```bash 181 ```bash
124 git clone https://github.com/winlinvip/simple-rtmp-server.git 182 git clone https://github.com/winlinvip/simple-rtmp-server.git
125 ``` 183 ```
126 184
127 CSDN: [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn) 185 CSDN: [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn)
128 -[Git Usage](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git) 186 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git),
  187 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Git)
129 188
130 ```bash 189 ```bash
131 git clone https://code.csdn.net/winlinvip/srs-csdn.git 190 git clone https://code.csdn.net/winlinvip/srs-csdn.git
132 ``` 191 ```
133 192
134 OSChina: [http://git.oschina.net/winlinvip/srs.oschina](http://git.oschina.net/winlinvip/srs.oschina) 193 OSChina: [http://git.oschina.net/winlinvip/srs.oschina](http://git.oschina.net/winlinvip/srs.oschina)
135 -[Git Usage](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git) 194 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git),
  195 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Git)
136 196
137 ```bash 197 ```bash
138 git clone https://git.oschina.net/winlinvip/srs.oschina.git 198 git clone https://git.oschina.net/winlinvip/srs.oschina.git
@@ -148,7 +208,10 @@ cd simple-rtmp-server/trunk @@ -148,7 +208,10 @@ cd simple-rtmp-server/trunk
148 </pre> 208 </pre>
149 209
150 <strong>Step 2:</strong> build SRS, 210 <strong>Step 2:</strong> build SRS,
151 -<strong>Requires Centos6.x/Ubuntu12 32/64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build)</strong> 211 +<strong>Requires Centos6.x/Ubuntu12 32/64bits, others see Build(
  212 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build),
  213 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Build)
  214 +).</strong>
152 215
153 <pre> 216 <pre>
154 ./configure && make 217 ./configure && make
@@ -161,7 +224,10 @@ cd simple-rtmp-server/trunk @@ -161,7 +224,10 @@ cd simple-rtmp-server/trunk
161 </pre> 224 </pre>
162 225
163 <strong>See also:</strong> 226 <strong>See also:</strong>
164 -* [Usage: How to delivery RTMP?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRTMP) 227 +* Usage: How to delivery RTMP?(
  228 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRTMP),
  229 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleRTMP)
  230 +)
165 * [Usage: How to delivery HLS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS) 231 * [Usage: How to delivery HLS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS)
166 * [Usage: How to delivery HLS for other codec?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleTranscode2HLS) 232 * [Usage: How to delivery HLS for other codec?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleTranscode2HLS)
167 * [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleFFMPEG) 233 * [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleFFMPEG)