胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
9b7681ab 1 parent b8f6ef59

update readme, remove all br.

内嵌 并排对比
正在显示 1 个修改的文件 包含 52 行增加 和 29 行删除
@@ -52,25 +52,31 @@ rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/Deliver @@ -52,25 +52,31 @@ rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/Deliver
52 [HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS), [HLS audio only](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS#hlsaudioonly), [transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), 52 [HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS), [HLS audio only](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS#hlsaudioonly), [transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG),
53 [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback). 53 [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback).
54 54
55 -Release: [http://winlinvip.github.io/simple-rtmp-server](http://winlinvip.github.io/simple-rtmp-server) <br/>  
56 -Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) <br/>  
57 -CSDN mirror: [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn)<br/>  
58 -See also: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server) <br/>  
59 -Github DEMO: [demo with your SRS](http://winlinvip.github.io/simple-rtmp-server/trunk/research/players/srs_player.html?server=192.168.1.170&vhost=192.168.1.170) <br/>  
60 -Wiki: [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki) <br/> 55 +Release: [http://winlinvip.github.io/simple-rtmp-server](http://winlinvip.github.io/simple-rtmp-server)
  56 +
  57 +Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)
  58 +
  59 +CSDN mirror: [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn)
  60 +
  61 +See also: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server)
  62 +
  63 +Github DEMO: [demo with your SRS](http://winlinvip.github.io/simple-rtmp-server/trunk/research/players/srs_player.html?server=192.168.1.170&vhost=192.168.1.170)
  64 +
  65 +Wiki: [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki)
  66 +
61 TencentQQ: [http://url.cn/WAHICw](http://url.cn/WAHICw) (Group: 212189142) 67 TencentQQ: [http://url.cn/WAHICw](http://url.cn/WAHICw) (Group: 212189142)
62 68
63 ## AUTHORS 69 ## AUTHORS
64 -The PRIMARY AUTHORS are (and/or have been)(Authors ordered by first contribution): <br/>  
65 -* winlin([winterserver](#)): [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) <br/>  
66 -* wenjie([wenjiegit](https://github.com/wenjiegit/simple-rtmp-server)): [http://blog.chinaunix.net/uid/25006789.html](http://blog.chinaunix.net/uid/25006789.html) <br/> 70 +The PRIMARY AUTHORS are (and/or have been)(Authors ordered by first contribution):
  71 +* winlin([winterserver](#)): [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)
  72 +* wenjie([wenjiegit](https://github.com/wenjiegit/simple-rtmp-server)): [http://blog.chinaunix.net/uid/25006789.html](http://blog.chinaunix.net/uid/25006789.html)
67 73
68 -About the primary AUTHORS: <br/>  
69 -* Contribute important features to SRS. <br/>  
70 -* Names of all PRIMARY AUTHORS response in NetConnection.connect and metadata. <br/> 74 +About the primary AUTHORS:
  75 +* Contribute important features to SRS.
  76 +* Names of all PRIMARY AUTHORS response in NetConnection.connect and metadata.
71 77
72 -And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --<br/>  
73 -people who have submitted patches, reported bugs, added translations, helped<br/> 78 +And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
  79 +people who have submitted patches, reported bugs, added translations, helped
74 answer newbie questions, and generally made SRS that much better: [AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt) 80 answer newbie questions, and generally made SRS that much better: [AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt)
75 81
76 A big THANK YOU goes to: 82 A big THANK YOU goes to:
@@ -85,31 +91,48 @@ A big THANK YOU goes to: @@ -85,31 +91,48 @@ A big THANK YOU goes to:
85 91
86 ## Usage 92 ## Usage
87 93
88 -<strong>Step 1:</strong> get SRS <br/> 94 +<strong>Step 1:</strong> get SRS
  95 +
89 <pre> 96 <pre>
90 git clone https://github.com/winlinvip/simple-rtmp-server && 97 git clone https://github.com/winlinvip/simple-rtmp-server &&
91 cd simple-rtmp-server/trunk 98 cd simple-rtmp-server/trunk
92 </pre> 99 </pre>
  100 +
93 <strong>Step 2:</strong> build SRS, 101 <strong>Step 2:</strong> build SRS,
94 -<strong>Requires Centos6.x/Ubuntu12 32/64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build)</strong><br/> 102 +<strong>Requires Centos6.x/Ubuntu12 32/64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build)</strong>
  103 +
95 <pre> 104 <pre>
96 ./configure && make 105 ./configure && make
97 </pre> 106 </pre>
98 -<strong>Step 3:</strong> start SRS <br/> 107 +
  108 +<strong>Step 3:</strong> start SRS
  109 +
99 <pre> 110 <pre>
100 ./objs/srs -c conf/srs.conf 111 ./objs/srs -c conf/srs.conf
101 </pre> 112 </pre>
102 -<strong>See also:</strong><br/>  
103 -[Usage: How to delivery RTMP?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRTMP)<br/>  
104 -[Usage: How to delivery HLS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleHLS)<br/>  
105 -[Usage: How to delivery HLS for other codec?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleTranscode2HLS)<br/>  
106 -[Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleFFMPEG)<br/>  
107 -[Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward)<br/>  
108 -[Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime)<br/>  
109 -[Usage: How to deploy srs on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleARM)<br/>  
110 -[Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo)<br/>  
111 -[Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample)<br/>  
112 -[Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Product)<br/> 113 +
  114 +<strong>See also:</strong>
  115 +
  116 +[Usage: How to delivery RTMP?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRTMP)
  117 +
  118 +[Usage: How to delivery HLS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleHLS)
  119 +
  120 +[Usage: How to delivery HLS for other codec?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleTranscode2HLS)
  121 +
  122 +[Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleFFMPEG)
  123 +
  124 +[Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward)
  125 +
  126 +[Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime)
  127 +
  128 +[Usage: How to deploy srs on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleARM)
  129 +
  130 +[Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo)
  131 +
  132 +[Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample)
  133 +
  134 +[Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Product)
  135 +
113 136
114 ## System Requirements 137 ## System Requirements
115 Supported operating systems and hardware: 138 Supported operating systems and hardware:
@@ -117,7 +140,7 @@ Supported operating systems and hardware: @@ -117,7 +140,7 @@ Supported operating systems and hardware:
117 * All hardware. 140 * All hardware.
118 141
119 ## Summary 142 ## Summary
120 -01. Simple: also stable enough.<br/> 143 +01. Simple: also stable enough.
121 02. [High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance): single-thread, async socket, event/st-thread driven.<br/> 144 02. [High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance): single-thread, async socket, event/st-thread driven.<br/>
122 03. Support RTMP edge server(plan), support origin server.<br/> 145 03. Support RTMP edge server(plan), support origin server.<br/>
123 04. RTMP without vod streaming, live streaming only.<br/> 146 04. RTMP without vod streaming, live streaming only.<br/>