package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-12 02:20:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

support RTP-Info headers with paths instead of URLs (https://github.com/aler9/rtsp-simple-server/issues/250)

Browse Source
This commit is contained in:
aler9
2021-03-29 22:00:14 +02:00
parent 0e6811a178
commit d39996c824
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/headers/rtpinfo.go
View File

@@ -10,7 +10,7 @@ import (
// RTPInfoEntry is an entry of a RTP-Info header. // RTPInfoEntry is an entry of a RTP-Info header.
type RTPInfoEntry struct { type RTPInfoEntry struct {
URL *base.URL URL string
SequenceNumber *uint16 SequenceNumber *uint16
Timestamp *uint32 Timestamp *uint32
} }
@@ -40,11 +40,7 @@ func (h *RTPInfo) Read(v base.HeaderValue) error {
k, v := tmp[0], tmp[1] k, v := tmp[0], tmp[1]
switch k { switch k {
case "url": case "url":
vu, err := base.ParseURL(v) e.URL = v
if err != nil {
return err
}
e.URL = vu
case "seq": case "seq":
vi, err := strconv.ParseUint(v, 10, 16) vi, err := strconv.ParseUint(v, 10, 16)
@@ -67,6 +63,10 @@ func (h *RTPInfo) Read(v base.HeaderValue) error {
} }
} }
if e.URL == "" {
return fmt.Errorf("URL is missing")
}
*h = append(*h, e) *h = append(*h, e)
} }
@@ -79,7 +79,7 @@ func (h RTPInfo) Write() base.HeaderValue {
for i, e := range h { for i, e := range h {
var tmp []string var tmp []string
tmp = append(tmp, "url="+e.URL.String()) tmp = append(tmp, "url="+e.URL)
if e.SequenceNumber != nil { if e.SequenceNumber != nil {
tmp = append(tmp, "seq="+strconv.FormatUint(uint64(*e.SequenceNumber), 10)) tmp = append(tmp, "seq="+strconv.FormatUint(uint64(*e.SequenceNumber), 10))

28
pkg/headers/rtpinfo_test.go
View File

@@ -20,7 +20,7 @@ var casesRTPInfo = []struct {
base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;seq=35243;rtptime=717574556`}, base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;seq=35243;rtptime=717574556`},
RTPInfo{ RTPInfo{
{ {
URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track1"), URL: "rtsp://127.0.0.1/test.mkv/track1",
SequenceNumber: func() *uint16 { SequenceNumber: func() *uint16 {
v := uint16(35243) v := uint16(35243)
return &v return &v
@@ -38,7 +38,7 @@ var casesRTPInfo = []struct {
base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;seq=35243;rtptime=717574556,url=rtsp://127.0.0.1/test.mkv/track2;seq=13655;rtptime=2848846950`}, base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;seq=35243;rtptime=717574556,url=rtsp://127.0.0.1/test.mkv/track2;seq=13655;rtptime=2848846950`},
RTPInfo{ RTPInfo{
{ {
URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track1"), URL: "rtsp://127.0.0.1/test.mkv/track1",
SequenceNumber: func() *uint16 { SequenceNumber: func() *uint16 {
v := uint16(35243) v := uint16(35243)
return &v return &v
@@ -49,7 +49,7 @@ var casesRTPInfo = []struct {
}(), }(),
}, },
{ {
URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track2"), URL: "rtsp://127.0.0.1/test.mkv/track2",
SequenceNumber: func() *uint16 { SequenceNumber: func() *uint16 {
v := uint16(13655) v := uint16(13655)
return &v return &v
@@ -67,7 +67,7 @@ var casesRTPInfo = []struct {
base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;seq=35243`}, base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;seq=35243`},
RTPInfo{ RTPInfo{
{ {
URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track1"), URL: "rtsp://127.0.0.1/test.mkv/track1",
SequenceNumber: func() *uint16 { SequenceNumber: func() *uint16 {
v := uint16(35243) v := uint16(35243)
return &v return &v
@@ -81,7 +81,7 @@ var casesRTPInfo = []struct {
base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;rtptime=717574556`}, base.HeaderValue{`url=rtsp://127.0.0.1/test.mkv/track1;rtptime=717574556`},
RTPInfo{ RTPInfo{
{ {
URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track1"), URL: "rtsp://127.0.0.1/test.mkv/track1",
Timestamp: func() *uint32 { Timestamp: func() *uint32 {
v := uint32(717574556) v := uint32(717574556)
return &v return &v
@@ -89,6 +89,24 @@ var casesRTPInfo = []struct {
}, },
}, },
}, },
{
"path instead of url",
base.HeaderValue{`url=trackID=0;seq=12447;rtptime=12447`},
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
}(),
},
},
},
} }
func TestRTPInfoRead(t *testing.T) { func TestRTPInfoRead(t *testing.T) {