diff --git a/README.md b/README.md
index 0cc94e097..9acb6cc33 100755
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@ SRS/2.0，开发代号：[ZhouGuowen](https://github.com/simple-rtmp-server/srs/
SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。
-<<<<<<< HEAD
Download from github.io:
[Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.32.zip)
[more...](http://winlinvip.github.io/srs.release/releases/)
@@ -906,141 +905,37 @@ Performance benchmark history, on virtual box.
The play benchmark by [st-load](https://github.com/winlinvip/st-load):
-
-
- | Update |
- SRS |
- Clients |
- Type |
- CPU |
- Memory |
- Commit |
-
-
- | 2013-11-28 |
- 0.5.0 |
- 1.8k(1800) |
- players |
- 90% |
- 41MB |
- - |
-
-
- | 2014-07-12 |
- 0.9.156 |
- 1.8k(1800) |
- players |
- 68% |
- 38MB |
- - |
-
-
- | 2014-07-12 |
- 0.9.156 |
- 2.7k(2700) |
- players |
- 89% |
- 61MB |
- commit |
-
-
- | 2014-11-11 |
- 1.0.5 |
- 2.7k(2700) |
- players |
- 85% |
- 66MB |
- - |
-
-
- | 2014-11-11 |
- 2.0.12 |
- 2.7k(2700) |
- players |
- 85% |
- 66MB |
- - |
-
-
- | 2014-11-12 |
- 2.0.14 |
- 2.7k(2700) |
- players |
- 69% |
- 59MB |
- - |
-
-
- | 2014-11-12 |
- 2.0.14 |
- 3.5k(3500) |
- players |
- 95% |
- 78MB |
- commit |
-
-
- | 2014-11-13 |
- 2.0.15 |
- 6.0k(6000) |
- players |
- 82% |
- 203MB |
- commit |
-
-
- | 2014-11-22 |
- 2.0.30 |
- 7.5k(7500) |
- players |
- 87% |
- 320MB |
- commit |
-
-
- | 2014-12-05 |
- 2.0.55 |
- 8.0k(8000) |
- players |
- 89% |
- 360MB |
- (mw_sleep=350)
commit |
-
-
- | 2014-12-05 |
- 2.0.57 |
- 9.0k(9000) |
- players |
- 90% |
- 468MB |
- commit |
-
-
- | 2014-12-07 |
- 2.0.67 |
- 10k(10000) |
- players |
- 95% |
- 656MB |
- commit |
-
-
+
+| Update | SRS | Clients | Type | CPU | Memory | Commit |
+| ------------- | --------- | ------------- | ------------- | --------- | -------- | ------------ |
+| 2013-11-28 | 0.5.0 | 1.8k(1800) | players | 90% | 41M | - |
+| 2014-07-12 | 0.9.156 | 1.8k(1800) | players | 68% | 38MB | - |
+| 2014-07-12 | 0.9.156 | 2.7k(2700) | players | 89% | 61MB | [code][p6] |
+| 2014-11-11 | 1.0.5 | 2.7k(2700) | players | 85% | 66MB | - |
+| 2014-11-11 | 2.0.12 | 2.7k(2700) | players | 85% | 66MB | - |
+| 2014-11-12 | 2.0.14 | 2.7k(2700) | players | 69% | 59MB | - |
+| 2014-11-12 | 2.0.14 | 3.5k(3500) | players | 95% | 78MB | [code][p7] |
+| 2014-11-13 | 2.0.15 | 6.0k(6000) | players | 82% | 203MB | [code][p8] |
+| 2014-11-22 | 2.0.30 | 7.5k(7500) | players | 87% | 320MB | [code][p9] |
+| 2014-12-05 | 2.0.55 | 8.0k(8000) | players | 89% | 360MB | [code][p10] |
+| 2014-12-05 | 2.0.57 | 9.0k(9000) | players | 90% | 468MB | [code][p11] |
+| 2014-12-07 | 2.0.67 | 10k(10000) | players | 95% | 656MB | [code][p12] |
### Publish benchmark
The publish benchmark by [st-load](https://github.com/winlinvip/st-load):
-| Update | SRS | Clients | Type | CPU | Memory | Commit |
-| ------------- | --------- | ------------- | ------------- | --------- | -------- | -------- |
-| 2014-12-03 | 1.0.10 | 1.2k(1200) | publishers | 96% | 43MB | - |
-| 2014-12-03 | 2.0.12 | 1.2k(1200) | publishers | 96% | 43MB | - |
-| 2014-12-03 | 2.0.47 | 1.2k(1200) | publishers | 84% | 76MB | commit |
-| 2014-12-03 | 2.0.47 | 1.4k(1400) | publishers | 95% | 140MB | - |
-| 2014-12-03 | 2.0.48 | 1.4k(1400 | publishers | 95% | 140MB | commit |
-| 2014-12-04 | 2.0.49 | 1.4k(1400) | publishers | 68% | 144MB | - |
-| 2014-12-04 | 2.0.49 | 2.5k(2500) | publishers | 95% | 404MB | commit |
-| 2014-12-04 | 2.0.51 | 2.5k(2500) | publishers | 91% | 259MB | commit |
-| 2014-12-04 | 2.0.52 | 4.0k(4000) | publishers | 80% | 331MB | (mr_sleep=350)
commit |
+| Update | SRS | Clients | Type | CPU | Memory | Commit |
+| ------------- | --------- | ------------- | ------------- | --------- | -------- | ------------ |
+| 2014-12-03 | 1.0.10 | 1.2k(1200) | publishers | 96% | 43MB | - |
+| 2014-12-03 | 2.0.12 | 1.2k(1200) | publishers | 96% | 43MB | - |
+| 2014-12-03 | 2.0.47 | 1.2k(1200) | publishers | 84% | 76MB | [code][p1] |
+| 2014-12-03 | 2.0.47 | 1.4k(1400) | publishers | 95% | 140MB | - |
+| 2014-12-03 | 2.0.48 | 1.4k(1400 | publishers | 95% | 140MB | [code][p2] |
+| 2014-12-04 | 2.0.49 | 1.4k(1400) | publishers | 68% | 144MB | - |
+| 2014-12-04 | 2.0.49 | 2.5k(2500) | publishers | 95% | 404MB | [code][p3] |
+| 2014-12-04 | 2.0.51 | 2.5k(2500) | publishers | 91% | 259MB | [code][p4] |
+| 2014-12-04 | 2.0.52 | 4.0k(4000) | publishers | 80% | 331MB | [code][p5] |
### Latency benchmark
@@ -1049,40 +944,12 @@ The latency between encoder and player with realtime config(
[EN](https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency)
):
-
-
- | Update |
- SRS |
- VP6 |
- H.264 |
- VP6+mp3 |
- H.264+mp3 |
-
-
- | 2014-12-03 |
- 1.0.10 |
- 0.4s |
- 0.4s |
- 0.9s |
- 1.2s |
-
-
- | 2014-12-12 |
- 2.0.70 |
- 0.1s |
- 0.4s |
- 1.0s |
- 0.9s |
-
-
- | 2014-12-16 |
- 2.0.72 |
- 0.1s |
- 0.4s |
- 0.8s |
- 0.6s |
-
-
+
+| Update | SRS | VP6 | H.264 | VP6+MP3 | H.264+MP3 |
+| ------------- | --------- | --------- | --------- | --------- | -------- |
+| 2014-12-03 | 1.0.10 | 0.4s | 0.4s | 0.9s | 1.2s |
+| 2014-12-12 | 2.0.70 |[0.1s][p13]|[0.4s][p14]| 1.0s | 0.9s |
+| 2014-12-16 | 2.0.72 | 0.1s | 0.4s |[0.8s][p15]|[0.6s][p16]|
We use FMLE as encoder for benchmark. The latency of server is 0.1s+,
and the bottleneck is the encoder. For more information, read
@@ -1168,3 +1035,23 @@ over some protocol and remux to rtmp to SRS. Read