From c7c3e00388b1aee54a00ff916daa0772e3d1fea2 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Sat, 7 Nov 2020 15:13:47 +0100 Subject: [PATCH] cleanup --- connclient.go | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/connclient.go b/connclient.go index b8cf6793..1565d39c 100644 --- a/connclient.go +++ b/connclient.go @@ -489,7 +489,15 @@ func (c *ConnClient) Setup(u *base.URL, mode headers.TransportMode, proto base.S var rtpListener *connClientUDPListener var rtcpListener *connClientUDPListener - var transport *headers.Transport + + transport := &headers.Transport{ + Protocol: proto, + Delivery: func() *base.StreamDelivery { + ret := base.StreamDeliveryUnicast + return &ret + }(), + Mode: &mode, + } if proto == base.StreamProtocolUDP { if (rtpPort == 0 && rtcpPort != 0) || @@ -543,26 +551,10 @@ func (c *ConnClient) Setup(u *base.URL, mode headers.TransportMode, proto base.S return nil, err } - transport = &headers.Transport{ - Protocol: StreamProtocolUDP, - Delivery: func() *base.StreamDelivery { - ret := base.StreamDeliveryUnicast - return &ret - }(), - ClientPorts: &[2]int{rtpPort, rtcpPort}, - Mode: &mode, - } + transport.ClientPorts = &[2]int{rtpPort, rtcpPort} } else { - transport = &headers.Transport{ - Protocol: StreamProtocolTCP, - Delivery: func() *base.StreamDelivery { - ret := base.StreamDeliveryUnicast - return &ret - }(), - InterleavedIds: &[2]int{(track.Id * 2), (track.Id * 2) + 1}, - Mode: &mode, - } + transport.InterleavedIds = &[2]int{(track.Id * 2), (track.Id * 2) + 1} } res, err := c.setup(u, mode, track, transport)