package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-05 15:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

support SDPs with RS bandwidth (https://github.com/aler9/rtsp-simple-server/issues/136)

Browse Source
This commit is contained in:
aler9
2020-11-28 11:02:41 +01:00
parent 7d1e3afff3
commit 0c292dec9d
2 changed files with 144 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/sdp/sdp.go
View File

@@ -186,7 +186,7 @@ func unmarshalBandwidth(value string) (*psdp.Bandwidth, error) {
experimental := strings.HasPrefix(parts[0], "X-")
if experimental {
parts[0] = strings.TrimPrefix(parts[0], "X-")
} else if i := indexOf(parts[0], []string{"CT", "AS", "RR"}); i == -1 {
} else if i := indexOf(parts[0], []string{"CT", "AS", "RR", "RS"}); i == -1 {
// Set according to currently registered with IANA
// https://tools.ietf.org/html/rfc4566#section-5.8
return nil, fmt.Errorf("%w `%v`", errSDPInvalidValue, parts[0])

143
pkg/sdp/sdp_test.go
View File

@@ -908,6 +908,149 @@ var cases = []struct {
},
},
},
{
"bandwidth rs",
[]byte("v=0\r\n" +
"o=- 200710060441230578 200710060441230578 IN IP4 127.0.0.1\r\n" +
"s=<No Title>\r\n" +
"c=IN IP4 0.0.0.0\r\n" +
"b=AS:104\r\n" +
"a=maxps:1250\r\n" +
"t=0 0\r\n" +
"a=control:rtsp://61.135.88.175:554/refuse/unavailable_media.wmv/\r\n" +
"a=etag:{CCEE392D-83DF-F4AA-130B-E8A05562CE63}\r\n" +
"a=range:npt=3.000-6.185\r\n" +
"a=type:notstridable\r\n" +
"a=recvonly\r\n" +
"m=video 0 RTP/AVP 96\r\n" +
"b=AS:105\r\n" +
"b=X-AV:100\r\n" +
"b=RS:0\r\n" +
"b=RR:0\r\n" +
"a=rtpmap:96 x-asf-pf/1000\r\n" +
"a=control:video\r\n" +
"a=stream:1\r\n" +
"m=application 0 RTP/AVP 96\r\n" +
"b=RS:0\r\n" +
"b=RR:0\r\n" +
"a=rtpmap:96 x-wms-rtx/1000\r\n" +
"a=control:rtx\r\n" +
"a=stream:65536\r\n"),
[]byte("v=0\r\n" +
"o=- 200710060441230578 200710060441230578 IN IP4 127.0.0.1\r\n" +
"s=<No Title>\r\n" +
"c=IN IP4 0.0.0.0\r\n" +
"b=AS:104\r\n" +
"t=0 0\r\n" +
"a=maxps:1250\r\n" +
"a=control:rtsp://61.135.88.175:554/refuse/unavailable_media.wmv/\r\n" +
"a=etag:{CCEE392D-83DF-F4AA-130B-E8A05562CE63}\r\n" +
"a=range:npt=3.000-6.185\r\n" +
"a=type:notstridable\r\n" +
"a=recvonly\r\n" +
"m=video 0 RTP/AVP 96\r\n" +
"b=AS:105\r\n" +
"b=X-AV:100\r\n" +
"b=RS:0\r\n" +
"b=RR:0\r\n" +
"a=rtpmap:96 x-asf-pf/1000\r\n" +
"a=control:video\r\n" +
"a=stream:1\r\n" +
"m=application 0 RTP/AVP 96\r\n" +
"b=RS:0\r\n" +
"b=RR:0\r\n" +
"a=rtpmap:96 x-wms-rtx/1000\r\n" +
"a=control:rtx\r\n" +
"a=stream:65536\r\n"),
SessionDescription{
Origin: psdp.Origin{
Username: "-",
SessionID: 200710060441230578,
SessionVersion: 200710060441230578,
NetworkType: "IN",
AddressType: "IP4",
UnicastAddress: "127.0.0.1",
},
SessionName: psdp.SessionName("<No Title>"),
ConnectionInformation: &psdp.ConnectionInformation{
NetworkType: "IN",
AddressType: "IP4",
Address: &psdp.Address{Address: "0.0.0.0"},
},
Bandwidth: []psdp.Bandwidth{
{
Type: "AS",
Bandwidth: 104,
},
},
TimeDescriptions: []psdp.TimeDescription{{psdp.Timing{0, 0}, nil}},
Attributes: []psdp.Attribute{
{"maxps", "1250"},
{"control", "rtsp://61.135.88.175:554/refuse/unavailable_media.wmv/"},
{"etag", "{CCEE392D-83DF-F4AA-130B-E8A05562CE63}"},
{"range", "npt=3.000-6.185"},
{"type", "notstridable"},
{"recvonly", ""},
},
MediaDescriptions: []*psdp.MediaDescription{
{
MediaName: psdp.MediaName{
Media: "video",
Port: psdp.RangedPort{Value: 0},
Protos: []string{"RTP", "AVP"},
Formats: []string{"96"},
},
Bandwidth: []psdp.Bandwidth{
{
Type: "AS",
Bandwidth: 105,
},
{
Experimental: true,
Type: "AV",
Bandwidth: 100,
},
{
Type: "RS",
Bandwidth: 0,
},
{
Type: "RR",
Bandwidth: 0,
},
},
Attributes: []psdp.Attribute{
{"rtpmap", "96 x-asf-pf/1000"},
{"control", "video"},
{"stream", "1"},
},
},
{
MediaName: psdp.MediaName{
Media: "application",
Port: psdp.RangedPort{Value: 0},
Protos: []string{"RTP", "AVP"},
Formats: []string{"96"},
},
Bandwidth: []psdp.Bandwidth{
{
Type: "RS",
Bandwidth: 0,
},
{
Type: "RR",
Bandwidth: 0,
},
},
Attributes: []psdp.Attribute{
{"rtpmap", "96 x-wms-rtx/1000"},
{"control", "rtx"},
{"stream", "65536"},
},
},
},
},
},
}
func TestUnmarshal(t *testing.T) {