胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
46c7a669 2 parents b9246209 81b0f246

Merge branch 'srs.master'

内嵌 并排对比
正在显示 1 个修改的文件 包含 67 行增加 和 17 行删除
@@ -174,25 +174,31 @@ A big THANK YOU goes to: @@ -174,25 +174,31 @@ A big THANK YOU goes to:
174 174
175 ## Mirrors 175 ## Mirrors
176 176
177 -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),
  178 +the GIT usage(
178 [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git), 179 [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) 180 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Git)
  181 +)
180 182
181 ```bash 183 ```bash
182 git clone https://github.com/winlinvip/simple-rtmp-server.git 184 git clone https://github.com/winlinvip/simple-rtmp-server.git
183 ``` 185 ```
184 186
185 -CSDN: [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn) 187 +CSDN: [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn) ,
  188 +the GIT usage(
186 [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git), 189 [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) 190 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Git)
  191 +)
188 192
189 ```bash 193 ```bash
190 git clone https://code.csdn.net/winlinvip/srs-csdn.git 194 git clone https://code.csdn.net/winlinvip/srs-csdn.git
191 ``` 195 ```
192 196
193 -OSChina: [http://git.oschina.net/winlinvip/srs.oschina](http://git.oschina.net/winlinvip/srs.oschina) 197 +OSChina: [http://git.oschina.net/winlinvip/srs.oschina](http://git.oschina.net/winlinvip/srs.oschina) ,
  198 +the GIT usage(
194 [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git), 199 [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) 200 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Git)
  201 +)
196 202
197 ```bash 203 ```bash
198 git clone https://git.oschina.net/winlinvip/srs.oschina.git 204 git clone https://git.oschina.net/winlinvip/srs.oschina.git
@@ -228,24 +234,68 @@ cd simple-rtmp-server/trunk @@ -228,24 +234,68 @@ cd simple-rtmp-server/trunk
228 [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRTMP), 234 [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) 235 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleRTMP)
230 ) 236 )
231 -* [Usage: How to delivery HLS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS)  
232 -* [Usage: How to delivery HLS for other codec?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleTranscode2HLS)  
233 -* [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleFFMPEG)  
234 -* [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleForward)  
235 -* [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRealtime)  
236 -* [Usage: How to deploy SRS on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleARM)  
237 -* [Usage: How to ingest file/stream/device to SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleIngest)  
238 -* [Usage: How to use SRS-HTTP-server to delivery HTTP/HLS stream?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHTTP)  
239 -* [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo)  
240 -* [Usage: How to publish h.264 raw stream to SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data)  
241 -* [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Sample)  
242 -* [Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product) 237 +* Usage: How to delivery HLS?(
  238 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS),
  239 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleHLS)
  240 +)
  241 +* Usage: How to delivery HLS for other codec?(
  242 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleTranscode2HLS),
  243 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleTranscode2HLS)
  244 +)
  245 +* Usage: How to transode RTMP stream by SRS?(
  246 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleFFMPEG),
  247 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleFFMPEG)
  248 +)
  249 +* Usage: How to forward stream to other server?(
  250 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleForward),
  251 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleForward)
  252 +)
  253 +* Usage: How to deploy low lantency application?(
  254 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleRealtime),
  255 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleRealtime)
  256 +)
  257 +* Usage: How to deploy SRS on ARM?(
  258 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleARM),
  259 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleARM)
  260 +)
  261 +* Usage: How to ingest file/stream/device to SRS?(
  262 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleIngest),
  263 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleIngest)
  264 +)
  265 +* Usage: How to use SRS-HTTP-server to delivery HTTP/HLS stream?(
  266 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHTTP),
  267 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleHTTP)
  268 +)
  269 +* Usage: How to show the demo of SRS?(
  270 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleDemo),
  271 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleDemo)
  272 +)
  273 +* Usage: How to publish h.264 raw stream to SRS?(
  274 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data),
  275 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SrsLibrtmp#publish-h264-raw-data)
  276 +)
  277 +* Usage: Solution using SRS?(
  278 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Sample),
  279 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Sample)
  280 +)
  281 +* Usage: Why SRS?(
  282 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product),
  283 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Product)
  284 +)
243 285
244 ## Wiki 286 ## Wiki
245 287
  288 +SRS 1.0 wiki
  289 +
  290 +Please select your language:
  291 +* [SRS 1.0 English](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Home)
  292 +* [SRS 1.0 Chinese](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Home)
  293 +
  294 +SRS 2.0 wiki
  295 +
246 Please select your language: 296 Please select your language:
247 -* [English](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Home)  
248 -* [Chinese](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Home) 297 +* [SRS 2.0 English](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_Home)
  298 +* [SRS 2.0 Chinese](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_Home)
249 299
250 ## Donation 300 ## Donation
251 301