From b64c32c621b043f7e334cb2ba7f516336ad32116 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Fri, 22 Oct 2021 16:26:33 +0200 Subject: [PATCH] client: rename ClientTransportMulticast into ClientTransportUDPMulticast --- client.go | 2 +- client_read_test.go | 2 +- clientconn.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client.go b/client.go index 46adb14c..c7b07344 100644 --- a/client.go +++ b/client.go @@ -41,7 +41,7 @@ type ClientTransport int // standard client transports. const ( ClientTransportUDP ClientTransport = iota - ClientTransportMulticast + ClientTransportUDPMulticast ClientTransportTCP ) diff --git a/client_read_test.go b/client_read_test.go index 0f6f07fe..f163421d 100644 --- a/client_read_test.go +++ b/client_read_test.go @@ -397,7 +397,7 @@ func TestClientRead(t *testing.T) { return &v case "multicast": - v := ClientTransportMulticast + v := ClientTransportUDPMulticast return &v default: // tcp, tls diff --git a/clientconn.go b/clientconn.go index cafdc8ae..da80ec9f 100644 --- a/clientconn.go +++ b/clientconn.go @@ -449,7 +449,7 @@ func (cc *ClientConn) backgroundClose(isSwitchingProtocol bool) { func (cc *ClientConn) runBackground() { cc.backgroundInnerDone <- func() error { if cc.state == clientConnStatePlay { - if *cc.protocol == ClientTransportUDP || *cc.protocol == ClientTransportMulticast { + if *cc.protocol == ClientTransportUDP || *cc.protocol == ClientTransportUDPMulticast { return cc.runBackgroundPlayUDP() } return cc.runBackgroundPlayTCP() @@ -1257,7 +1257,7 @@ func (cc *ClientConn) doSetup( rtcpListener.port(), } - case ClientTransportMulticast: + case ClientTransportUDPMulticast: v1 := base.StreamDeliveryMulticast th.Delivery = &v1 th.Protocol = base.StreamProtocolUDP @@ -1337,7 +1337,7 @@ func (cc *ClientConn) doSetup( } } - case ClientTransportMulticast: + case ClientTransportUDPMulticast: if thRes.Delivery == nil || *thRes.Delivery != base.StreamDeliveryMulticast { return nil, liberrors.ErrClientTransportHeaderInvalidDelivery{} } @@ -1422,7 +1422,7 @@ func (cc *ClientConn) doSetup( rtcpListener.streamType = StreamTypeRTCP cct.udpRTCPListener = rtcpListener - case ClientTransportMulticast: + case ClientTransportUDPMulticast: rtpListener.remoteReadIP = cc.nconn.RemoteAddr().(*net.TCPAddr).IP rtpListener.remoteWriteIP = *thRes.Destination rtpListener.remoteZone = "" @@ -1700,7 +1700,7 @@ func (cc *ClientConn) WriteFrame(trackID int, streamType StreamType, payload []b } switch *cc.protocol { - case ClientTransportUDP, ClientTransportMulticast: + case ClientTransportUDP, ClientTransportUDPMulticast: if streamType == StreamTypeRTP { return cc.tracks[trackID].udpRTPListener.write(payload) }