Separate close and stop on MediaTrackSubscriptions. (livekit#823)

suharevA · Jul 9, 2022 · 01f7309 · 01f7309
1 parent 1e71343
commit 01f7309
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/pkg/rtc/mediatrackreceiver.go b/pkg/rtc/mediatrackreceiver.go
@@ -280,7 +280,7 @@ func (t *MediaTrackReceiver) Close() {
 	onclose := t.onClose
 	t.lock.RUnlock()
 
-	t.MediaTrackSubscriptions.Stop()
+	t.MediaTrackSubscriptions.Close()
 	for _, f := range onclose {
 		f()
 	}

diff --git a/pkg/rtc/mediatracksubscriptions.go b/pkg/rtc/mediatracksubscriptions.go
@@ -93,6 +93,10 @@ func (t *MediaTrackSubscriptions) Restart() {
 }
 
 func (t *MediaTrackSubscriptions) Stop() {
+	t.stopMaxQualityTimer()
+}
+
+func (t *MediaTrackSubscriptions) Close() {
 	t.qualityNotifyOpQueue.Stop()
 	t.stopMaxQualityTimer()
 }

diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go
@@ -1674,7 +1674,7 @@ func (p *ParticipantImpl) mediaTrackReceived(track *webrtc.TrackRemote, rtpRecei
 	p.pendingTracksLock.Lock()
 	newTrack := false
 
-	p.params.Logger.Debugw("media track received", "track", track.ID(), "kind", track.Kind())
+	p.params.Logger.Debugw("media track received", "trackID", track.ID(), "kind", track.Kind())
 	var mid string
 	for _, tr := range p.publisher.pc.GetTransceivers() {
 		if tr.Receiver() == rtpReceiver {