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

RTC: Improve NACK RTT

Browse source
This commit is contained in:
winlin 2020-09-09 14:26:42 +08:00
parent d61536311b
commit dfa42cdd8c
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
trunk/src/app/srs_app_rtc_queue.cpp
View file

@ -160,9 +160,13 @@ void SrsRtpRingBuffer::notify_drop_seq(uint16_t seq)
SrsNackOption::SrsNackOption() SrsNackOption::SrsNackOption()
{ {
max_count = 15; max_count = 15;
max_alive_time = 1 * SRS_UTIME_SECONDS; max_alive_time = 1000 * SRS_UTIME_MILLISECONDS;
first_nack_interval = 10 * SRS_UTIME_MILLISECONDS; first_nack_interval = 10 * SRS_UTIME_MILLISECONDS;
nack_interval = 50 * SRS_UTIME_MILLISECONDS; nack_interval = 50 * SRS_UTIME_MILLISECONDS;
max_nack_interval = 500 * SRS_UTIME_MILLISECONDS;
min_nack_interval = 20 * SRS_UTIME_MILLISECONDS;
nack_check_interval = 3 * SRS_UTIME_MILLISECONDS;
//TODO: FIXME: audio and video using diff nack strategy //TODO: FIXME: audio and video using diff nack strategy
// video: // video:
@ -235,7 +239,7 @@ void SrsRtpNackForReceiver::get_nack_seqs(SrsRtcpNack& seqs, uint32_t& timeout_n
srs_utime_t now = srs_update_system_time(); srs_utime_t now = srs_update_system_time();
srs_utime_t interval = now - pre_check_time_; srs_utime_t interval = now - pre_check_time_;
if (interval < opts_.nack_interval / 2) { if (interval < opts_.nack_check_interval) {
return; return;
} }
pre_check_time_ = now; pre_check_time_ = now;
@ -258,7 +262,12 @@ void SrsRtpNackForReceiver::get_nack_seqs(SrsRtcpNack& seqs, uint32_t& timeout_n
break; break;
} }
if (now - nack_info.pre_req_nack_time_ >= opts_.nack_interval && nack_info.req_nack_count_ <= opts_.max_count) { srs_utime_t nack_interval = srs_max(opts_.min_nack_interval, opts_.nack_interval / 3);
if(opts_.nack_interval < 50 * SRS_UTIME_MILLISECONDS){
nack_interval = srs_max(opts_.min_nack_interval, opts_.nack_interval);
}
if (now - nack_info.pre_req_nack_time_ >= nack_interval ) {
++nack_info.req_nack_count_; ++nack_info.req_nack_count_;
nack_info.pre_req_nack_time_ = now; nack_info.pre_req_nack_time_ = now;
seqs.add_lost_sn(seq); seqs.add_lost_sn(seq);
@ -271,7 +280,13 @@ void SrsRtpNackForReceiver::get_nack_seqs(SrsRtcpNack& seqs, uint32_t& timeout_n
void SrsRtpNackForReceiver::update_rtt(int rtt) void SrsRtpNackForReceiver::update_rtt(int rtt)
{ {
rtt_ = rtt * SRS_UTIME_MILLISECONDS; rtt_ = rtt * SRS_UTIME_MILLISECONDS;
// FIXME: limit min and max value.
if (rtt_ > opts_.nack_interval) {
opts_.nack_interval = opts_.nack_interval * 0.8 + rtt_ * 0.2;
} else {
opts_.nack_interval = rtt_; opts_.nack_interval = rtt_;
} }
opts_.nack_interval = srs_min(opts_.nack_interval, opts_.max_nack_interval);
}

8
trunk/src/app/srs_app_rtc_queue.hpp
View file

@ -93,8 +93,12 @@ struct SrsNackOption
{ {
int max_count; int max_count;
srs_utime_t max_alive_time; srs_utime_t max_alive_time;
int64_t first_nack_interval; srs_utime_t first_nack_interval;
int64_t nack_interval; srs_utime_t nack_interval;
srs_utime_t max_nack_interval;
srs_utime_t min_nack_interval;
srs_utime_t nack_check_interval;
SrsNackOption(); SrsNackOption();
}; };