From 6d9529431fd808c5dca51bef8d343c5aaf62117c Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Wed, 26 Jun 2024 11:26:50 +0530 Subject: [PATCH] Revert "use pending lock, no need for participant lock (#2793)" (#2818) This reverts commit f92e7e3db8e787200d3c422704574dc37f87169f. --- pkg/rtc/participant.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index 95636b1d9..4605e973e 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -828,9 +828,8 @@ func (p *ParticipantImpl) AddTrack(req *livekit.AddTrackRequest) { return } - p.pendingTracksLock.Lock() - defer p.pendingTracksLock.Unlock() - + p.lock.Lock() + defer p.lock.Unlock() ti := p.addPendingTrackLocked(req) if ti == nil { return @@ -1822,6 +1821,9 @@ func (p *ParticipantImpl) onSubscribedMaxQualityChange( } func (p *ParticipantImpl) addPendingTrackLocked(req *livekit.AddTrackRequest) *livekit.TrackInfo { + p.pendingTracksLock.Lock() + defer p.pendingTracksLock.Unlock() + if req.Sid != "" { track := p.GetPublishedTrack(livekit.TrackID(req.Sid)) if track == nil {