From 76bf1a9c25f497f821939d1be36e4f0395eaa6d2 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 11 May 2021 12:27:41 +0800 Subject: [PATCH 1/3] Update benchmark for RTMP --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index e7b6eaffe..faddc11aa 100755 --- a/README.md +++ b/README.md @@ -1095,6 +1095,15 @@ The data for playing RTMP was benchmarked by [SB][srs-bench]: | 2014-07-12 | 0.9.156 | 1.8k(1800) | players | 68% | 38MB | - | | 2013-11-28 | 0.5.0 | 1.8k(1800) | players | 90% | 41M | - | +| Update | SFU | Clients | Type | CPU | Memory | Threads | VM | +| ---------- | ---------------- | -------- | ------------- | --------- | -------- | ------- | ---- | +| 2021-05-11 | SRS/v4.0.105 | 4000 | players | ~94% x1 | 419MB | 1 | G5 8CPU | +| 2021-05-11 | NginxRTMP/v1.2.1 | 2400 | players | ~92% x1 | 173MB | 1 | G5 8CPU | + +> Note: CentOS7, 600Kbps, [ECS/G5-2.5GHZ(SkyLake)](https://help.aliyun.com/document_detail/25378.html), +> [SRS/v4.0.105](https://github.com/ossrs/srs/commit/2ad24b2313e88a85801deaea370204f225555939), +> [NginxRTMP/v1.2.1](https://github.com/arut/nginx-rtmp-module/releases/tag/v1.2.1). + **Publish RTMP benchmark** From 098e7b27163cc3309bee89b629abb11a8e6e059c Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 11 May 2021 14:29:10 +0800 Subject: [PATCH 2/3] Update benchmark data --- README.md | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index faddc11aa..4ca0518fc 100755 --- a/README.md +++ b/README.md @@ -1121,6 +1121,15 @@ The data for publishing RTMP was benchmarked by [SB][srs-bench]: | 2014-12-03 | 2.0.12 | 1.2k(1200) | publishers | 96% | 43MB | - | | 2014-12-03 | 1.0.10 | 1.2k(1200) | publishers | 96% | 43MB | - | +| Update | SFU | Clients | Type | CPU | Memory | Threads | VM | +| ---------- | ---------------- | -------- | ------------- | --------- | -------- | ------- | ---- | +| 2021-05-11 | SRS/v4.0.105 | 2300 | publishers | ~89% x1 | 1.1GB | 1 | G5 8CPU | +| 2021-05-11 | NginxRTMP/v1.2.1 | 1300 | publishers | ~84% x1 | 198MB | 1 | G5 8CPU | + +> Note: CentOS7, 600Kbps, [ECS/G5-2.5GHZ(SkyLake)](https://help.aliyun.com/document_detail/25378.html), +> [SRS/v4.0.105](https://github.com/ossrs/srs/commit/2ad24b2313e88a85801deaea370204f225555939), +> [NginxRTMP/v1.2.1](https://github.com/arut/nginx-rtmp-module/releases/tag/v1.2.1). + **Play HTTP FLV benchmark** @@ -1160,13 +1169,13 @@ The RTC benchmark data, by [srs-bench](https://github.com/ossrs/srs-bench/tree/f **Latency benchmark** The latency between encoder and player with realtime config([CN][v4_CN_LowLatency], [EN][v4_EN_LowLatency]): -| -| Update | SRS | VP6 | H.264 | VP6+MP3 | H.264+MP3 | -| ------------- | --------- | --------- | --------- | --------- | -------- | -| 2014-12-16 | 2.0.72 | 0.1s | 0.4s |[0.8s][p15]|[0.6s][p16]| -| 2014-12-12 | 2.0.70 |[0.1s][p13]|[0.4s][p14]| 1.0s | 0.9s | -| 2014-12-03 | 1.0.10 | 0.4s | 0.4s | 0.9s | 1.2s | +| Update | SRS | Protocol | VP6 | H.264 | VP6+MP3 | H.264+MP3 | +| ------------- | --------- | --------- | --------- | --------- | --------- | -------- | +| 2014-12-16 | 2.0.72 | RTMP | 0.1s | 0.4s |[0.8s][p15]|[0.6s][p16]| +| 2014-12-12 | 2.0.70 | RTMP |[0.1s][p13]|[0.4s][p14]| 1.0s | 0.9s | +| 2014-12-03 | 1.0.10 | RTMP | 0.4s | 0.4s | 0.9s | 1.2s | +| 2021-04-02 | 4.0.87 | WebRTC | x | 80ms | x | x | > 2018-08-05, [c45f72e](https://github.com/ossrs/srs/commit/c45f72ef7bac9c7cf85b9125fc9e3aafd53f396f), Refine HTTP-FLV latency, support realtime mode. 2.0.252 From 8c5a435714a6bdbadbf8838c8bb5df93fab79978 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 11 May 2021 19:04:43 +0800 Subject: [PATCH 3/3] Fix print bug in retrieve_local_ips. 4.0.107 --- trunk/src/core/srs_core_version4.hpp | 2 +- trunk/src/protocol/srs_service_utility.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index ac03a6dd1..e8f5529dc 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -26,6 +26,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 106 +#define VERSION_REVISION 107 #endif diff --git a/trunk/src/protocol/srs_service_utility.cpp b/trunk/src/protocol/srs_service_utility.cpp index 0069a64bc..49bcd4f75 100644 --- a/trunk/src/protocol/srs_service_utility.cpp +++ b/trunk/src/protocol/srs_service_utility.cpp @@ -290,8 +290,8 @@ void retrieve_local_ips() } } - srs_trace(ss0.str().c_str()); - srs_trace(ss1.str().c_str()); + srs_trace("%s", ss0.str().c_str()); + srs_trace("%s", ss1.str().c_str()); freeifaddrs(ifap); }