From 5eb58bcb41f327c6ffe8b72f5d679cc542811f60 Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Thu, 2 Dec 2021 14:43:56 +0530 Subject: [PATCH] Fixing a couple of bugs in StreamAllocator (#225) * Debug * More debug * break -> return * comment * Clean up * spelling fixed --- pkg/sfu/forwarder.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/sfu/forwarder.go b/pkg/sfu/forwarder.go index c3a3e2101..7d3654c38 100644 --- a/pkg/sfu/forwarder.go +++ b/pkg/sfu/forwarder.go @@ -253,10 +253,9 @@ func (f *Forwarder) allocate(availableChannelCapacity int64, canPause bool, brs if availableChannelCapacity == ChannelCapacityInfinity { // channel capacity allows a free pass. // So, resume with the highest layer available <= max subscribed layer - - // if already optimistically started, nothing else to do - if f.targetSpatialLayer != InvalidSpatialLayer { - return + // If already resumed, move allocation to the highest available layer <= max subscribed layer + if f.targetSpatialLayer == InvalidSpatialLayer { + result.change = VideoStreamingChangeResuming } f.targetSpatialLayer = int32(f.availableLayers[len(f.availableLayers)-1]) @@ -269,7 +268,6 @@ func (f *Forwarder) allocate(availableChannelCapacity int64, canPause bool, brs f.targetTemporalLayer = 0 } - result.change = VideoStreamingChangeResuming } else { // if not optimistically started, nothing else to do if f.targetSpatialLayer == InvalidSpatialLayer { @@ -390,7 +388,7 @@ func (f *Forwarder) FinalizeAllocate(brs [3][4]int64) { f.targetSpatialLayer = int32(i) f.targetTemporalLayer = int32(j) - break + return } } }