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

sdp: fix compatibility with a Uniview camera (bluenviron/mediamtx#5008) (#903)

Browse Source
This commit is contained in:
Alessandro Ros
2025-09-21 18:08:27 +02:00
committed by GitHub
parent 1dd27b250c
commit 6750a1eb8a
2 changed files with 99 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/sdp/sdp.go
View File

@@ -91,6 +91,8 @@ func (s *SessionDescription) unmarshalOrigin(value string) error {
if strings.HasSuffix(value, " IN") {
value += " IP4"
} else if strings.HasSuffix(value, " IN ") {
value += "IP4"
}
if strings.HasSuffix(value, "IN IP4") {

99
pkg/sdp/sdp_test.go
View File

@@ -3093,8 +3093,7 @@ var cases = []struct {
},
},
},
{
{ //nolint:dupl
"issue gortsplib/618 (Uniview IPC2125LE-ADF28KM-H)",
[]byte("v=0\r\n" +
"o=- 1001 1 IN\r\n" +
@@ -3241,6 +3240,102 @@ var cases = []struct {
},
},
},
{ //nolint:dupl
"issue mediamtx/5008 (Uniview IPC2122LB-SF28K-A)",
[]byte("v=0\r\n" +
"o=- 1001 1 IN \r\n" +
"s=VCP IPC Realtime stream\r\n" +
"m=video 0 RTP/AVP 105\r\n" +
"c=IN\r\n" +
"a=control:rtsp://10.0.0.1/media/video1/video\r\n" +
"a=rtpmap:105 H264/90000\r\n" +
"a=fmtp:105 profile-level-id=640028; packetization-mode=1; " +
"sprop-parameter-sets=Z2QAKKw7UDwBE/LCAAAH0AAA6mEI,aOqPLA==\r\n" +
"a=recvonly\r\n" +
"m=application 0 RTP/AVP 107\r\n" +
"c=IN\r\n" +
"a=control:rtsp://10.0.0.1/media/video1/metadata\r\n" +
"a=rtpmap:107 vnd.onvif.metadata/90000\r\n" +
"a=fmtp:107 DecoderTag=h3c-v3 RTCP=0\r\n" +
"a=recvonly\r\n"),
[]byte("v=0\r\n" +
"o=- 1001 1 IN IP4 \r\n" +
"s=VCP IPC Realtime stream\r\n" +
"m=video 0 RTP/AVP 105\r\n" +
"a=control:rtsp://10.0.0.1/media/video1/video\r\n" +
"a=rtpmap:105 H264/90000\r\n" +
"a=fmtp:105 profile-level-id=640028; packetization-mode=1; " +
"sprop-parameter-sets=Z2QAKKw7UDwBE/LCAAAH0AAA6mEI,aOqPLA==\r\n" +
"a=recvonly\r\n" +
"m=application 0 RTP/AVP 107\r\n" +
"a=control:rtsp://10.0.0.1/media/video1/metadata\r\n" +
"a=rtpmap:107 vnd.onvif.metadata/90000\r\n" +
"a=fmtp:107 DecoderTag=h3c-v3 RTCP=0\r\n" +
"a=recvonly\r\n"),
SessionDescription{
Origin: psdp.Origin{
Username: "-",
SessionID: 1001,
SessionVersion: 1,
NetworkType: "IN",
AddressType: "IP4",
},
SessionName: "VCP IPC Realtime stream",
MediaDescriptions: []*psdp.MediaDescription{
{
MediaName: psdp.MediaName{
Media: "video",
Protos: []string{"RTP", "AVP"},
Formats: []string{"105"},
},
Attributes: []psdp.Attribute{
{
Key: "control",
Value: "rtsp://10.0.0.1/media/video1/video",
},
{
Key: "rtpmap",
Value: "105 H264/90000",
},
{
Key: "fmtp",
Value: "105 profile-level-id=640028; packetization-mode=1; " +
"sprop-parameter-sets=Z2QAKKw7UDwBE/LCAAAH0AAA6mEI,aOqPLA==",
},
{
Key: "recvonly",
Value: "",
},
},
},
{
MediaName: psdp.MediaName{
Media: "application",
Protos: []string{"RTP", "AVP"},
Formats: []string{"107"},
},
Attributes: []psdp.Attribute{
{
Key: "control",
Value: "rtsp://10.0.0.1/media/video1/metadata",
},
{
Key: "rtpmap",
Value: "107 vnd.onvif.metadata/90000",
},
{
Key: "fmtp",
Value: "107 DecoderTag=h3c-v3 RTCP=0",
},
{
Key: "recvonly",
Value: "",
},
},
},
},
},
},
}
func TestUnmarshal(t *testing.T) {