package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-09-27 03:25:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

simplify tests (#461)

Browse Source
This commit is contained in:
Alessandro Ros
2023-11-07 23:21:33 +01:00
committed by GitHub
parent 01b3bfc6ab
commit 93b02bc0e8
6 changed files with 196 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
client_play_test.go
View File

@@ -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},
@@ -886,10 +886,7 @@ func TestClientPlayAnyPort(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolUDP,
Delivery: func() *headers.TransportDelivery {
v := headers.TransportDeliveryUnicast
return &v
}(),
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
ClientPorts: th.ClientPorts,
ServerPorts: func() *[2]int {
switch ca {
@@ -1043,10 +1040,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolTCP,
Delivery: func() *headers.TransportDelivery {
v := headers.TransportDeliveryUnicast
return &v
}(),
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
InterleavedIDs: &[2]int{0, 1},
}.Marshal(),
},
@@ -1147,10 +1141,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolTCP,
Delivery: func() *headers.TransportDelivery {
v := headers.TransportDeliveryUnicast
return &v
}(),
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
InterleavedIDs: &[2]int{0, 1},
ServerPorts: &[2]int{12312, 12313},
}.Marshal(),
@@ -1221,10 +1212,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolTCP,
Delivery: func() *headers.TransportDelivery {
v := headers.TransportDeliveryUnicast
return &v
}(),
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",
@@ -1765,10 +1741,7 @@ func TestClientPlayRedirect(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolUDP,
Delivery: func() *headers.TransportDelivery {
v := headers.TransportDeliveryUnicast
return &v
}(),
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" {
@@ -2103,10 +2073,7 @@ func TestClientPlayRTCPReport(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolUDP,
Delivery: func() *headers.TransportDelivery {
v := headers.TransportDeliveryUnicast
return &v
}(),
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")
@@ -2702,10 +2654,7 @@ func TestClientPlayKeepalive(t *testing.T) {
"CSeq": req.Header["CSeq"],
"Transport": headers.Transport{
Protocol: headers.TransportProtocolTCP,
Delivery: func() *headers.TransportDelivery {
v := headers.TransportDeliveryUnicast
return &v
}(),
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" {
@@ -3295,10 +3235,7 @@ func TestClientPlayPacketNTP(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolUDP,
Delivery: func() *headers.TransportDelivery {
v := headers.TransportDeliveryUnicast
return &v
}(),
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
ServerPorts: &[2]int{27556, 27557},
ClientPorts: inTH.ClientPorts,
}.Marshal(),

45
client_record_test.go
View File

@@ -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}

108
pkg/headers/transport_test.go
View File

@@ -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
@@ -25,15 +33,9 @@ var casesTransport = []struct {
base.HeaderValue{`RTP/AVP;unicast;client_port=3456-3457;mode=play`},
Transport{
Protocol: TransportProtocolUDP,
Delivery: func() *TransportDelivery {
v := TransportDeliveryUnicast
return &v
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
ClientPorts: &[2]int{3456, 3457},
Mode: func() *TransportMode {
v := TransportModePlay
return &v
}(),
Mode: transportModePtr(TransportModePlay),
},
},
{
@@ -42,10 +44,7 @@ var casesTransport = []struct {
base.HeaderValue{`RTP/AVP;unicast;client_port=3056-3057;server_port=5000-5001`},
Transport{
Protocol: TransportProtocolUDP,
Delivery: func() *TransportDelivery {
v := TransportDeliveryUnicast
return &v
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
ClientPorts: &[2]int{3056, 3057},
ServerPorts: &[2]int{5000, 5001},
},
@@ -56,10 +55,7 @@ var casesTransport = []struct {
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
}(),
Delivery: deliveryPtr(TransportDeliveryMulticast),
Destination: ipPtr(net.ParseIP("225.219.201.15")),
TTL: uintPtr(127),
Ports: &[2]int{7000, 7001},
@@ -80,14 +76,8 @@ var casesTransport = []struct {
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
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
Mode: transportModePtr(TransportModePlay),
ClientPorts: &[2]int{14186, 14187},
ServerPorts: &[2]int{8052, 8053},
SSRC: uint32Ptr(0x0B6020AD),
@@ -99,14 +89,8 @@ var casesTransport = []struct {
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
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
Mode: transportModePtr(TransportModeRecord),
ClientPorts: &[2]int{14186, 14187},
ServerPorts: &[2]int{5000, 5001},
Source: ipPtr(net.ParseIP("127.0.0.1")),
@@ -118,15 +102,9 @@ var casesTransport = []struct {
base.HeaderValue{`RTP/AVP;unicast;client_port=3456-3457;mode=play`},
Transport{
Protocol: TransportProtocolUDP,
Delivery: func() *TransportDelivery {
v := TransportDeliveryUnicast
return &v
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
ClientPorts: &[2]int{3456, 3457},
Mode: func() *TransportMode {
v := TransportModePlay
return &v
}(),
Mode: transportModePtr(TransportModePlay),
},
},
{
@@ -135,14 +113,8 @@ var casesTransport = []struct {
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
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
Mode: transportModePtr(TransportModePlay),
ClientPorts: &[2]int{14186, 14187},
ServerPorts: &[2]int{8052, 8053},
SSRC: uint32Ptr(0x04317f),
@@ -154,14 +126,8 @@ var casesTransport = []struct {
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
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
Mode: transportModePtr(TransportModePlay),
ClientPorts: &[2]int{14186, 14187},
ServerPorts: &[2]int{8052, 8053},
SSRC: uint32Ptr(0x04317f),
@@ -173,10 +139,7 @@ var casesTransport = []struct {
base.HeaderValue{`RTP/AVP/TCP;unicast;interleaved=0-1;ssrc=000D93FF`},
Transport{
Protocol: TransportProtocolTCP,
Delivery: func() *TransportDelivery {
v := TransportDeliveryUnicast
return &v
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
InterleavedIDs: &[2]int{0, 1},
SSRC: uint32Ptr(0xD93FF),
},
@@ -187,10 +150,7 @@ var casesTransport = []struct {
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
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
SSRC: uint32Ptr(0x45dcb578),
ClientPorts: &[2]int{32560, 32561},
ServerPorts: &[2]int{3046, 3047},
@@ -202,10 +162,7 @@ var casesTransport = []struct {
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
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
Source: ipPtr(net.ParseIP("172.16.8.2")),
ClientPorts: &[2]int{14236, 14237},
ServerPorts: &[2]int{56002, 56003},
@@ -331,22 +288,13 @@ var casesTransports = []struct {
Transports{
{
Protocol: TransportProtocolUDP,
Delivery: func() *TransportDelivery {
v := TransportDeliveryUnicast
return &v
}(),
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
}(),
Delivery: deliveryPtr(TransportDeliveryUnicast),
InterleavedIDs: &[2]int{0, 1},
},
},

165
server_play_test.go
View File

@@ -273,14 +273,8 @@ func TestServerPlayPath(t *testing.T) {
th := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{0, 1},
}
@@ -355,14 +349,8 @@ func TestServerPlaySetupErrors(t *testing.T) {
th := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
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" {
@@ -1250,14 +1217,8 @@ func TestServerPlayTCPResponseBeforeFrames(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{0, 1},
}
@@ -1313,14 +1274,8 @@ func TestServerPlayPlayPlay(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolUDP,
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),
ClientPorts: &[2]int{30450, 30451},
}
@@ -1404,14 +1359,8 @@ func TestServerPlayPlayPausePlay(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{0, 1},
}
@@ -1492,14 +1441,8 @@ func TestServerPlayPlayPausePause(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
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" {

130
server_record_test.go
View File

@@ -293,14 +293,8 @@ func TestServerRecordPath(t *testing.T) {
th := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{0, 1},
}
@@ -350,14 +344,8 @@ func TestServerRecordErrorSetupMediaTwice(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{0, 1},
}
@@ -367,14 +355,8 @@ func TestServerRecordErrorSetupMediaTwice(t *testing.T) {
inTH = &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{2, 3},
}
@@ -452,14 +434,8 @@ func TestServerRecordErrorRecordPartialMedias(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
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},
}

115
server_test.go
View File

@@ -403,14 +403,8 @@ 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
}(),
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Mode: transportModePtr(headers.TransportModePlay),
InterleavedIDs: &[2]int{0, 1},
}
@@ -497,14 +491,8 @@ func TestServerErrorTCPTwoConnOneSession(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{0, 1},
}
@@ -528,14 +516,8 @@ func TestServerErrorTCPTwoConnOneSession(t *testing.T) {
"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
}(),
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Mode: transportModePtr(headers.TransportModePlay),
InterleavedIDs: &[2]int{0, 1},
}.Marshal(),
"Session": base.HeaderValue{session},
@@ -590,14 +572,8 @@ func TestServerErrorTCPOneConnTwoSessions(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{0, 1},
}
@@ -614,14 +590,8 @@ func TestServerErrorTCPOneConnTwoSessions(t *testing.T) {
"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
}(),
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)
@@ -779,14 +734,8 @@ 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
}(),
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Mode: transportModePtr(headers.TransportModePlay),
InterleavedIDs: &[2]int{0, 1},
}
@@ -926,14 +875,8 @@ func TestServerSessionClose(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{0, 1},
}
@@ -1006,14 +949,8 @@ func TestServerSessionAutoClose(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{0, 1},
}
@@ -1075,14 +1012,8 @@ func TestServerSessionTeardown(t *testing.T) {
inTH := &headers.Transport{
Protocol: headers.TransportProtocolTCP,
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),
InterleavedIDs: &[2]int{0, 1},
}