正在显示
1 个修改的文件
包含
15 行增加
和
96 行删除
| @@ -537,6 +537,10 @@ Supported operating systems and hardware: | @@ -537,6 +537,10 @@ Supported operating systems and hardware: | ||
| 537 | 1. [no-plan] Support RTMPT, http to tranverse firewalls | 537 | 1. [no-plan] Support RTMPT, http to tranverse firewalls |
| 538 | 1. [no-plan] Support file source, transcoding file to live stream | 538 | 1. [no-plan] Support file source, transcoding file to live stream |
| 539 | 539 | ||
| 540 | +## Compare | ||
| 541 | + | ||
| 542 | +Compare SRS with other media server. | ||
| 543 | + | ||
| 540 | ## Releases | 544 | ## Releases |
| 541 | 545 | ||
| 542 | * 2015-05-23, [Release v1.0r4](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4), bug fixed, 1.0.32, 59509 lines.<br/> | 546 | * 2015-05-23, [Release v1.0r4](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4), bug fixed, 1.0.32, 59509 lines.<br/> |
| @@ -563,10 +567,6 @@ Supported operating systems and hardware: | @@ -563,10 +567,6 @@ Supported operating systems and hardware: | ||
| 563 | * 2013-10-23, [Release v0.1](https://github.com/simple-rtmp-server/srs/releases/tag/0.1), support [rtmp FMLE/FFMPEG publish](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryRTMP), vp6. 8287 lines.<br/> | 567 | * 2013-10-23, [Release v0.1](https://github.com/simple-rtmp-server/srs/releases/tag/0.1), support [rtmp FMLE/FFMPEG publish](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryRTMP), vp6. 8287 lines.<br/> |
| 564 | * 2013-10-17, Created.<br/> | 568 | * 2013-10-17, Created.<br/> |
| 565 | 569 | ||
| 566 | -## Compare | ||
| 567 | - | ||
| 568 | -Compare SRS with other media server. | ||
| 569 | - | ||
| 570 | ## History | 570 | ## History |
| 571 | 571 | ||
| 572 | ### SRS 2.0 history | 572 | ### SRS 2.0 history |
| @@ -1030,98 +1030,17 @@ The play benchmark by [st-load](https://github.com/winlinvip/st-load): | @@ -1030,98 +1030,17 @@ The play benchmark by [st-load](https://github.com/winlinvip/st-load): | ||
| 1030 | 1030 | ||
| 1031 | The publish benchmark by [st-load](https://github.com/winlinvip/st-load): | 1031 | The publish benchmark by [st-load](https://github.com/winlinvip/st-load): |
| 1032 | 1032 | ||
| 1033 | -<table> | ||
| 1034 | - <tr> | ||
| 1035 | - <th>Update</th> | ||
| 1036 | - <th>SRS</th> | ||
| 1037 | - <th>Clients</th> | ||
| 1038 | - <th>Type</th> | ||
| 1039 | - <th>CPU</th> | ||
| 1040 | - <th>Memory</th> | ||
| 1041 | - <th>Commit</th> | ||
| 1042 | - </tr> | ||
| 1043 | - <tr> | ||
| 1044 | - <td>2014-12-03</td> | ||
| 1045 | - <td>1.0.10</td> | ||
| 1046 | - <td>1.2k(1200)</td> | ||
| 1047 | - <td>publishers</td> | ||
| 1048 | - <td>96%</td> | ||
| 1049 | - <td>43MB</td> | ||
| 1050 | - <td>-</td> | ||
| 1051 | - </tr> | ||
| 1052 | - <tr> | ||
| 1053 | - <td>2014-12-03</td> | ||
| 1054 | - <td>2.0.12</td> | ||
| 1055 | - <td>1.2k(1200)</td> | ||
| 1056 | - <td>publishers</td> | ||
| 1057 | - <td>96%</td> | ||
| 1058 | - <td>43MB</td> | ||
| 1059 | - <td>-</td> | ||
| 1060 | - </tr> | ||
| 1061 | - <tr> | ||
| 1062 | - <td>2014-12-03</td> | ||
| 1063 | - <td>2.0.47</td> | ||
| 1064 | - <td>1.2k(1200)</td> | ||
| 1065 | - <td>publishers</td> | ||
| 1066 | - <td>84%</td> | ||
| 1067 | - <td>76MB</td> | ||
| 1068 | - <td><a href="https://github.com/simple-rtmp-server/srs/commit/787ab674e38734ea8e0678101614fdcd84645dc8">commit</a></td> | ||
| 1069 | - </tr> | ||
| 1070 | - <tr> | ||
| 1071 | - <td>2014-12-03</td> | ||
| 1072 | - <td>2.0.47</td> | ||
| 1073 | - <td>1.4k(1400)</td> | ||
| 1074 | - <td>publishers</td> | ||
| 1075 | - <td>95%</td> | ||
| 1076 | - <td>140MB</td> | ||
| 1077 | - <td>-</td> | ||
| 1078 | - </tr> | ||
| 1079 | - <tr> | ||
| 1080 | - <td>2014-12-03</td> | ||
| 1081 | - <td>2.0.48</td> | ||
| 1082 | - <td>1.4k(1400)</td> | ||
| 1083 | - <td>publishers</td> | ||
| 1084 | - <td>95%</td> | ||
| 1085 | - <td>140MB</td> | ||
| 1086 | - <td><a href="https://github.com/simple-rtmp-server/srs/commit/f35ec2155b1408d528a9f37da7904c9625186bcf">commit</a></td> | ||
| 1087 | - </tr> | ||
| 1088 | - <tr> | ||
| 1089 | - <td>2014-12-04</td> | ||
| 1090 | - <td>2.0.49</td> | ||
| 1091 | - <td>1.4k(1400)</td> | ||
| 1092 | - <td>publishers</td> | ||
| 1093 | - <td>68%</td> | ||
| 1094 | - <td>144MB</td> | ||
| 1095 | - <td>-</td> | ||
| 1096 | - </tr> | ||
| 1097 | - <tr> | ||
| 1098 | - <td>2014-12-04</td> | ||
| 1099 | - <td>2.0.49</td> | ||
| 1100 | - <td>2.5k(2500)</td> | ||
| 1101 | - <td>publishers</td> | ||
| 1102 | - <td>95%</td> | ||
| 1103 | - <td>404MB</td> | ||
| 1104 | - <td><a href="https://github.com/simple-rtmp-server/srs/commit/29324fab469e0f7cef9ad04ffdbce832ac7dd9ff">commit</a></td> | ||
| 1105 | - </tr> | ||
| 1106 | - <tr> | ||
| 1107 | - <td>2014-12-04</td> | ||
| 1108 | - <td>2.0.51</td> | ||
| 1109 | - <td>2.5k(2500)</td> | ||
| 1110 | - <td>publishers</td> | ||
| 1111 | - <td>91%</td> | ||
| 1112 | - <td>259MB</td> | ||
| 1113 | - <td><a href="https://github.com/simple-rtmp-server/srs/commit/f57801eb46c16755b173984b915a4166922df6a6">commit</a></td> | ||
| 1114 | - </tr> | ||
| 1115 | - <tr> | ||
| 1116 | - <td>2014-12-04</td> | ||
| 1117 | - <td>2.0.52</td> | ||
| 1118 | - <td>4.0k(4000)</td> | ||
| 1119 | - <td>publishers</td> | ||
| 1120 | - <td>80%</td> | ||
| 1121 | - <td>331MB</td> | ||
| 1122 | - <td>(mr_sleep=350)<br/><a href="https://github.com/simple-rtmp-server/srs/commit/5589b13d2e216b91f97afb78ee0c011b2fccf7da">commit</a></td> | ||
| 1123 | - </tr> | ||
| 1124 | -</table> | 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> | | ||
| 1125 | 1044 | ||
| 1126 | ### Latency benchmark | 1045 | ### Latency benchmark |
| 1127 | 1046 |
-
请 注册 或 登录 后发表评论