amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 04:31:37 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix rtt and rtt variance

Browse Source
This commit is contained in:
xiongguangjie 2022-06-05 12:13:28 +08:00
parent 62dfed39f7
commit 3cca4015c5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
srt/SrtTransport.cpp
View File

@ -308,7 +308,7 @@ void SrtTransport::handleDropReq(uint8_t *buf, int len, struct sockaddr_storage
} }
auto nak_interval = (_rtt+_rtt_variance*4)/2; auto nak_interval = (_rtt+_rtt_variance*4)/2;
if(nak_interval >= 20*1000){ if(nak_interval <= 20*1000){
nak_interval = 20*1000; nak_interval = 20*1000;
} }
if(_nak_ticker.elapsedTime(_now)>nak_interval){ if(_nak_ticker.elapsedTime(_now)>nak_interval){
@ -346,9 +346,11 @@ void SrtTransport::handleACKACK(uint8_t *buf, int len, struct sockaddr_storage *
pkt->loadFromData(buf,len); pkt->loadFromData(buf,len);
uint32_t rtt = DurationCountMicroseconds(_now - _ack_send_timestamp[pkt->ack_number]); uint32_t rtt = DurationCountMicroseconds(_now - _ack_send_timestamp[pkt->ack_number]);
_rtt_variance = (3*_rtt_variance+abs((long)(_rtt - rtt)))/4; _rtt_variance = (3*_rtt_variance+abs((long)_rtt - (long)rtt))/4;
_rtt = (7*rtt+_rtt)/8; _rtt = (7*rtt+_rtt)/8;
//TraceL<<" rtt:"<<_rtt<<" rtt variance:"<<_rtt_variance;
_ack_send_timestamp.erase(pkt->ack_number); _ack_send_timestamp.erase(pkt->ack_number);
} }
@ -426,19 +428,22 @@ void SrtTransport::handleDataPacket(uint8_t *buf, int len, struct sockaddr_stora
onSRTData(std::move(data)); onSRTData(std::move(data));
} }
if(list.empty()){
//TraceL<<_recv_buf->dump();
}
auto nak_interval = (_rtt+_rtt_variance*4)/2; auto nak_interval = (_rtt+_rtt_variance*4)/2;
if(nak_interval <= 20*1000){ if(nak_interval <= 20*1000){
nak_interval = 20*1000; nak_interval = 20*1000;
} }
if(list.empty()){
//TraceL<<_recv_buf->dump()<<" nake interval:"<<nak_interval/1000<<" ticker:"<<_nak_ticker.elapsedTime(_now)/1000;
}
if(_nak_ticker.elapsedTime(_now)>nak_interval){ if(_nak_ticker.elapsedTime(_now)>nak_interval){
auto lost = _recv_buf->getLostSeq(); auto lost = _recv_buf->getLostSeq();
if(!lost.empty()){ if(!lost.empty()){
sendNAKPacket(lost); sendNAKPacket(lost);
//TraceL<<"send NAK"; //TraceL<<"send NAK";
}else{
//TraceL<<"lost is empty";
} }
_nak_ticker.resetTime(_now); _nak_ticker.resetTime(_now);
} }