From 93da599059454d7a59ccf0ac1cabf7abfaca26dd Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Thu, 8 Sep 2022 11:04:26 +0530 Subject: [PATCH] Return previous max layer. (#993) Relay up track holds this value too. This is to prevent duplication. --- pkg/sfu/streamtrackermanager.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/sfu/streamtrackermanager.go b/pkg/sfu/streamtrackermanager.go index cd141bfb0..3aeb303a9 100644 --- a/pkg/sfu/streamtrackermanager.go +++ b/pkg/sfu/streamtrackermanager.go @@ -201,13 +201,14 @@ func (s *StreamTrackerManager) SetPaused(paused bool) { } } -func (s *StreamTrackerManager) SetMaxExpectedSpatialLayer(layer int32) { +func (s *StreamTrackerManager) SetMaxExpectedSpatialLayer(layer int32) int32 { s.lock.Lock() + prev := s.maxExpectedLayer if layer <= s.maxExpectedLayer { // some higher layer(s) expected to stop, nothing else to do s.maxExpectedLayer = layer s.lock.Unlock() - return + return prev } // @@ -237,6 +238,8 @@ func (s *StreamTrackerManager) SetMaxExpectedSpatialLayer(layer int32) { for _, tracker := range trackersToReset { tracker.Reset() } + + return prev } func (s *StreamTrackerManager) DistanceToDesired() int32 {