From c20fb237d531797b24c5f8a938f0928a44482afb Mon Sep 17 00:00:00 2001 From: David Zhao Date: Fri, 18 Feb 2022 09:21:24 -0800 Subject: [PATCH] Initialize subscriber quality to default layer (#444) --- pkg/rtc/mediatracksubscriptions.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkg/rtc/mediatracksubscriptions.go b/pkg/rtc/mediatracksubscriptions.go index 0cd1771d5..c7b509574 100644 --- a/pkg/rtc/mediatracksubscriptions.go +++ b/pkg/rtc/mediatracksubscriptions.go @@ -256,6 +256,10 @@ func (t *MediaTrackSubscriptions) AddSubscriber(sub types.LocalParticipant, code sub.Negotiate() }() + t.maxQualityLock.Lock() + // initialize to default layer + t.maxSubscriberQuality[sub.ID()] = livekit.VideoQuality_HIGH + t.maxQualityLock.Unlock() t.params.Telemetry.TrackSubscribed(context.Background(), subscriberID, t.params.MediaTrack.ToProto()) return downTrack, nil } @@ -529,17 +533,6 @@ func (t *MediaTrackSubscriptions) stopMaxQualityTimer() { } } -func (t *MediaTrackSubscriptions) numSubscribedLayers() uint32 { - t.maxQualityLock.RLock() - numSubscribedLayers := uint32(0) - if t.maxSubscribedQuality != livekit.VideoQuality_OFF { - numSubscribedLayers = uint32(SpatialLayerForQuality(t.maxSubscribedQuality) + 1) - } - t.maxQualityLock.RUnlock() - - return numSubscribedLayers -} - func (t *MediaTrackSubscriptions) maybeNotifyNoSubscribers() { if t.onNoSubscribers == nil { return