external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Clock: Use one system wall clock

Browse source
This commit is contained in:
winlin 2021-02-11 13:39:43 +08:00
parent 71cc8e35d9
commit fb61a6979c
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -2277,8 +2277,9 @@ srs_error_t SrsRtcConnection::notify(int type, srs_utime_t interval, srs_utime_t
// For publisher to send NACK. // For publisher to send NACK.
if (type == SRS_TICKID_SEND_NACKS) { if (type == SRS_TICKID_SEND_NACKS) {
// TODO: FIXME: Merge with hybrid system clock.
srs_update_system_time(); srs_update_system_time();
std::map<std::string, SrsRtcPublishStream*>::iterator it; std::map<std::string, SrsRtcPublishStream*>::iterator it;
for (it = publishers_.begin(); it != publishers_.end(); it++) { for (it = publishers_.begin(); it != publishers_.end(); it++) {
SrsRtcPublishStream* publisher = it->second; SrsRtcPublishStream* publisher = it->second;

1
trunk/src/app/srs_app_rtc_source.cpp
View file

@ -1749,6 +1749,7 @@ void SrsRtcRecvTrack::update_rtt(int rtt)
void SrsRtcRecvTrack::update_send_report_time(const SrsNtp& ntp) void SrsRtcRecvTrack::update_send_report_time(const SrsNtp& ntp)
{ {
last_sender_report_ntp = ntp; last_sender_report_ntp = ntp;
// TODO: FIXME: Use system wall clock.
last_sender_report_sys_time = srs_update_system_time();; last_sender_report_sys_time = srs_update_system_time();;
} }

7
trunk/src/app/srs_app_server.cpp
View file

@ -802,9 +802,6 @@ srs_error_t SrsServer::initialize(ISrsServerCycle* ch)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
// ensure the time is ok.
srs_update_system_time();
// for the main objects(server, config, log, context), // for the main objects(server, config, log, context),
// never subscribe handler in constructor, // never subscribe handler in constructor,
// instead, subscribe handler in initialize method. // instead, subscribe handler in initialize method.
@ -1273,9 +1270,6 @@ srs_error_t SrsServer::setup_ticks()
srs_freep(timer_); srs_freep(timer_);
timer_ = new SrsHourGlass("srs", this, 1 * SRS_UTIME_SECONDS); 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) { if ((err = timer_->tick(2, 3 * SRS_UTIME_SECONDS)) != srs_success) {
return srs_error_wrap(err, "tick"); 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; srs_error_t err = srs_success;
switch (event) { switch (event) {
case 1: srs_update_system_time(); break;
case 2: srs_update_system_rusage(); break; case 2: srs_update_system_rusage(); break;
case 3: srs_update_proc_stat(); break; case 3: srs_update_proc_stat(); break;
case 4: srs_update_disk_stat(); break; case 4: srs_update_disk_stat(); break;