From 01f7309adc6758dd58f3ce7501356f335da8704b Mon Sep 17 00:00:00 2001
From: Raja Subramanian <raja.gobi@tutanota.com>
Date: Sat, 9 Jul 2022 12:42:54 +0530
Subject: [PATCH] Separate close and stop on MediaTrackSubscriptions. (#823)

---
 pkg/rtc/mediatrackreceiver.go      | 2 +-
 pkg/rtc/mediatracksubscriptions.go | 4 ++++
 pkg/rtc/participant.go             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/rtc/mediatrackreceiver.go b/pkg/rtc/mediatrackreceiver.go
index 6d9d8dc65..04dd55af6 100644
--- 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
index 5ee5432cc..6d714072a 100644
--- 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
index d2f4d50ae..38c6765e8 100644
--- 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 {