From eb134dc53570eb9cb5ce9e4648c2dd5e6e86ff7d Mon Sep 17 00:00:00 2001
From: cnderrauber <zengjie9004@gmail.com>
Date: Wed, 7 Dec 2022 13:53:37 +0800
Subject: [PATCH] Close migration muted track which is not fired (#1215)

---
 pkg/rtc/participant.go | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go
index 256514ca0..04ba61a2b 100644
--- a/pkg/rtc/participant.go
+++ b/pkg/rtc/participant.go
@@ -116,6 +116,8 @@ type ParticipantImpl struct {
 	// client intended to publish, yet to be reconciled
 	pendingTracksLock sync.RWMutex
 	pendingTracks     map[string]*pendingTrackInfo
+	// migrated in muted tracks are not fired need close at participant close
+	mutedTrackNotFired []*MediaTrack
 
 	*TransportManager
 	*UpTrackManager
@@ -497,6 +499,7 @@ func (p *ParticipantImpl) handleMigrateMutedTrack() {
 			}
 		}
 	}
+	p.mutedTrackNotFired = append(p.mutedTrackNotFired, addedTracks...)
 	p.pendingTracksLock.Unlock()
 
 	for _, t := range addedTracks {
@@ -504,6 +507,18 @@ func (p *ParticipantImpl) handleMigrateMutedTrack() {
 	}
 }
 
+func (p *ParticipantImpl) removeMutedTrackNotFired(mt *MediaTrack) {
+	p.pendingTracksLock.Lock()
+	for i, t := range p.mutedTrackNotFired {
+		if t == mt {
+			p.mutedTrackNotFired[i] = p.mutedTrackNotFired[len(p.mutedTrackNotFired)-1]
+			p.mutedTrackNotFired = p.mutedTrackNotFired[:len(p.mutedTrackNotFired)-1]
+			break
+		}
+	}
+	p.pendingTracksLock.Unlock()
+}
+
 // AddTrack is called when client intends to publish track.
 // records track details and lets client know it's ok to proceed
 func (p *ParticipantImpl) AddTrack(req *livekit.AddTrackRequest) {
@@ -571,12 +586,18 @@ func (p *ParticipantImpl) Close(sendLeave bool, reason types.ParticipantCloseRea
 
 	p.supervisor.Stop()
 
-	p.UpTrackManager.Close(!sendLeave)
-
 	p.pendingTracksLock.Lock()
 	p.pendingTracks = make(map[string]*pendingTrackInfo)
+	closeMutedTrack := p.mutedTrackNotFired
+	p.mutedTrackNotFired = p.mutedTrackNotFired[:0]
 	p.pendingTracksLock.Unlock()
 
+	for _, t := range closeMutedTrack {
+		t.Close(!sendLeave)
+	}
+
+	p.UpTrackManager.Close(!sendLeave)
+
 	p.lock.Lock()
 	disallowedSubscriptions := make(map[livekit.TrackID]livekit.ParticipantID)
 	for trackID, publisherID := range p.disallowedSubscriptions {
@@ -1589,8 +1610,11 @@ func (p *ParticipantImpl) mediaTrackReceived(track *webrtc.TrackRemote, rtpRecei
 	}
 	p.pendingTracksLock.Unlock()
 
-	if mt.AddReceiver(rtpReceiver, track, p.twcc, mid) && newTrack {
-		p.handleTrackPublished(mt)
+	if mt.AddReceiver(rtpReceiver, track, p.twcc, mid) {
+		p.removeMutedTrackNotFired(mt)
+		if newTrack {
+			p.handleTrackPublished(mt)
+		}
 	}
 
 	return mt, newTrack