move each goroutine in a dedicated struct (#285)

This commit is contained in:
Alessandro Ros
2023-05-17 21:14:00 +02:00
committed by GitHub
parent f94885005f
commit b0947c133e
24 changed files with 675 additions and 641 deletions

View File

@@ -8,6 +8,18 @@ import (
"github.com/bluenviron/gortsplib/v3/pkg/base"
)
func uint16Ptr(v uint16) *uint16 {
return &v
}
func uint32Ptr(v uint32) *uint32 {
return &v
}
func uintPtr(v uint) *uint {
return &v
}
var casesRTPInfo = []struct {
name string
vin base.HeaderValue
@@ -20,15 +32,9 @@ var casesRTPInfo = []struct {
base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;seq=35243;rtptime=717574556`},
RTPInfo{
{
URL: "rtsp://127.0.0.1/test.mkv/track1",
SequenceNumber: func() *uint16 {
v := uint16(35243)
return &v
}(),
Timestamp: func() *uint32 {
v := uint32(717574556)
return &v
}(),
URL: "rtsp://127.0.0.1/test.mkv/track1",
SequenceNumber: uint16Ptr(35243),
Timestamp: uint32Ptr(717574556),
},
},
},
@@ -40,26 +46,14 @@ var casesRTPInfo = []struct {
`url=rtsp://127.0.0.1/test.mkv/track2;seq=13655;rtptime=2848846950`},
RTPInfo{
{
URL: "rtsp://127.0.0.1/test.mkv/track1",
SequenceNumber: func() *uint16 {
v := uint16(35243)
return &v
}(),
Timestamp: func() *uint32 {
v := uint32(717574556)
return &v
}(),
URL: "rtsp://127.0.0.1/test.mkv/track1",
SequenceNumber: uint16Ptr(35243),
Timestamp: uint32Ptr(717574556),
},
{
URL: "rtsp://127.0.0.1/test.mkv/track2",
SequenceNumber: func() *uint16 {
v := uint16(13655)
return &v
}(),
Timestamp: func() *uint32 {
v := uint32(2848846950)
return &v
}(),
URL: "rtsp://127.0.0.1/test.mkv/track2",
SequenceNumber: uint16Ptr(13655),
Timestamp: uint32Ptr(2848846950),
},
},
},
@@ -69,11 +63,8 @@ var casesRTPInfo = []struct {
base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;seq=35243`},
RTPInfo{
{
URL: "rtsp://127.0.0.1/test.mkv/track1",
SequenceNumber: func() *uint16 {
v := uint16(35243)
return &v
}(),
URL: "rtsp://127.0.0.1/test.mkv/track1",
SequenceNumber: uint16Ptr(35243),
},
},
},
@@ -83,11 +74,8 @@ var casesRTPInfo = []struct {
base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;rtptime=717574556`},
RTPInfo{
{
URL: "rtsp://127.0.0.1/test.mkv/track1",
Timestamp: func() *uint32 {
v := uint32(717574556)
return &v
}(),
URL: "rtsp://127.0.0.1/test.mkv/track1",
Timestamp: uint32Ptr(717574556),
},
},
},
@@ -97,15 +85,9 @@ var casesRTPInfo = []struct {
base.HeaderValue{`url=trackID=0;seq=12447;rtptime=12447`},
RTPInfo{
{
URL: "trackID=0",
SequenceNumber: func() *uint16 {
v := uint16(12447)
return &v
}(),
Timestamp: func() *uint32 {
v := uint32(12447)
return &v
}(),
URL: "trackID=0",
SequenceNumber: uint16Ptr(12447),
Timestamp: uint32Ptr(12447),
},
},
},
@@ -117,26 +99,14 @@ var casesRTPInfo = []struct {
`seq=58477;rtptime=1020884293,url=rtsp://10.13.146.53/axis-media/media.amp/trackID=2;seq=15727;rtptime=1171661503`},
RTPInfo{
{
URL: "rtsp://10.13.146.53/axis-media/media.amp/trackID=1",
SequenceNumber: func() *uint16 {
v := uint16(58477)
return &v
}(),
Timestamp: func() *uint32 {
v := uint32(1020884293)
return &v
}(),
URL: "rtsp://10.13.146.53/axis-media/media.amp/trackID=1",
SequenceNumber: uint16Ptr(58477),
Timestamp: uint32Ptr(1020884293),
},
{
URL: "rtsp://10.13.146.53/axis-media/media.amp/trackID=2",
SequenceNumber: func() *uint16 {
v := uint16(15727)
return &v
}(),
Timestamp: func() *uint32 {
v := uint32(1171661503)
return &v
}(),
URL: "rtsp://10.13.146.53/axis-media/media.amp/trackID=2",
SequenceNumber: uint16Ptr(15727),
Timestamp: uint32Ptr(1171661503),
},
},
},
@@ -148,26 +118,14 @@ var casesRTPInfo = []struct {
`url=trackID=2;seq=43807;rtptime=1702259566`},
RTPInfo{
{
URL: "trackID=1",
SequenceNumber: func() *uint16 {
v := uint16(55664)
return &v
}(),
Timestamp: func() *uint32 {
v := uint32(254718369)
return &v
}(),
URL: "trackID=1",
SequenceNumber: uint16Ptr(55664),
Timestamp: uint32Ptr(254718369),
},
{
URL: "trackID=2",
SequenceNumber: func() *uint16 {
v := uint16(43807)
return &v
}(),
Timestamp: func() *uint32 {
v := uint32(1702259566)
return &v
}(),
URL: "trackID=2",
SequenceNumber: uint16Ptr(43807),
Timestamp: uint32Ptr(1702259566),
},
},
},