dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-08-28 11:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normalize NTP time base when calculating RTT (#1297)

Browse Source 
* Normalize NTP time base when calculating RTT

* seed last SR
This commit is contained in:
Raja Subramanian
2023-01-11 12:25:14 +05:30
committed by GitHub
parent 1db218a5b1
commit 7aad888e4e
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sfu/buffer/rtpstats.go
+21 -6
View File
@@ -164,7 +164,9 @@ type RTPStats struct {
rtt uint32
maxRtt uint32
srData *RTCPSenderReportData
srData *RTCPSenderReportData
lastSRNTP mediatransportutil.NtpTime
lastSRAt time.Time
nextSnapshotId uint32
snapshots map[uint32]*Snapshot
@@ -261,6 +263,8 @@ func (r *RTPStats) Seed(from *RTPStats) {
} else {
r.srData = nil
}
r.lastSRNTP = from.lastSRNTP
r.lastSRAt = from.lastSRAt
r.nextSnapshotId = from.nextSnapshotId
for id, ss := range from.snapshots {
@@ -460,7 +464,7 @@ func (r *RTPStats) getTotalPacketsPrimary() uint32 {
return packetsSeen - r.packetsPadding
}
func (r *RTPStats) UpdateFromReceiverReport(rr rtcp.ReceptionReport, rtt uint32) {
func (r *RTPStats) UpdateFromReceiverReport(rr rtcp.ReceptionReport) (rtt uint32, isRttChanged bool) {
r.lock.Lock()
defer r.lock.Unlock()
@@ -468,13 +472,20 @@ func (r *RTPStats) UpdateFromReceiverReport(rr rtcp.ReceptionReport, rtt uint32)
return
}
rtt, err := mediatransportutil.GetRttMs(&rr, r.lastSRNTP, r.lastSRAt)
if err == nil {
isRttChanged = rtt != r.rtt
}
if r.lastRRTime.IsZero() || r.extHighestSNOverridden <= rr.LastSequenceNumber {
r.extHighestSNOverridden = rr.LastSequenceNumber
r.packetsLostOverridden = rr.TotalLost
r.rtt = rtt
if rtt > r.maxRtt {
r.maxRtt = rtt
if isRttChanged {
r.rtt = rtt
if rtt > r.maxRtt {
r.maxRtt = rtt
}
}
r.jitterOverridden = float64(rr.Jitter)
@@ -484,7 +495,7 @@ func (r *RTPStats) UpdateFromReceiverReport(rr rtcp.ReceptionReport, rtt uint32)
// update snapshots
for _, s := range r.snapshots {
if rtt > s.maxRtt {
if isRttChanged && rtt > s.maxRtt {
s.maxRtt = rtt
}
@@ -504,6 +515,7 @@ func (r *RTPStats) UpdateFromReceiverReport(rr rtcp.ReceptionReport, rtt uint32)
"receivedRR", rr,
)
}
return
}
func (r *RTPStats) UpdateNack(nackCount uint32) {
@@ -726,6 +738,9 @@ func (r *RTPStats) GetRtcpSenderReport(ssrc uint32, srData *RTCPSenderReportData
nowRTP = r.highestTS + uint32((now.UnixNano()-r.highestTime)*int64(r.params.ClockRate)/1e9)
}
r.lastSRNTP = nowNTP
r.lastSRAt = time.Now()
return &rtcp.SenderReport{
SSRC: ssrc,
NTPTime: uint64(nowNTP),