dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-07-28 22:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid placing user in a layer that's not published

Browse Source
This commit is contained in:
David Zhao
2021-07-30 21:29:19 -07:00
parent c57e2860ca
commit b8e1cbe4f5
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/livekit-server.iml
Generated
+1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="Go" enabled="true" />
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/bin" />
go.mod
+1 -1
View File
@@ -43,4 +43,4 @@ require (
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)
replace github.com/pion/ion-sfu => github.com/livekit/ion-sfu v1.20.5
replace github.com/pion/ion-sfu => github.com/livekit/ion-sfu v1.20.6
go.sum
+2 -2
View File
@@ -235,8 +235,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
github.com/lithammer/shortuuid/v3 v3.0.6 h1:pr15YQyvhiSX/qPxncFtqk+v4xLEpOZObbsY/mKrcvA=
github.com/lithammer/shortuuid/v3 v3.0.6/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts=
github.com/livekit/ion-sfu v1.20.5 h1:2PltjaVWd4y3gUcBssHwa/V3jIp92z5vC0+6CzB7rz8=
github.com/livekit/ion-sfu v1.20.5/go.mod h1:dEdOG4KSqIftr5HxxqciNKBIdu0v3OD0ZYL7A3J09KA=
github.com/livekit/ion-sfu v1.20.6 h1:vA98RfuW3sSidV1rfK+/szGWgHFgki4Q4pomxsJS0i0=
github.com/livekit/ion-sfu v1.20.6/go.mod h1:dEdOG4KSqIftr5HxxqciNKBIdu0v3OD0ZYL7A3J09KA=
github.com/livekit/protocol v0.6.1 h1:+AwPkBNZoUYCoGwmwGxsdNQN7bickSyVt1p1jQi3m2U=
github.com/livekit/protocol v0.6.1/go.mod h1:wo3CGfYB7XMF8GoVJAfTARrYSP/ombi+sbLl6AYdKP0=
github.com/lucsky/cuid v1.0.2 h1:z4XlExeoderxoPj2/dxKOyPxe9RCOu7yNq9/XWxIUMQ=
pkg/rtc/mediatrack.go
+1 -1
View File
@@ -229,7 +229,7 @@ func (t *MediaTrack) AddSubscriber(sub types.Participant) error {
t.subscribedTracks[sub.ID()] = subTrack
t.receiver.AddDownTrack(downTrack, t.shouldStartWithBestQuality())
// since sub will lock, run it in a gorountine to avoid deadlocks
// since sub will lock, run it in a goroutine to avoid deadlocks
go func() {
sub.AddSubscribedTrack(t.params.ParticipantID, subTrack)
sub.Negotiate()