胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
504d0b93 1 parent 6f60fefb

update readme

内嵌 并排对比
正在显示 1 个修改的文件 包含 52 行增加 和 165 行删除
@@ -4,7 +4,6 @@ SRS/2.0，开发代号：[ZhouGuowen](https://github.com/simple-rtmp-server/srs/ @@ -4,7 +4,6 @@ SRS/2.0，开发代号：[ZhouGuowen](https://github.com/simple-rtmp-server/srs/
4 4
5 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。 5 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。
6 6
7 -<<<<<<< HEAD  
8 Download from github.io: 7 Download from github.io:
9 [Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.32.zip) 8 [Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.32.zip)
10 [more...](http://winlinvip.github.io/srs.release/releases/) 9 [more...](http://winlinvip.github.io/srs.release/releases/)
@@ -906,141 +905,37 @@ Performance benchmark history, on virtual box. @@ -906,141 +905,37 @@ Performance benchmark history, on virtual box.
906 905
907 The play benchmark by [st-load](https://github.com/winlinvip/st-load): 906 The play benchmark by [st-load](https://github.com/winlinvip/st-load):
908 907
909 -<table>  
910 - <tr>  
911 - <th>Update</th>  
912 - <th>SRS</th>  
913 - <th>Clients</th>  
914 - <th>Type</th>  
915 - <th>CPU</th>  
916 - <th>Memory</th>  
917 - <th>Commit</th>  
918 - </tr>  
919 - <tr>  
920 - <td>2013-11-28</td>  
921 - <td>0.5.0</td>  
922 - <td>1.8k(1800)</td>  
923 - <td>players</td>  
924 - <td>90%</td>  
925 - <td>41MB</td>  
926 - <td>-</td>  
927 - </tr>  
928 - <tr>  
929 - <td>2014-07-12</td>  
930 - <td>0.9.156</td>  
931 - <td>1.8k(1800)</td>  
932 - <td>players</td>  
933 - <td>68%</td>  
934 - <td>38MB</td>  
935 - <td>-</td>  
936 - </tr>  
937 - <tr>  
938 - <td>2014-07-12</td>  
939 - <td>0.9.156</td>  
940 - <td>2.7k(2700)</td>  
941 - <td>players</td>  
942 - <td>89%</td>  
943 - <td>61MB</td>  
944 - <td><a href="https://github.com/simple-rtmp-server/srs/commit/1ae3e6c64cc5cee90e6050c26968ebc3c18281be">commit</a></td>  
945 - </tr>  
946 - <tr>  
947 - <td>2014-11-11</td>  
948 - <td>1.0.5</td>  
949 - <td>2.7k(2700)</td>  
950 - <td>players</td>  
951 - <td>85%</td>  
952 - <td>66MB</td>  
953 - <td>-</td>  
954 - </tr>  
955 - <tr>  
956 - <td>2014-11-11</td>  
957 - <td>2.0.12</td>  
958 - <td>2.7k(2700)</td>  
959 - <td>players</td>  
960 - <td>85%</td>  
961 - <td>66MB</td>  
962 - <td>-</td>  
963 - </tr>  
964 - <tr>  
965 - <td>2014-11-12</td>  
966 - <td>2.0.14</td>  
967 - <td>2.7k(2700)</td>  
968 - <td>players</td>  
969 - <td>69%</td>  
970 - <td>59MB</td>  
971 - <td>-</td>  
972 - </tr>  
973 - <tr>  
974 - <td>2014-11-12</td>  
975 - <td>2.0.14</td>  
976 - <td>3.5k(3500)</td>  
977 - <td>players</td>  
978 - <td>95%</td>  
979 - <td>78MB</td>  
980 - <td><a href="https://github.com/simple-rtmp-server/srs/commit/8acd143a7a152885b815999162660fd4e7a3f247">commit</a></td>  
981 - </tr>  
982 - <tr>  
983 - <td>2014-11-13</td>  
984 - <td>2.0.15</td>  
985 - <td>6.0k(6000)</td>  
986 - <td>players</td>  
987 - <td>82%</td>  
988 - <td>203MB</td>  
989 - <td><a href="https://github.com/simple-rtmp-server/srs/commit/cc6aca9ad55342a06440ce7f3b38453776b2b2d1">commit</a></td>  
990 - </tr>  
991 - <tr>  
992 - <td>2014-11-22</td>  
993 - <td>2.0.30</td>  
994 - <td>7.5k(7500)</td>  
995 - <td>players</td>  
996 - <td>87%</td>  
997 - <td>320MB</td>  
998 - <td><a href="https://github.com/simple-rtmp-server/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5">commit</a></td>  
999 - </tr>  
1000 - <tr>  
1001 - <td>2014-12-05</td>  
1002 - <td>2.0.55</td>  
1003 - <td>8.0k(8000)</td>  
1004 - <td>players</td>  
1005 - <td>89%</td>  
1006 - <td>360MB</td>  
1007 - <td>(mw_sleep=350)<br/><a href="https://github.com/simple-rtmp-server/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5">commit</a></td>  
1008 - </tr>  
1009 - <tr>  
1010 - <td>2014-12-05</td>  
1011 - <td>2.0.57</td>  
1012 - <td>9.0k(9000)</td>  
1013 - <td>players</td>  
1014 - <td>90%</td>  
1015 - <td>468MB</td>  
1016 - <td><a href="https://github.com/simple-rtmp-server/srs/commit/9ee138746f83adc26f0e236ec017f4d68a300004">commit</a></td>  
1017 - </tr>  
1018 - <tr>  
1019 - <td>2014-12-07</td>  
1020 - <td>2.0.67</td>  
1021 - <td>10k(10000)</td>  
1022 - <td>players</td>  
1023 - <td>95%</td>  
1024 - <td>656MB</td>  
1025 - <td><a href="https://github.com/simple-rtmp-server/srs/commit/1311b6fe6576fd7b9c6d299b0f8f2e8d202f4bf8">commit</a></td>  
1026 - </tr>  
1027 -</table> 908 +
  909 +| Update | SRS | Clients | Type | CPU | Memory | Commit |
  910 +| ------------- | --------- | ------------- | ------------- | --------- | -------- | ------------ |
  911 +| 2013-11-28 | 0.5.0 | 1.8k(1800) | players | 90% | 41M | - |
  912 +| 2014-07-12 | 0.9.156 | 1.8k(1800) | players | 68% | 38MB | - |
  913 +| 2014-07-12 | 0.9.156 | 2.7k(2700) | players | 89% | 61MB | [code][p6] |
  914 +| 2014-11-11 | 1.0.5 | 2.7k(2700) | players | 85% | 66MB | - |
  915 +| 2014-11-11 | 2.0.12 | 2.7k(2700) | players | 85% | 66MB | - |
  916 +| 2014-11-12 | 2.0.14 | 2.7k(2700) | players | 69% | 59MB | - |
  917 +| 2014-11-12 | 2.0.14 | 3.5k(3500) | players | 95% | 78MB | [code][p7] |
  918 +| 2014-11-13 | 2.0.15 | 6.0k(6000) | players | 82% | 203MB | [code][p8] |
  919 +| 2014-11-22 | 2.0.30 | 7.5k(7500) | players | 87% | 320MB | [code][p9] |
  920 +| 2014-12-05 | 2.0.55 | 8.0k(8000) | players | 89% | 360MB | [code][p10] |
  921 +| 2014-12-05 | 2.0.57 | 9.0k(9000) | players | 90% | 468MB | [code][p11] |
  922 +| 2014-12-07 | 2.0.67 | 10k(10000) | players | 95% | 656MB | [code][p12] |
1028 923
1029 ### Publish benchmark 924 ### Publish benchmark
1030 925
1031 The publish benchmark by [st-load](https://github.com/winlinvip/st-load): 926 The publish benchmark by [st-load](https://github.com/winlinvip/st-load):
1032 927
1033 -| Update | SRS | Clients | Type | CPU | Memory | Commit |  
1034 -| ------------- | --------- | ------------- | ------------- | --------- | -------- | -------- |  
1035 -| 2014-12-03 | 1.0.10 | 1.2k(1200) | publishers | 96% | 43MB | - |  
1036 -| 2014-12-03 | 2.0.12 | 1.2k(1200) | publishers | 96% | 43MB | - |  
1037 -| 2014-12-03 | 2.0.47 | 1.2k(1200) | publishers | 84% | 76MB | <a href="https://github.com/simple-rtmp-server/srs/commit/787ab674e38734ea8e0678101614fdcd84645dc8">commit</a> |  
1038 -| 2014-12-03 | 2.0.47 | 1.4k(1400) | publishers | 95% | 140MB | - |  
1039 -| 2014-12-03 | 2.0.48 | 1.4k(1400 | publishers | 95% | 140MB | <a href="https://github.com/simple-rtmp-server/srs/commit/f35ec2155b1408d528a9f37da7904c9625186bcf">commit</a> |  
1040 -| 2014-12-04 | 2.0.49 | 1.4k(1400) | publishers | 68% | 144MB | - |  
1041 -| 2014-12-04 | 2.0.49 | 2.5k(2500) | publishers | 95% | 404MB | <a href="https://github.com/simple-rtmp-server/srs/commit/29324fab469e0f7cef9ad04ffdbce832ac7dd9ff">commit</a> |  
1042 -| 2014-12-04 | 2.0.51 | 2.5k(2500) | publishers | 91% | 259MB | <a href="https://github.com/simple-rtmp-server/srs/commit/f57801eb46c16755b173984b915a4166922df6a6">commit</a> |  
1043 -| 2014-12-04 | 2.0.52 | 4.0k(4000) | publishers | 80% | 331MB | (mr_sleep=350)<br/><a href="https://github.com/simple-rtmp-server/srs/commit/5589b13d2e216b91f97afb78ee0c011b2fccf7da">commit</a> | 928 +| Update | SRS | Clients | Type | CPU | Memory | Commit |
  929 +| ------------- | --------- | ------------- | ------------- | --------- | -------- | ------------ |
  930 +| 2014-12-03 | 1.0.10 | 1.2k(1200) | publishers | 96% | 43MB | - |
  931 +| 2014-12-03 | 2.0.12 | 1.2k(1200) | publishers | 96% | 43MB | - |
  932 +| 2014-12-03 | 2.0.47 | 1.2k(1200) | publishers | 84% | 76MB | [code][p1] |
  933 +| 2014-12-03 | 2.0.47 | 1.4k(1400) | publishers | 95% | 140MB | - |
  934 +| 2014-12-03 | 2.0.48 | 1.4k(1400 | publishers | 95% | 140MB | [code][p2] |
  935 +| 2014-12-04 | 2.0.49 | 1.4k(1400) | publishers | 68% | 144MB | - |
  936 +| 2014-12-04 | 2.0.49 | 2.5k(2500) | publishers | 95% | 404MB | [code][p3] |
  937 +| 2014-12-04 | 2.0.51 | 2.5k(2500) | publishers | 91% | 259MB | [code][p4] |
  938 +| 2014-12-04 | 2.0.52 | 4.0k(4000) | publishers | 80% | 331MB | [code][p5] |
1044 939
1045 ### Latency benchmark 940 ### Latency benchmark
1046 941
@@ -1049,40 +944,12 @@ The latency between encoder and player with realtime config( @@ -1049,40 +944,12 @@ The latency between encoder and player with realtime config(
1049 [EN](https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency) 944 [EN](https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency)
1050 ): 945 ):
1051 946
1052 -<table>  
1053 -<tr>  
1054 - <th>Update</th>  
1055 - <th>SRS</th>  
1056 - <th>VP6</th>  
1057 - <th>H.264</th>  
1058 - <th>VP6+mp3</th>  
1059 - <th>H.264+mp3</th>  
1060 -</tr>  
1061 -<tr>  
1062 - <td>2014-12-03</td>  
1063 - <td>1.0.10</td>  
1064 - <td>0.4s</td>  
1065 - <td>0.4s</td>  
1066 - <td>0.9s</td>  
1067 - <td>1.2s</td>  
1068 -</tr>  
1069 -<tr>  
1070 - <td>2014-12-12</td>  
1071 - <td>2.0.70</td>  
1072 - <td><a href="https://github.com/simple-rtmp-server/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8">0.1s</a></td>  
1073 - <td><a href="https://github.com/simple-rtmp-server/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8">0.4s</a></td>  
1074 - <td>1.0s</td>  
1075 - <td>0.9s</td>  
1076 -</tr>  
1077 -<tr>  
1078 - <td>2014-12-16</td>  
1079 - <td>2.0.72</td>  
1080 - <td>0.1s</td>  
1081 - <td>0.4s</td>  
1082 - <td><a href="https://github.com/simple-rtmp-server/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc">0.8s</a></td>  
1083 - <td><a href="https://github.com/simple-rtmp-server/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc">0.6s</a></td>  
1084 -</tr>  
1085 -</table> 947 +
  948 +| Update | SRS | VP6 | H.264 | VP6+MP3 | H.264+MP3 |
  949 +| ------------- | --------- | --------- | --------- | --------- | -------- |
  950 +| 2014-12-03 | 1.0.10 | 0.4s | 0.4s | 0.9s | 1.2s |
  951 +| 2014-12-12 | 2.0.70 |[0.1s][p13]|[0.4s][p14]| 1.0s | 0.9s |
  952 +| 2014-12-16 | 2.0.72 | 0.1s | 0.4s |[0.8s][p15]|[0.6s][p16]|
1086 953
1087 We use FMLE as encoder for benchmark. The latency of server is 0.1s+, 954 We use FMLE as encoder for benchmark. The latency of server is 0.1s+,
1088 and the bottleneck is the encoder. For more information, read 955 and the bottleneck is the encoder. For more information, read
@@ -1168,3 +1035,23 @@ over some protocol and remux to rtmp to SRS. Read <a href="https://github.com/si @@ -1168,3 +1035,23 @@ over some protocol and remux to rtmp to SRS. Read <a href="https://github.com/si
1168 Beijing, 2013.10<br/> 1035 Beijing, 2013.10<br/>
1169 Winlin 1036 Winlin
1170 1037
  1038 +
  1039 +[p1]: https://github.com/simple-rtmp-server/srs/commit/787ab674e38734ea8e0678101614fdcd84645dc8
  1040 +[p2]: https://github.com/simple-rtmp-server/srs/commit/f35ec2155b1408d528a9f37da7904c9625186bcf
  1041 +[p3]: https://github.com/simple-rtmp-server/srs/commit/29324fab469e0f7cef9ad04ffdbce832ac7dd9ff
  1042 +[p4]: https://github.com/simple-rtmp-server/srs/commit/f57801eb46c16755b173984b915a4166922df6a6
  1043 +[p5]: https://github.com/simple-rtmp-server/srs/commit/5589b13d2e216b91f97afb78ee0c011b2fccf7da
  1044 +[p6]: https://github.com/simple-rtmp-server/srs/commit/1ae3e6c64cc5cee90e6050c26968ebc3c18281be
  1045 +[p7]: https://github.com/simple-rtmp-server/srs/commit/8acd143a7a152885b815999162660fd4e7a3f247
  1046 +[p8]: https://github.com/simple-rtmp-server/srs/commit/cc6aca9ad55342a06440ce7f3b38453776b2b2d1
  1047 +[p9]: https://github.com/simple-rtmp-server/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5
  1048 +[p10]: https://github.com/simple-rtmp-server/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5
  1049 +[p11]: https://github.com/simple-rtmp-server/srs/commit/9ee138746f83adc26f0e236ec017f4d68a300004
  1050 +[p12]: https://github.com/simple-rtmp-server/srs/commit/1311b6fe6576fd7b9c6d299b0f8f2e8d202f4bf8
  1051 +[p13]: https://github.com/simple-rtmp-server/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8
  1052 +[p14]: https://github.com/simple-rtmp-server/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8
  1053 +[p15]: https://github.com/simple-rtmp-server/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc
  1054 +[p16]: https://github.com/simple-rtmp-server/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc
  1055 +
  1056 +
  1057 +