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

modernize code (#884)

Browse Source
This commit is contained in:
Alessandro Ros
2025-09-07 16:05:13 +02:00
committed by GitHub
parent 9db34842c8
commit 9259df7cff
32 changed files with 296 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
client_play_test.go
View File

@@ -28,26 +28,6 @@ import (
"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
)
func stringPtr(v string) *string {
return &v
}
func ipPtr(v net.IP) *net.IP {
return &v
}
func deliveryPtr(v headers.TransportDelivery) *headers.TransportDelivery {
return &v
}
func transportPtr(v TransportProtocol) *TransportProtocol {
return &v
}
func transportModePtr(v headers.TransportMode) *headers.TransportMode {
return &v
}
func mediasToSDP(medias []*description.Media) []byte {
desc := &description.Session{
Medias: medias,
@@ -212,7 +192,7 @@ func TestClientPlayFormats(t *testing.T) {
require.NoError(t, err2)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
Protocol: headers.TransportProtocolUDP,
ClientPorts: inTH.ClientPorts,
ServerPorts: &[2]int{34556 + i*2, 34557 + i*2},
@@ -465,7 +445,7 @@ func TestClientPlay(t *testing.T) {
v := headers.TransportDeliveryMulticast
th.Delivery = &v
th.Protocol = headers.TransportProtocolUDP
th.Destination2 = stringPtr("224.1.0.1")
th.Destination2 = ptrOf("224.1.0.1")
th.Ports = &[2]int{25000 + i*2, 25001 + i*2}
l1s[i], err2 = net.ListenPacket("udp", net.JoinHostPort("224.0.0.0", strconv.FormatInt(int64(th.Ports[0]), 10)))
@@ -1003,7 +983,7 @@ func TestClientPlayPartial(t *testing.T) {
require.Equal(t, &[2]int{0, 1}, inTH.InterleavedIDs)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
Protocol: headers.TransportProtocolTCP,
InterleavedIDs: inTH.InterleavedIDs,
}
@@ -1051,7 +1031,7 @@ func TestClientPlayPartial(t *testing.T) {
c := Client{
Scheme: u.Scheme,
Host: u.Host,
Transport: transportPtr(TransportTCP),
Transport: ptrOf(TransportTCP),
}
err = c.Start2()
@@ -1157,7 +1137,7 @@ func TestClientPlayContentBase(t *testing.T) {
require.NoError(t, err2)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
Protocol: headers.TransportProtocolUDP,
ClientPorts: inTH.ClientPorts,
ServerPorts: &[2]int{34556, 34557},
@@ -1282,7 +1262,7 @@ func TestClientPlayAnyPort(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolUDP,
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
ClientPorts: th.ClientPorts,
ServerPorts: func() *[2]int {
switch ca {
@@ -1441,7 +1421,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolTCP,
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
InterleavedIDs: &[2]int{0, 1},
}.Marshal(),
},
@@ -1543,7 +1523,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolTCP,
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
InterleavedIDs: &[2]int{0, 1},
ServerPorts: &[2]int{12312, 12313},
}.Marshal(),
@@ -1614,7 +1594,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolTCP,
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
InterleavedIDs: &[2]int{0, 1},
}.Marshal(),
},
@@ -1736,7 +1716,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
require.NoError(t, err)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
Protocol: headers.TransportProtocolUDP,
ServerPorts: &[2]int{34556, 34557},
ClientPorts: inTH.ClientPorts,
@@ -1833,7 +1813,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
require.NoError(t, err2)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
Protocol: headers.TransportProtocolTCP,
InterleavedIDs: inTH.InterleavedIDs,
}
@@ -1954,7 +1934,7 @@ func TestClientPlayDifferentInterleavedIDs(t *testing.T) {
require.NoError(t, err2)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
Protocol: headers.TransportProtocolTCP,
InterleavedIDs: &[2]int{1, 2}, // use odd value
}
@@ -1997,7 +1977,7 @@ func TestClientPlayDifferentInterleavedIDs(t *testing.T) {
packetRecv := make(chan struct{})
c := Client{
Transport: transportPtr(TransportTCP),
Transport: ptrOf(TransportTCP),
}
err = readAll(&c, "rtsp://localhost:8554/teststream",
@@ -2148,7 +2128,7 @@ func TestClientPlayRedirect(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolUDP,
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
ClientPorts: th.ClientPorts,
ServerPorts: &[2]int{34556, 34557},
}.Marshal(),
@@ -2360,7 +2340,7 @@ func TestClientPlayPausePlay(t *testing.T) {
require.NoError(t, err2)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
}
if transport == "udp" {
@@ -2537,7 +2517,7 @@ func TestClientPlayRTCPReport(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolUDP,
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
ServerPorts: &[2]int{27556, 27557},
ClientPorts: inTH.ClientPorts,
}.Marshal(),
@@ -2696,7 +2676,7 @@ func TestClientPlayErrorTimeout(t *testing.T) {
require.NoError(t, err2)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
}
var l1 net.PacketConn
@@ -2839,7 +2819,7 @@ func TestClientPlayIgnoreTCPInvalidMedia(t *testing.T) {
require.NoError(t, err2)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
}
th.Protocol = headers.TransportProtocolTCP
th.InterleavedIDs = inTH.InterleavedIDs
@@ -2886,7 +2866,7 @@ func TestClientPlayIgnoreTCPInvalidMedia(t *testing.T) {
recv := make(chan struct{})
c := Client{
Transport: transportPtr(TransportTCP),
Transport: ptrOf(TransportTCP),
}
err = readAll(&c, "rtsp://localhost:8554/teststream",
@@ -2965,12 +2945,12 @@ func TestClientPlayKeepAlive(t *testing.T) {
"CSeq": req.Header["CSeq"],
"Transport": headers.Transport{
Protocol: headers.TransportProtocolTCP,
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
InterleavedIDs: &[2]int{0, 1},
}.Marshal(),
"Session": headers.Session{
Session: "ABCDE",
Timeout: uintPtr(1),
Timeout: ptrOf(uint(1)),
}.Marshal(),
},
})
@@ -3133,11 +3113,11 @@ func TestClientPlayDifferentSource(t *testing.T) {
require.NoError(t, err2)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
Protocol: headers.TransportProtocolUDP,
ClientPorts: inTH.ClientPorts,
ServerPorts: &[2]int{34556, 34557},
Source: ipPtr(net.ParseIP("127.0.1.1")),
Source: ptrOf(net.ParseIP("127.0.1.1")),
}
l1, err2 := net.ListenPacket("udp", "127.0.1.1:34556")
@@ -3184,7 +3164,7 @@ func TestClientPlayDifferentSource(t *testing.T) {
}()
c := Client{
Transport: transportPtr(TransportUDP),
Transport: ptrOf(TransportUDP),
}
err = readAll(&c, "rtsp://localhost:8554/test/stream?param=value",
@@ -3281,7 +3261,7 @@ func TestClientPlayDecodeErrors(t *testing.T) {
require.NoError(t, err2)
th := headers.Transport{
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
}
if ca.proto == "udp" {
@@ -3548,7 +3528,7 @@ func TestClientPlayPacketNTP(t *testing.T) {
Header: base.Header{
"Transport": headers.Transport{
Protocol: headers.TransportProtocolUDP,
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
Delivery: ptrOf(headers.TransportDeliveryUnicast),
ServerPorts: &[2]int{27556, 27557},
ClientPorts: inTH.ClientPorts,
}.Marshal(),
@@ -3768,7 +3748,7 @@ func TestClientPlayBackChannel(t *testing.T) {
"Transport": th.Marshal(),
"Session": headers.Session{
Session: "ABCDE",
Timeout: uintPtr(1),
Timeout: ptrOf(uint(1)),
}.Marshal(),
},
})
@@ -3914,9 +3894,9 @@ func TestClientPlayBackChannel(t *testing.T) {
RequestBackChannels: true,
Transport: func() *TransportProtocol {
if transport == "tcp" {
return transportPtr(TransportTCP)
return ptrOf(TransportTCP)
}
return transportPtr(TransportUDP)
return ptrOf(TransportUDP)
}(),
senderReportPeriod: 500 * time.Millisecond,
receiverReportPeriod: 750 * time.Millisecond,