From d306ee750693c50ef78442c34ba3346729212034 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 18 Apr 2019 08:50:43 +0800 Subject: [PATCH] Refine ms in time unit --- trunk/src/app/srs_app_rtmp_conn.hpp | 2 +- trunk/src/app/srs_app_server.cpp | 2 +- trunk/src/core/srs_core_time.hpp | 2 +- trunk/src/protocol/srs_protocol_io.hpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp index 5dc3cb35f..94c6d1c4b 100644 --- a/trunk/src/app/srs_app_rtmp_conn.hpp +++ b/trunk/src/app/srs_app_rtmp_conn.hpp @@ -109,7 +109,7 @@ private: // for live play duration, for instance, rtmpdump to record. // @see https://github.com/ossrs/srs/issues/47 srs_utime_t duration; - // the MR(merged-write) sleep time in ms. + // the MR(merged-write) sleep time in srs_utime_t. srs_utime_t mw_sleep; // the MR(merged-write) only enabled for play. int mw_enabled; diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index f16fed09b..5f0d00830 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -53,7 +53,7 @@ using namespace std; #include #include -// system interval in ms, +// system interval in srs_utime_t, // all resolution times should be times togother, // for example, system-interval is x=1s(1000ms), // then rusage can be 3*x, for instance, 3*1=3s, diff --git a/trunk/src/core/srs_core_time.hpp b/trunk/src/core/srs_core_time.hpp index f9f7bdd5c..8dd3a09b0 100644 --- a/trunk/src/core/srs_core_time.hpp +++ b/trunk/src/core/srs_core_time.hpp @@ -32,7 +32,7 @@ typedef int64_t srs_utime_t; // The time unit in ms, for example 100 * SRS_UTIME_MILLISECONDS means 100ms. #define SRS_UTIME_MILLISECONDS 1000 -// Convert srs_utime_t in ms unit. +// Convert srs_utime_t as ms. #define srsu2ms(us) (us / SRS_UTIME_MILLISECONDS) #define srsu2msi(us) int(us / SRS_UTIME_MILLISECONDS) diff --git a/trunk/src/protocol/srs_protocol_io.hpp b/trunk/src/protocol/srs_protocol_io.hpp index 5e003df64..3bea8e3f5 100644 --- a/trunk/src/protocol/srs_protocol_io.hpp +++ b/trunk/src/protocol/srs_protocol_io.hpp @@ -87,7 +87,7 @@ public: // Set the timeout tm in srs_utime_t for recv bytes from peer. // @remark Use SRS_UTIME_NO_TIMEOUT to never timeout. virtual void set_recv_timeout(srs_utime_t tm) = 0; - // Get the timeout in ms for recv bytes from peer. + // Get the timeout in srs_utime_t for recv bytes from peer. virtual srs_utime_t get_recv_timeout() = 0; // For handshake. public: @@ -123,7 +123,7 @@ public: virtual ~ISrsProtocolReadWriter(); // For protocol public: - // Whether the specified tm in ms is never timeout. + // Whether the specified tm in srs_utime_t is never timeout. virtual bool is_never_timeout(srs_utime_t tm) = 0; };