mirror of
https://github.com/livekit/livekit.git
synced 2026-05-24 23:26:11 +00:00
conditional checks
This commit is contained in:
@@ -2988,7 +2988,7 @@ func (p *ParticipantImpl) mediaTrackReceived(track sfu.TrackRemote, rtpReceiver
|
||||
p.pendingTracksLock.Lock()
|
||||
newTrack := false
|
||||
|
||||
mid := p.TransportManager.GetMid(rtpReceiver)
|
||||
mid := p.TransportManager.GetPublisherMid(rtpReceiver)
|
||||
p.pubLogger.Debugw(
|
||||
"media track received",
|
||||
"kind", track.Kind().String(),
|
||||
|
||||
@@ -1207,7 +1207,6 @@ func (t *PCTransport) GetRTT() (float64, bool) {
|
||||
return scps.CurrentRoundTripTime, true
|
||||
}
|
||||
|
||||
// IsEstablished returns true if the PeerConnection has been established
|
||||
func (t *PCTransport) IsEstablished() bool {
|
||||
return t.pc.ConnectionState() != webrtc.PeerConnectionStateNew
|
||||
}
|
||||
|
||||
+30
-14
@@ -209,27 +209,51 @@ func (t *TransportManager) SubscriberClose() {
|
||||
}
|
||||
|
||||
func (t *TransportManager) HasPublisherEverConnected() bool {
|
||||
return t.publisher.HasEverConnected()
|
||||
if t.params.SinglePeerConnection {
|
||||
return t.subscriber.HasEverConnected()
|
||||
} else {
|
||||
return t.publisher.HasEverConnected()
|
||||
}
|
||||
}
|
||||
|
||||
func (t *TransportManager) IsPublisherEstablished() bool {
|
||||
return t.publisher.IsEstablished()
|
||||
if t.params.SinglePeerConnection {
|
||||
return t.subscriber.IsEstablished()
|
||||
} else {
|
||||
return t.publisher.IsEstablished()
|
||||
}
|
||||
}
|
||||
|
||||
func (t *TransportManager) GetPublisherRTT() (float64, bool) {
|
||||
return t.publisher.GetRTT()
|
||||
if t.params.SinglePeerConnection {
|
||||
return t.subscriber.GetRTT()
|
||||
} else {
|
||||
return t.publisher.GetRTT()
|
||||
}
|
||||
}
|
||||
|
||||
func (t *TransportManager) GetPublisherMid(rtpReceiver *webrtc.RTPReceiver) string {
|
||||
return t.publisher.GetMid(rtpReceiver)
|
||||
if t.params.SinglePeerConnection {
|
||||
return t.subscriber.GetMid(rtpReceiver)
|
||||
} else {
|
||||
return t.publisher.GetMid(rtpReceiver)
|
||||
}
|
||||
}
|
||||
|
||||
func (t *TransportManager) GetPublisherRTPReceiver(mid string) *webrtc.RTPReceiver {
|
||||
return t.publisher.GetRTPReceiver(mid)
|
||||
if t.params.SinglePeerConnection {
|
||||
return t.subscriber.GetRTPReceiver(mid)
|
||||
} else {
|
||||
return t.publisher.GetRTPReceiver(mid)
|
||||
}
|
||||
}
|
||||
|
||||
func (t *TransportManager) WritePublisherRTCP(pkts []rtcp.Packet) error {
|
||||
return t.publisher.WriteRTCP(pkts)
|
||||
if t.params.SinglePeerConnection {
|
||||
return t.subscriber.WriteRTCP(pkts)
|
||||
} else {
|
||||
return t.publisher.WriteRTCP(pkts)
|
||||
}
|
||||
}
|
||||
|
||||
func (t *TransportManager) GetSubscriberRTT() (float64, bool) {
|
||||
@@ -274,14 +298,6 @@ func (t *TransportManager) RemoveTrackLocal(sender *webrtc.RTPSender) error {
|
||||
}
|
||||
}
|
||||
|
||||
func (t *TransportManager) GetMid(rtpReceiver *webrtc.RTPReceiver) string {
|
||||
if t.params.SinglePeerConnection {
|
||||
return t.subscriber.GetMid(rtpReceiver)
|
||||
} else {
|
||||
return t.publisher.GetMid(rtpReceiver)
|
||||
}
|
||||
}
|
||||
|
||||
func (t *TransportManager) WriteSubscriberRTCP(pkts []rtcp.Packet) error {
|
||||
if t.params.UseOneShotSignallingMode {
|
||||
return t.publisher.WriteRTCP(pkts)
|
||||
|
||||
Reference in New Issue
Block a user