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