From fb61a6979c75281d3df973ae6e8486fca47987dd Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 11 Feb 2021 13:39:43 +0800 Subject: [PATCH] Clock: Use one system wall clock --- trunk/src/app/srs_app_rtc_conn.cpp | 3 ++- trunk/src/app/srs_app_rtc_source.cpp | 1 + trunk/src/app/srs_app_server.cpp | 7 ------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 2bcd8650e..981a59c33 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -2277,8 +2277,9 @@ srs_error_t SrsRtcConnection::notify(int type, srs_utime_t interval, srs_utime_t // For publisher to send NACK. if (type == SRS_TICKID_SEND_NACKS) { + // TODO: FIXME: Merge with hybrid system clock. srs_update_system_time(); - + std::map::iterator it; for (it = publishers_.begin(); it != publishers_.end(); it++) { SrsRtcPublishStream* publisher = it->second; diff --git a/trunk/src/app/srs_app_rtc_source.cpp b/trunk/src/app/srs_app_rtc_source.cpp index 24898f3fb..5988119b5 100644 --- a/trunk/src/app/srs_app_rtc_source.cpp +++ b/trunk/src/app/srs_app_rtc_source.cpp @@ -1749,6 +1749,7 @@ void SrsRtcRecvTrack::update_rtt(int rtt) void SrsRtcRecvTrack::update_send_report_time(const SrsNtp& ntp) { last_sender_report_ntp = ntp; + // TODO: FIXME: Use system wall clock. last_sender_report_sys_time = srs_update_system_time();; } diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index 8d069161c..9be2a3bef 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -802,9 +802,6 @@ srs_error_t SrsServer::initialize(ISrsServerCycle* ch) { srs_error_t err = srs_success; - // ensure the time is ok. - srs_update_system_time(); - // for the main objects(server, config, log, context), // never subscribe handler in constructor, // instead, subscribe handler in initialize method. @@ -1273,9 +1270,6 @@ srs_error_t SrsServer::setup_ticks() srs_freep(timer_); timer_ = new SrsHourGlass("srs", this, 1 * SRS_UTIME_SECONDS); - if ((err = timer_->tick(1, 1 * SRS_UTIME_SECONDS)) != srs_success) { - return srs_error_wrap(err, "tick"); - } if ((err = timer_->tick(2, 3 * SRS_UTIME_SECONDS)) != srs_success) { return srs_error_wrap(err, "tick"); } @@ -1315,7 +1309,6 @@ srs_error_t SrsServer::notify(int event, srs_utime_t interval, srs_utime_t tick) srs_error_t err = srs_success; switch (event) { - case 1: srs_update_system_time(); break; case 2: srs_update_system_rusage(); break; case 3: srs_update_proc_stat(); break; case 4: srs_update_disk_stat(); break;