From 779fe0f549765ef0baf9e40e54c9c04d89840d75 Mon Sep 17 00:00:00 2001 From: cnderrauber Date: Tue, 22 Mar 2022 19:04:13 +0800 Subject: [PATCH] revert network cost change (#550) --- pkg/rtc/participant.go | 6 ------ pkg/rtc/participant_signal.go | 1 - 2 files changed, 7 deletions(-) diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index 752a92e94..9eb5df30f 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -36,7 +36,6 @@ const ( rttUpdateInterval = 5 * time.Second stateActiveCond = 3 // reliableDCOpen,lossyDCOpen,PeerConnectionStateConnected - initNetWorkCost = 100 disconnectCleanupDuration = 15 * time.Second ) @@ -129,7 +128,6 @@ type ParticipantImpl struct { onClaimsChanged func(participant types.LocalParticipant) activeCounter atomic.Int32 - networkCost int32 } func NewParticipant(params ParticipantParams) (*ParticipantImpl, error) { @@ -151,7 +149,6 @@ func NewParticipant(params ParticipantParams) (*ParticipantImpl, error) { disallowedSubscriptions: make(map[livekit.TrackID]livekit.ParticipantID), connectedAt: time.Now(), rttUpdatedAt: time.Now(), - networkCost: initNetWorkCost, } p.version.Store(params.InitialVersion) p.migrateState.Store(types.MigrateStateInit) @@ -606,9 +603,6 @@ func (p *ParticipantImpl) SetMigrateState(s types.MigrateState) { p.pendingOffer = nil // in case of migration, subscriber data channel will not fire OnOpen callback p.activeCounter.CAS(0, 2) - - // use lower network cost to make sure migrated's node has higher priority candidate - p.networkCost-- } p.lock.Unlock() if s == types.MigrateStateComplete { diff --git a/pkg/rtc/participant_signal.go b/pkg/rtc/participant_signal.go index 383536f0c..5197758c3 100644 --- a/pkg/rtc/participant_signal.go +++ b/pkg/rtc/participant_signal.go @@ -178,7 +178,6 @@ func (p *ParticipantImpl) sendIceCandidate(c *webrtc.ICECandidate, target liveki // write candidate p.params.Logger.Debugw("sending ice candidates", "candidate", c.String(), "target", target) - ci.Candidate += fmt.Sprintf(" network-cost %d", p.networkCost) trickle := ToProtoTrickle(ci) trickle.Target = target _ = p.writeMessage(&livekit.SignalResponse{