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

Use contiguous groups to determine queuing region. (#3308)

Browse Source
This commit is contained in:
Raja Subramanian
2025-01-07 04:00:39 +05:30
committed by GitHub
parent ec54d357e4
commit 0dde347615
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sfu/bwe/sendsidebwe/congestion_detector.go
+17 -22
View File
@@ -228,34 +228,30 @@ func (q *qdMeasurement) ProcessPacketGroup(pg *packetGroup, groupIdx int) {
}
q.maxSendTime = max(q.maxSendTime, maxSendTime)
if pqd < q.dqrMax {
switch {
case pqd < q.dqrMax:
q.numDQRGroups++
if q.numJQRGroups > 0 {
// JQR continuity is broken
// broken continuity, seal
q.isSealed = true
return
}
if q.dqrConfig.IsTriggered(q.numDQRGroups, q.maxSendTime-q.minSendTime) {
} else if q.dqrConfig.IsTriggered(q.numDQRGroups, q.maxSendTime-q.minSendTime) {
q.isSealed = true
q.queuingRegion = queuingRegionDQR
return
}
}
if pqd > q.jqrMin {
case pqd > q.jqrMin:
q.numJQRGroups++
if q.numDQRGroups > 0 {
// DQR continuity is broken
// broken continuity, seal
q.isSealed = true
return
}
if q.jqrConfig.IsTriggered(q.numJQRGroups, q.maxSendTime-q.minSendTime) {
} else if q.jqrConfig.IsTriggered(q.numJQRGroups, q.maxSendTime-q.minSendTime) {
q.isSealed = true
q.queuingRegion = queuingRegionJQR
return
}
default:
// broken continuity, seal
q.isSealed = true
}
}
@@ -351,17 +347,19 @@ func (l *lossMeasurement) ProcessPacketGroup(pg *packetGroup, groupIdx int) {
if weightedLoss > l.jqrMinLoss {
l.weightedLoss = weightedLoss
l.queuingRegion = queuingRegionJQR
l.isDQRSealed = true // seal DQR also as JQR is already hit
l.isDQRSealed = true // seal DQR also as queuing region has been determined
return
}
}
if l.dqrConfig.IsTriggered(l.numGroups, l.ts.Duration()) {
if !l.isDQRSealed && l.dqrConfig.IsTriggered(l.numGroups, l.ts.Duration()) {
l.isDQRSealed = true
l.weightedLoss = l.ts.WeightedLoss()
if l.weightedLoss < l.dqrMaxLoss {
weightedLoss := l.ts.WeightedLoss()
if weightedLoss < l.dqrMaxLoss {
l.weightedLoss = weightedLoss
l.queuingRegion = queuingRegionDQR
l.isJQRSealed = true // seal JQR also as queuing region has been determined
return
}
}
@@ -855,7 +853,6 @@ func (c *congestionDetector) prunePacketGroups() {
}
func (c *congestionDetector) updateCongestionSignal(
stage string,
qdJQRConfig CongestionSignalConfig,
qdDQRConfig CongestionSignalConfig,
lossJQRConfig CongestionSignalConfig,
@@ -902,7 +899,6 @@ func (c *congestionDetector) updateCongestionSignal(
func (c *congestionDetector) updateEarlyWarningSignal() {
c.updateCongestionSignal(
"early-warning",
c.params.Config.QueuingDelayEarlyWarningJQR,
c.params.Config.QueuingDelayEarlyWarningDQR,
c.params.Config.LossEarlyWarningJQR,
@@ -912,7 +908,6 @@ func (c *congestionDetector) updateEarlyWarningSignal() {
func (c *congestionDetector) updateCongestedSignal() {
c.updateCongestionSignal(
"congested",
c.params.Config.QueuingDelayCongestedJQR,
c.params.Config.QueuingDelayCongestedDQR,
c.params.Config.LossCongestedJQR,
pkg/sfu/streamallocator/streamallocator.go
+6
View File
@@ -1065,6 +1065,12 @@ func (s *StreamAllocator) maybeStopProbe() {
func (s *StreamAllocator) maybeBoostDeficientTracks() {
availableChannelCapacity := s.getAvailableHeadroom(false)
if availableChannelCapacity <= 0 {
s.params.Logger.Infow(
"stream allocator: no available headroom to boost deficient tracks",
"committedChannelCapacity", s.committedChannelCapacity,
"availableChannelCapacity", availableChannelCapacity,
"expectedBandwidthUsage", s.getExpectedBandwidthUsage(),
)
return
}