diff --git a/client_play_test.go b/client_play_test.go index 127feefc..54d3b753 100644 --- a/client_play_test.go +++ b/client_play_test.go @@ -28,6 +28,18 @@ func ipPtr(v net.IP) *net.IP { return &v } +func deliveryPtr(v headers.TransportDelivery) *headers.TransportDelivery { + return &v +} + +func transportPtr(v Transport) *Transport { + return &v +} + +func transportModePtr(v headers.TransportMode) *headers.TransportMode { + return &v +} + func mediasToSDP(medias []*description.Media) []byte { desc := &description.Session{ Medias: medias, @@ -186,10 +198,7 @@ func TestClientPlayFormats(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolUDP, ClientPorts: inTH.ClientPorts, ServerPorts: &[2]int{34556 + i*2, 34557 + i*2}, @@ -605,10 +614,7 @@ func TestClientPlayPartial(t *testing.T) { require.Equal(t, &[2]int{0, 1}, inTH.InterleavedIDs) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolTCP, InterleavedIDs: inTH.InterleavedIDs, } @@ -651,10 +657,7 @@ func TestClientPlayPartial(t *testing.T) { packetRecv := make(chan struct{}) c := Client{ - Transport: func() *Transport { - v := TransportTCP - return &v - }(), + Transport: transportPtr(TransportTCP), } u, err := base.ParseURL("rtsp://" + listenIP + ":8554/teststream") @@ -762,10 +765,7 @@ func TestClientPlayContentBase(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolUDP, ClientPorts: inTH.ClientPorts, ServerPorts: &[2]int{34556, 34557}, @@ -885,11 +885,8 @@ func TestClientPlayAnyPort(t *testing.T) { StatusCode: base.StatusOK, Header: base.Header{ "Transport": headers.Transport{ - Protocol: headers.TransportProtocolUDP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Protocol: headers.TransportProtocolUDP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), ClientPorts: th.ClientPorts, ServerPorts: func() *[2]int { switch ca { @@ -1042,11 +1039,8 @@ func TestClientPlayAutomaticProtocol(t *testing.T) { StatusCode: base.StatusOK, Header: base.Header{ "Transport": headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), InterleavedIDs: &[2]int{0, 1}, }.Marshal(), }, @@ -1146,11 +1140,8 @@ func TestClientPlayAutomaticProtocol(t *testing.T) { StatusCode: base.StatusOK, Header: base.Header{ "Transport": headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), InterleavedIDs: &[2]int{0, 1}, ServerPorts: &[2]int{12312, 12313}, }.Marshal(), @@ -1220,11 +1211,8 @@ func TestClientPlayAutomaticProtocol(t *testing.T) { StatusCode: base.StatusOK, Header: base.Header{ "Transport": headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), InterleavedIDs: &[2]int{0, 1}, }.Marshal(), }, @@ -1345,10 +1333,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolUDP, ServerPorts: &[2]int{34556, 34557}, ClientPorts: inTH.ClientPorts, @@ -1445,10 +1430,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolTCP, InterleavedIDs: inTH.InterleavedIDs, } @@ -1568,10 +1550,7 @@ func TestClientPlayDifferentInterleavedIDs(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolTCP, InterleavedIDs: &[2]int{1, 2}, // use odd value } @@ -1614,10 +1593,7 @@ func TestClientPlayDifferentInterleavedIDs(t *testing.T) { packetRecv := make(chan struct{}) c := Client{ - Transport: func() *Transport { - v := TransportTCP - return &v - }(), + Transport: transportPtr(TransportTCP), } err = readAll(&c, "rtsp://localhost:8554/teststream", @@ -1764,11 +1740,8 @@ func TestClientPlayRedirect(t *testing.T) { StatusCode: base.StatusOK, Header: base.Header{ "Transport": headers.Transport{ - Protocol: headers.TransportProtocolUDP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Protocol: headers.TransportProtocolUDP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), ClientPorts: th.ClientPorts, ServerPorts: &[2]int{34556, 34557}, }.Marshal(), @@ -1924,10 +1897,7 @@ func TestClientPlayPause(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } if transport == "udp" { @@ -2102,11 +2072,8 @@ func TestClientPlayRTCPReport(t *testing.T) { StatusCode: base.StatusOK, Header: base.Header{ "Transport": headers.Transport{ - Protocol: headers.TransportProtocolUDP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Protocol: headers.TransportProtocolUDP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), ServerPorts: &[2]int{27556, 27557}, ClientPorts: inTH.ClientPorts, }.Marshal(), @@ -2264,10 +2231,7 @@ func TestClientPlayErrorTimeout(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } var l1 net.PacketConn @@ -2410,10 +2374,7 @@ func TestClientPlayIgnoreTCPInvalidMedia(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } th.Protocol = headers.TransportProtocolTCP th.InterleavedIDs = inTH.InterleavedIDs @@ -2460,10 +2421,7 @@ func TestClientPlayIgnoreTCPInvalidMedia(t *testing.T) { recv := make(chan struct{}) c := Client{ - Transport: func() *Transport { - v := TransportTCP - return &v - }(), + Transport: transportPtr(TransportTCP), } err = readAll(&c, "rtsp://localhost:8554/teststream", @@ -2532,10 +2490,7 @@ func TestClientPlaySeek(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolTCP, InterleavedIDs: inTH.InterleavedIDs, } @@ -2603,10 +2558,7 @@ func TestClientPlaySeek(t *testing.T) { }() c := Client{ - Transport: func() *Transport { - v := TransportTCP - return &v - }(), + Transport: transportPtr(TransportTCP), } u, err := base.ParseURL("rtsp://localhost:8554/teststream") @@ -2701,11 +2653,8 @@ func TestClientPlayKeepalive(t *testing.T) { Header: base.Header{ "CSeq": req.Header["CSeq"], "Transport": headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), InterleavedIDs: &[2]int{0, 1}, }.Marshal(), "Session": headers.Session{ @@ -2872,10 +2821,7 @@ func TestClientPlayDifferentSource(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolUDP, ClientPorts: inTH.ClientPorts, ServerPorts: &[2]int{34556, 34557}, @@ -2927,10 +2873,7 @@ func TestClientPlayDifferentSource(t *testing.T) { }() c := Client{ - Transport: func() *Transport { - v := TransportUDP - return &v - }(), + Transport: transportPtr(TransportUDP), } err = readAll(&c, "rtsp://localhost:8554/test/stream?param=value", @@ -3026,10 +2969,7 @@ func TestClientPlayDecodeErrors(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } if ca.proto == "udp" { @@ -3294,11 +3234,8 @@ func TestClientPlayPacketNTP(t *testing.T) { StatusCode: base.StatusOK, Header: base.Header{ "Transport": headers.Transport{ - Protocol: headers.TransportProtocolUDP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Protocol: headers.TransportProtocolUDP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), ServerPorts: &[2]int{27556, 27557}, ClientPorts: inTH.ClientPorts, }.Marshal(), diff --git a/client_record_test.go b/client_record_test.go index 039dbe57..ef44841f 100644 --- a/client_record_test.go +++ b/client_record_test.go @@ -212,10 +212,7 @@ func TestClientRecordSerial(t *testing.T) { } th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } if transport == "udp" { @@ -404,10 +401,7 @@ func TestClientRecordParallel(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } if transport == "udp" { @@ -544,10 +538,7 @@ func TestClientRecordPauseSerial(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } if transport == "udp" { @@ -692,10 +683,7 @@ func TestClientRecordPauseParallel(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } if transport == "udp" { @@ -840,10 +828,7 @@ func TestClientRecordAutomaticProtocol(t *testing.T) { require.Equal(t, headers.TransportProtocolTCP, inTH.Protocol) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolTCP, InterleavedIDs: &[2]int{0, 1}, } @@ -962,10 +947,7 @@ func TestClientRecordDecodeErrors(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } if ca.proto == "udp" { @@ -1135,10 +1117,7 @@ func TestClientRecordRTCPReport(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } if ca == "udp" { @@ -1319,10 +1298,7 @@ func TestClientRecordIgnoreTCPRTPPackets(t *testing.T) { require.NoError(t, err) th := headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolTCP, InterleavedIDs: inTH.InterleavedIDs, } @@ -1369,10 +1345,7 @@ func TestClientRecordIgnoreTCPRTPPackets(t *testing.T) { rtcpReceived := make(chan struct{}) c := Client{ - Transport: func() *Transport { - v := TransportTCP - return &v - }(), + Transport: transportPtr(TransportTCP), } medias := []*description.Media{testH264Media} diff --git a/pkg/headers/transport_test.go b/pkg/headers/transport_test.go index 14c358a3..e86081b2 100644 --- a/pkg/headers/transport_test.go +++ b/pkg/headers/transport_test.go @@ -13,6 +13,14 @@ func ipPtr(v net.IP) *net.IP { return &v } +func deliveryPtr(v TransportDelivery) *TransportDelivery { + return &v +} + +func transportModePtr(v TransportMode) *TransportMode { + return &v +} + var casesTransport = []struct { name string vin base.HeaderValue @@ -24,16 +32,10 @@ var casesTransport = []struct { base.HeaderValue{`RTP/AVP;unicast;client_port=3456-3457;mode="PLAY"`}, base.HeaderValue{`RTP/AVP;unicast;client_port=3456-3457;mode=play`}, Transport{ - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryUnicast), ClientPorts: &[2]int{3456, 3457}, - Mode: func() *TransportMode { - v := TransportModePlay - return &v - }(), + Mode: transportModePtr(TransportModePlay), }, }, { @@ -41,11 +43,8 @@ var casesTransport = []struct { base.HeaderValue{`RTP/AVP/UDP;unicast;client_port=3056-3057;server_port=5000-5001`}, base.HeaderValue{`RTP/AVP;unicast;client_port=3056-3057;server_port=5000-5001`}, Transport{ - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryUnicast), ClientPorts: &[2]int{3056, 3057}, ServerPorts: &[2]int{5000, 5001}, }, @@ -55,11 +54,8 @@ var casesTransport = []struct { base.HeaderValue{`RTP/AVP;multicast;destination=225.219.201.15;port=7000-7001;ttl=127`}, base.HeaderValue{`RTP/AVP;multicast;destination=225.219.201.15;port=7000-7001;ttl=127`}, Transport{ - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryMulticast - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryMulticast), Destination: ipPtr(net.ParseIP("225.219.201.15")), TTL: uintPtr(127), Ports: &[2]int{7000, 7001}, @@ -79,15 +75,9 @@ var casesTransport = []struct { base.HeaderValue{`RTP/AVP/UDP;unicast;server_port=8052;client_port=14186;ssrc=0B6020AD;mode=PLAY`}, base.HeaderValue{`RTP/AVP;unicast;client_port=14186-14187;server_port=8052-8053;ssrc=0B6020AD;mode=play`}, Transport{ - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), - Mode: func() *TransportMode { - v := TransportModePlay - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryUnicast), + Mode: transportModePtr(TransportModePlay), ClientPorts: &[2]int{14186, 14187}, ServerPorts: &[2]int{8052, 8053}, SSRC: uint32Ptr(0x0B6020AD), @@ -98,15 +88,9 @@ var casesTransport = []struct { base.HeaderValue{`RTP/AVP/UDP;unicast;mode=receive;source=127.0.0.1;client_port=14186-14187;server_port=5000-5001`}, base.HeaderValue{`RTP/AVP;unicast;source=127.0.0.1;client_port=14186-14187;server_port=5000-5001;mode=record`}, Transport{ - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), - Mode: func() *TransportMode { - v := TransportModeRecord - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryUnicast), + Mode: transportModePtr(TransportModeRecord), ClientPorts: &[2]int{14186, 14187}, ServerPorts: &[2]int{5000, 5001}, Source: ipPtr(net.ParseIP("127.0.0.1")), @@ -117,16 +101,10 @@ var casesTransport = []struct { base.HeaderValue{`client_port=3456-3457;RTP/AVP;mode="PLAY";unicast`}, base.HeaderValue{`RTP/AVP;unicast;client_port=3456-3457;mode=play`}, Transport{ - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryUnicast), ClientPorts: &[2]int{3456, 3457}, - Mode: func() *TransportMode { - v := TransportModePlay - return &v - }(), + Mode: transportModePtr(TransportModePlay), }, }, { @@ -134,15 +112,9 @@ var casesTransport = []struct { base.HeaderValue{`RTP/AVP/UDP;unicast;client_port=14186;server_port=8052;ssrc=4317f;mode=play`}, base.HeaderValue{`RTP/AVP;unicast;client_port=14186-14187;server_port=8052-8053;ssrc=0004317F;mode=play`}, Transport{ - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), - Mode: func() *TransportMode { - v := TransportModePlay - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryUnicast), + Mode: transportModePtr(TransportModePlay), ClientPorts: &[2]int{14186, 14187}, ServerPorts: &[2]int{8052, 8053}, SSRC: uint32Ptr(0x04317f), @@ -153,15 +125,9 @@ var casesTransport = []struct { base.HeaderValue{`RTP/AVP/UDP;unicast;client_port=14186;server_port=8052;ssrc= 4317f;mode=play`}, base.HeaderValue{`RTP/AVP;unicast;client_port=14186-14187;server_port=8052-8053;ssrc=0004317F;mode=play`}, Transport{ - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), - Mode: func() *TransportMode { - v := TransportModePlay - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryUnicast), + Mode: transportModePtr(TransportModePlay), ClientPorts: &[2]int{14186, 14187}, ServerPorts: &[2]int{8052, 8053}, SSRC: uint32Ptr(0x04317f), @@ -172,11 +138,8 @@ var casesTransport = []struct { base.HeaderValue{`RTP/AVP/TCP;unicast;interleaved=0-1;ssrc= D93FF`}, base.HeaderValue{`RTP/AVP/TCP;unicast;interleaved=0-1;ssrc=000D93FF`}, Transport{ - Protocol: TransportProtocolTCP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), + Protocol: TransportProtocolTCP, + Delivery: deliveryPtr(TransportDeliveryUnicast), InterleavedIDs: &[2]int{0, 1}, SSRC: uint32Ptr(0xD93FF), }, @@ -186,11 +149,8 @@ var casesTransport = []struct { base.HeaderValue{`RTP/AVP/UDP;unicast;source=;client_port=32560-32561;server_port=3046-3047;ssrc=45dcb578`}, base.HeaderValue{`RTP/AVP;unicast;client_port=32560-32561;server_port=3046-3047;ssrc=45DCB578`}, Transport{ - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryUnicast), SSRC: uint32Ptr(0x45dcb578), ClientPorts: &[2]int{32560, 32561}, ServerPorts: &[2]int{3046, 3047}, @@ -201,11 +161,8 @@ var casesTransport = []struct { base.HeaderValue{`RTP/AVP;unicast;client_port=14236;source=172.16.8.2;server_port=56002;ssrc=1449463210`}, base.HeaderValue{`RTP/AVP;unicast;source=172.16.8.2;client_port=14236-14237;server_port=56002-56003`}, Transport{ - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryUnicast), Source: ipPtr(net.ParseIP("172.16.8.2")), ClientPorts: &[2]int{14236, 14237}, ServerPorts: &[2]int{56002, 56003}, @@ -330,23 +287,14 @@ var casesTransports = []struct { base.HeaderValue{`RTP/AVP;unicast;client_port=3456-3457;mode=play,RTP/AVP/TCP;unicast;interleaved=0-1`}, Transports{ { - Protocol: TransportProtocolUDP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), + Protocol: TransportProtocolUDP, + Delivery: deliveryPtr(TransportDeliveryUnicast), ClientPorts: &[2]int{3456, 3457}, - Mode: func() *TransportMode { - v := TransportModePlay - return &v - }(), + Mode: transportModePtr(TransportModePlay), }, Transport{ - Protocol: TransportProtocolTCP, - Delivery: func() *TransportDelivery { - v := TransportDeliveryUnicast - return &v - }(), + Protocol: TransportProtocolTCP, + Delivery: deliveryPtr(TransportDeliveryUnicast), InterleavedIDs: &[2]int{0, 1}, }, }, diff --git a/server_play_test.go b/server_play_test.go index 12aeb0a4..bc47c56f 100644 --- a/server_play_test.go +++ b/server_play_test.go @@ -272,15 +272,9 @@ func TestServerPlayPath(t *testing.T) { desc := doDescribe(t, conn) th := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -354,15 +348,9 @@ func TestServerPlaySetupErrors(t *testing.T) { desc := doDescribe(t, conn) th := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -475,14 +463,8 @@ func TestServerPlaySetupErrorSameUDPPortsAndIP(t *testing.T) { conn := conn.NewConn(nconn) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), Protocol: headers.TransportProtocolUDP, ClientPorts: &[2]int{35466, 35467}, } @@ -650,10 +632,7 @@ func TestServerPlay(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Mode: transportModePtr(headers.TransportModePlay), } switch transport { @@ -920,14 +899,8 @@ func TestServerPlayDecodeErrors(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Mode: transportModePtr(headers.TransportModePlay), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } if ca.proto == "udp" { @@ -1044,14 +1017,8 @@ func TestServerPlayRTCPReport(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Mode: transportModePtr(headers.TransportModePlay), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), } if ca == "udp" { @@ -1249,15 +1216,9 @@ func TestServerPlayTCPResponseBeforeFrames(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -1312,15 +1273,9 @@ func TestServerPlayPlayPlay(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolUDP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolUDP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), ClientPorts: &[2]int{30450, 30451}, } @@ -1403,15 +1358,9 @@ func TestServerPlayPlayPausePlay(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -1491,15 +1440,9 @@ func TestServerPlayPlayPausePause(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -1577,10 +1520,7 @@ func TestServerPlayTimeout(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Mode: transportModePtr(headers.TransportModePlay), } switch transport { @@ -1666,14 +1606,8 @@ func TestServerPlayWithoutTeardown(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), } if transport == "udp" { @@ -1747,14 +1681,8 @@ func TestServerPlayUDPChangeConn(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), Protocol: headers.TransportProtocolUDP, ClientPorts: &[2]int{35466, 35467}, } @@ -1834,14 +1762,8 @@ func TestServerPlayPartialMedias(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), Protocol: headers.TransportProtocolTCP, InterleavedIDs: &[2]int{4, 5}, } @@ -1868,14 +1790,8 @@ func TestServerPlayAdditionalInfos(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), Protocol: headers.TransportProtocolTCP, InterleavedIDs: &[2]int{0, 1}, } @@ -1886,14 +1802,8 @@ func TestServerPlayAdditionalInfos(t *testing.T) { ssrcs[0] = th.SSRC inTH = &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), Protocol: headers.TransportProtocolTCP, InterleavedIDs: &[2]int{2, 3}, } @@ -2088,14 +1998,8 @@ func TestServerPlayNoInterleavedIDs(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), Protocol: headers.TransportProtocolTCP, } @@ -2165,10 +2069,7 @@ func TestServerPlayBytesSent(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Mode: transportModePtr(headers.TransportModePlay), } if transport == "multicast" { diff --git a/server_record_test.go b/server_record_test.go index 296eff58..512ba956 100644 --- a/server_record_test.go +++ b/server_record_test.go @@ -292,15 +292,9 @@ func TestServerRecordPath(t *testing.T) { require.Equal(t, base.StatusOK, res.StatusCode) th := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), InterleavedIDs: &[2]int{0, 1}, } @@ -349,15 +343,9 @@ func TestServerRecordErrorSetupMediaTwice(t *testing.T) { doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), InterleavedIDs: &[2]int{0, 1}, } @@ -366,15 +354,9 @@ func TestServerRecordErrorSetupMediaTwice(t *testing.T) { session := readSession(t, res) inTH = &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), InterleavedIDs: &[2]int{2, 3}, } @@ -451,15 +433,9 @@ func TestServerRecordErrorRecordPartialMedias(t *testing.T) { doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), InterleavedIDs: &[2]int{0, 1}, } @@ -626,14 +602,8 @@ func TestServerRecord(t *testing.T) { for i := 0; i < 2; i++ { inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), } if transport == "udp" { @@ -781,14 +751,8 @@ func TestServerRecordErrorInvalidProtocol(t *testing.T) { doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), Protocol: headers.TransportProtocolUDP, ClientPorts: &[2]int{35466, 35467}, } @@ -855,14 +819,8 @@ func TestServerRecordRTCPReport(t *testing.T) { defer l2.Close() inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), Protocol: headers.TransportProtocolUDP, ClientPorts: &[2]int{34556, 34557}, } @@ -987,14 +945,8 @@ func TestServerRecordTimeout(t *testing.T) { doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), } if transport == "udp" { @@ -1075,14 +1027,8 @@ func TestServerRecordWithoutTeardown(t *testing.T) { doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), } if transport == "udp" { @@ -1153,14 +1099,8 @@ func TestServerRecordUDPChangeConn(t *testing.T) { doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), Protocol: headers.TransportProtocolUDP, ClientPorts: &[2]int{35466, 35467}, } @@ -1289,14 +1229,8 @@ func TestServerRecordDecodeErrors(t *testing.T) { doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), } if ca.proto == "udp" { @@ -1485,14 +1419,8 @@ func TestServerRecordPacketNTP(t *testing.T) { defer l2.Close() inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), Protocol: headers.TransportProtocolUDP, ClientPorts: &[2]int{34556, 34557}, } @@ -1604,14 +1532,8 @@ func TestServerRecordPausePause(t *testing.T) { doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias) inTH := &headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModeRecord - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModeRecord), Protocol: headers.TransportProtocolUDP, ClientPorts: &[2]int{35466, 35467}, } diff --git a/server_test.go b/server_test.go index 4f0a4234..54384581 100644 --- a/server_test.go +++ b/server_test.go @@ -402,15 +402,9 @@ func TestServerErrorMethodNotImplemented(t *testing.T) { if ca == "inside session" { inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -496,15 +490,9 @@ func TestServerErrorTCPTwoConnOneSession(t *testing.T) { desc1 := doDescribe(t, conn1) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -527,15 +515,9 @@ func TestServerErrorTCPTwoConnOneSession(t *testing.T) { Header: base.Header{ "CSeq": base.HeaderValue{"1"}, "Transport": headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, }.Marshal(), "Session": base.HeaderValue{session}, @@ -589,15 +571,9 @@ func TestServerErrorTCPOneConnTwoSessions(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -613,15 +589,9 @@ func TestServerErrorTCPOneConnTwoSessions(t *testing.T) { Header: base.Header{ "CSeq": base.HeaderValue{"3"}, "Transport": headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, }.Marshal(), }, @@ -665,26 +635,14 @@ func TestServerSetupMultipleTransports(t *testing.T) { inTHS := headers.Transports{ { - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), Protocol: headers.TransportProtocolUDP, ClientPorts: &[2]int{35466, 35467}, }, { - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), Protocol: headers.TransportProtocolTCP, InterleavedIDs: &[2]int{0, 1}, }, @@ -705,10 +663,7 @@ func TestServerSetupMultipleTransports(t *testing.T) { err = th.Unmarshal(res.Header["Transport"]) require.NoError(t, err) require.Equal(t, headers.Transport{ - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), Protocol: headers.TransportProtocolTCP, InterleavedIDs: &[2]int{0, 1}, }, th) @@ -778,15 +733,9 @@ func TestServerGetSetParameter(t *testing.T) { if ca == "inside session" { inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -925,15 +874,9 @@ func TestServerSessionClose(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -1005,15 +948,9 @@ func TestServerSessionAutoClose(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, } @@ -1074,15 +1011,9 @@ func TestServerSessionTeardown(t *testing.T) { desc := doDescribe(t, conn) inTH := &headers.Transport{ - Protocol: headers.TransportProtocolTCP, - Delivery: func() *headers.TransportDelivery { - v := headers.TransportDeliveryUnicast - return &v - }(), - Mode: func() *headers.TransportMode { - v := headers.TransportModePlay - return &v - }(), + Protocol: headers.TransportProtocolTCP, + Delivery: deliveryPtr(headers.TransportDeliveryUnicast), + Mode: transportModePtr(headers.TransportModePlay), InterleavedIDs: &[2]int{0, 1}, }