mirror of
https://github.com/aler9/gortsplib
synced 2025-10-05 15:16:51 +08:00
modernize code (#884)
This commit is contained in:
@@ -211,7 +211,7 @@ func TestServerRecordErrorSetup(t *testing.T) {
|
||||
|
||||
if ca.name == "invalid transport" {
|
||||
inTH = &headers.Transport{
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: nil,
|
||||
Protocol: headers.TransportProtocolUDP,
|
||||
ClientPorts: &[2]int{35466, 35467},
|
||||
@@ -373,8 +373,8 @@ func TestServerRecordPath(t *testing.T) {
|
||||
|
||||
th := &headers.Transport{
|
||||
Protocol: headers.TransportProtocolTCP,
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
InterleavedIDs: &[2]int{0, 1},
|
||||
}
|
||||
|
||||
@@ -424,8 +424,8 @@ func TestServerRecordErrorSetupMediaTwice(t *testing.T) {
|
||||
|
||||
inTH := &headers.Transport{
|
||||
Protocol: headers.TransportProtocolTCP,
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
InterleavedIDs: &[2]int{0, 1},
|
||||
}
|
||||
|
||||
@@ -435,8 +435,8 @@ func TestServerRecordErrorSetupMediaTwice(t *testing.T) {
|
||||
|
||||
inTH = &headers.Transport{
|
||||
Protocol: headers.TransportProtocolTCP,
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
InterleavedIDs: &[2]int{2, 3},
|
||||
}
|
||||
|
||||
@@ -514,8 +514,8 @@ func TestServerRecordErrorRecordPartialMedias(t *testing.T) {
|
||||
|
||||
inTH := &headers.Transport{
|
||||
Protocol: headers.TransportProtocolTCP,
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
InterleavedIDs: &[2]int{0, 1},
|
||||
}
|
||||
|
||||
@@ -730,8 +730,8 @@ func TestServerRecord(t *testing.T) {
|
||||
|
||||
for i := 0; i < 2; i++ {
|
||||
inTH := &headers.Transport{
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
}
|
||||
|
||||
if ca.transport == "udp" {
|
||||
@@ -986,8 +986,8 @@ func TestServerRecordErrorInvalidProtocol(t *testing.T) {
|
||||
doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias)
|
||||
|
||||
inTH := &headers.Transport{
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
Protocol: headers.TransportProtocolUDP,
|
||||
ClientPorts: &[2]int{35466, 35467},
|
||||
}
|
||||
@@ -1054,8 +1054,8 @@ func TestServerRecordRTCPReport(t *testing.T) {
|
||||
defer l2.Close()
|
||||
|
||||
inTH := &headers.Transport{
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
Protocol: headers.TransportProtocolUDP,
|
||||
ClientPorts: &[2]int{34556, 34557},
|
||||
}
|
||||
@@ -1180,8 +1180,8 @@ func TestServerRecordTimeout(t *testing.T) {
|
||||
doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias)
|
||||
|
||||
inTH := &headers.Transport{
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
}
|
||||
|
||||
if transport == "udp" {
|
||||
@@ -1262,8 +1262,8 @@ func TestServerRecordWithoutTeardown(t *testing.T) {
|
||||
doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias)
|
||||
|
||||
inTH := &headers.Transport{
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
}
|
||||
|
||||
if transport == "udp" {
|
||||
@@ -1335,8 +1335,8 @@ func TestServerRecordUDPChangeConn(t *testing.T) {
|
||||
doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias)
|
||||
|
||||
inTH := &headers.Transport{
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
Protocol: headers.TransportProtocolUDP,
|
||||
ClientPorts: &[2]int{35466, 35467},
|
||||
}
|
||||
@@ -1467,8 +1467,8 @@ func TestServerRecordDecodeErrors(t *testing.T) {
|
||||
doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias)
|
||||
|
||||
inTH := &headers.Transport{
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
}
|
||||
|
||||
if ca.proto == "udp" {
|
||||
@@ -1657,8 +1657,8 @@ func TestServerRecordPacketNTP(t *testing.T) {
|
||||
defer l2.Close()
|
||||
|
||||
inTH := &headers.Transport{
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
Protocol: headers.TransportProtocolUDP,
|
||||
ClientPorts: &[2]int{34556, 34557},
|
||||
}
|
||||
@@ -1776,8 +1776,8 @@ func TestServerRecordPausePause(t *testing.T) {
|
||||
doAnnounce(t, conn, "rtsp://localhost:8554/teststream", medias)
|
||||
|
||||
inTH := &headers.Transport{
|
||||
Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
|
||||
Mode: transportModePtr(headers.TransportModeRecord),
|
||||
Delivery: ptrOf(headers.TransportDeliveryUnicast),
|
||||
Mode: ptrOf(headers.TransportModeRecord),
|
||||
Protocol: headers.TransportProtocolUDP,
|
||||
ClientPorts: &[2]int{35466, 35467},
|
||||
}
|
||||
|
Reference in New Issue
Block a user