diff --git a/go.mod b/go.mod index db4d5ef3e..cbd9974a4 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/jxskiss/base62 v1.1.0 github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 github.com/livekit/mediatransportutil v0.0.0-20230111071722-904079e94a7c - github.com/livekit/protocol v1.3.3-0.20230124045313-d208f342983a + github.com/livekit/protocol v1.3.3-0.20230127213545-10b378e3bc1e github.com/livekit/psrpc v0.2.4 github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995 github.com/mackerelio/go-osstat v0.2.3 diff --git a/go.sum b/go.sum index fb977d9c0..2abd27364 100644 --- a/go.sum +++ b/go.sum @@ -235,6 +235,10 @@ github.com/livekit/mediatransportutil v0.0.0-20230111071722-904079e94a7c h1:wdzw github.com/livekit/mediatransportutil v0.0.0-20230111071722-904079e94a7c/go.mod h1:1Dlx20JPoIKGP45eo+yuj0HjeE25zmyeX/EWHiPCjFw= github.com/livekit/protocol v1.3.3-0.20230124045313-d208f342983a h1:j30ZpR5TN1XRd4bPiO1xqGfYVVNxqh6QtI6bBSlpk4U= github.com/livekit/protocol v1.3.3-0.20230124045313-d208f342983a/go.mod h1:gwCG03nKlHlC9hTjL4pXQpn783ALhmbyhq65UZxqbb8= +github.com/livekit/protocol v1.3.3-0.20230127105819-b75d0aed9e9c h1:6/fmFL/CZWexH9hgcn/AJ4M0Xag98cwUXCs9j2hnoJY= +github.com/livekit/protocol v1.3.3-0.20230127105819-b75d0aed9e9c/go.mod h1:gwCG03nKlHlC9hTjL4pXQpn783ALhmbyhq65UZxqbb8= +github.com/livekit/protocol v1.3.3-0.20230127213545-10b378e3bc1e h1:T+qUuDHioL5Q5Gzjun9tB65oaC9+zWmeWlcvpG+iilc= +github.com/livekit/protocol v1.3.3-0.20230127213545-10b378e3bc1e/go.mod h1:gwCG03nKlHlC9hTjL4pXQpn783ALhmbyhq65UZxqbb8= github.com/livekit/psrpc v0.2.4 h1:Fdxq56uJAIpRHCTgJsvp7ozw51dKtUmD3nxSXq9pCLs= github.com/livekit/psrpc v0.2.4/go.mod h1:+nJvbKx9DCZ6PSAsMHJPRAKjmRJ5WiyyhEmbKYqMKto= github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995 h1:vOaY2qvfLihDyeZtnGGN1Law9wRrw8BMGCr1TygTvMw= diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index db253389d..b4a33dd0b 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -104,7 +104,7 @@ type ParticipantImpl struct { twcc *twcc.Responder // client intended to publish, yet to be reconciled - pendingTracksLock sync.RWMutex + pendingTracksLock utils.RWMutex pendingTracks map[string]*pendingTrackInfo // migrated in muted tracks are not fired need close at participant close mutedTrackNotFired []*MediaTrack @@ -124,14 +124,14 @@ type ParticipantImpl struct { // cache of recently sent updates, to ensuring ordering by version // guarded by updateLock updateCache *lru.Cache[livekit.ParticipantID, uint32] - updateLock sync.Mutex + updateLock utils.Mutex dataChannelStats *telemetry.BytesTrackStats rttUpdatedAt time.Time lastRTT uint32 - lock sync.RWMutex + lock utils.RWMutex once sync.Once version atomic.Uint32