From 394cdb5f046356dea1922f771fc8bc81157f0a34 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 22 Apr 2019 08:12:17 +0800 Subject: [PATCH] Refine in time unit. 3.0.49 --- README.md | 3 +++ trunk/src/core/srs_core.hpp | 2 +- trunk/src/main/srs_main_server.cpp | 2 +- trunk/src/protocol/srs_rtmp_msg_array.cpp | 2 +- trunk/src/protocol/srs_rtmp_msg_array.hpp | 2 +- trunk/src/utest/srs_utest_protocol.hpp | 4 ++-- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7e33eddd1..a3e663510 100755 --- a/README.md +++ b/README.md @@ -154,6 +154,8 @@ Please select according to languages: - [ ] Support H.265 by pushing H.265 over RTMP, deliverying in HLS, read [#465][bug #465]. - [ ] Support HLS+, the HLS edge server, please read [#466][bug #466] and [#468][bug #468]. - [ ] Support UDP protocol such as QUIC or KCP in cluster. +- [ ] Support H.264+Opus codec for WebRTC. +- [ ] Support publishing stream by WebRTC. > Remark: About the milestone and product plan, please read ([CN][v1_CN_Product], [EN][v1_EN_Product]) wiki. @@ -162,6 +164,7 @@ Please select according to languages: ### V3 changes +* v3.0, 2019-04-22, Refine in time unit. 3.0.49 * v3.0, 2019-04-07, Cover ST Coroutine and time unit. 3.0.48 * v3.0, 2019-04-06, Merge [#1304][bug #1304], Fix ST coroutine pull error. 3.0.47 * v3.0, 2019-04-05, Merge [#1339][bug #1339], Support HTTP-FLV params. 3.0.46 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 63c470485..2fb4a3b0a 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -27,7 +27,7 @@ // current release version #define VERSION_MAJOR 3 #define VERSION_MINOR 0 -#define VERSION_REVISION 48 +#define VERSION_REVISION 49 // generated by configure, only macros. #include diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 336ce0677..08db48944 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -341,7 +341,7 @@ void show_macro_features() #ifdef SRS_PERF_MERGED_READ possible_mr_latency = srsu2msi(SRS_PERF_MR_SLEEP); #endif - srs_trace("system default latency in ms: mw(0-%d) + mr(0-%d) + play-queue(0-%d)", + srs_trace("system default latency(ms): mw(0-%d) + mr(0-%d) + play-queue(0-%d)", srsu2msi(SRS_PERF_MW_SLEEP), possible_mr_latency, srsu2msi(SRS_PERF_PLAY_QUEUE)); #ifdef SRS_AUTO_MEM_WATCH diff --git a/trunk/src/protocol/srs_rtmp_msg_array.cpp b/trunk/src/protocol/srs_rtmp_msg_array.cpp index 2a5d76abe..538d3ddbe 100644 --- a/trunk/src/protocol/srs_rtmp_msg_array.cpp +++ b/trunk/src/protocol/srs_rtmp_msg_array.cpp @@ -39,7 +39,7 @@ SrsMessageArray::~SrsMessageArray() { // we just free the msgs itself, // both delete and delete[] is ok, - // for each msg in msgs is already freed by send_and_free_messages. + // for all msgs is already freed by send_and_free_messages. srs_freepa(msgs); } diff --git a/trunk/src/protocol/srs_rtmp_msg_array.hpp b/trunk/src/protocol/srs_rtmp_msg_array.hpp index 7ac9ee652..90b67f158 100644 --- a/trunk/src/protocol/srs_rtmp_msg_array.hpp +++ b/trunk/src/protocol/srs_rtmp_msg_array.hpp @@ -41,7 +41,7 @@ class SrsMessageArray { public: /** - * when user already send the msg in msgs, please set to NULL, + * when user already send all msgs, please set to NULL, * for instance, msg= msgs.msgs[i], msgs.msgs[i]=NULL, send(msg), * where send(msg) will always send and free it. */ diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp index f6984bc4b..0ed844ece 100644 --- a/trunk/src/utest/srs_utest_protocol.hpp +++ b/trunk/src/utest/srs_utest_protocol.hpp @@ -72,8 +72,8 @@ public: class MockBufferIO : public ISrsProtocolReadWriter { public: - // The send/recv timeout in ms. - int64_t rtm; + // The send/recv timeout in srs_utime_t. + srs_utime_t rtm; srs_utime_t stm; // The send/recv data in bytes. int64_t rbytes;