apps/go2rtc
1
0
Fork 0
mirror of https://github.com/AlexxIT/go2rtc.git synced 2025-10-05 08:16:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix yet another broken SDP from CN cameras #1426

Browse Source
This commit is contained in:
Alex X
2024-11-01 12:09:44 +03:00
parent 1d1bcb0a63
commit 6b005a666e
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/rtsp/helpers.go
View File

@@ -30,6 +30,9 @@ func UnmarshalSDP(rawSDP []byte) ([]*core.Media, error) {
// fix multiple `s=` https://github.com/AlexxIT/WebRTC/issues/417 // fix multiple `s=` https://github.com/AlexxIT/WebRTC/issues/417
rawSDP = regexp.MustCompile("\ns=[^\n]+").ReplaceAll(rawSDP, nil) rawSDP = regexp.MustCompile("\ns=[^\n]+").ReplaceAll(rawSDP, nil)
// fix broken `c=` https://github.com/AlexxIT/go2rtc/issues/1426
rawSDP = regexp.MustCompile("\nc=[^\n]+").ReplaceAll(rawSDP, nil)
// fix SDP header for some cameras // fix SDP header for some cameras
if i := bytes.Index(rawSDP, []byte("\nm=")); i > 0 { if i := bytes.Index(rawSDP, []byte("\nm=")); i > 0 {
rawSDP = append([]byte(sdpHeader), rawSDP[i:]...) rawSDP = append([]byte(sdpHeader), rawSDP[i:]...)

34
pkg/rtsp/rtsp_test.go
View File

@@ -203,6 +203,40 @@ a=control:track5
assert.Len(t, medias, 4) assert.Len(t, medias, 4)
} }
func TestBugSDP7(t *testing.T) {
// https://github.com/AlexxIT/go2rtc/issues/1426
s := `v=0
o=- 1001 1 IN
s=VCP IPC Realtime stream
m=video 0 RTP/AVP 105
c=IN
a=control:rtsp://1.0.1.113/media/video2/video
a=rtpmap:105 H264/90000
a=fmtp:105 profile-level-id=640016; packetization-mode=1; sprop-parameter-sets=Z2QAFqw7UFAX/LCAAAH0AABOIEI=,aOqPLA==
a=recvonly
m=audio 0 RTP/AVP 0
c=IN
a=fmtp:0 RTCP=0
a=control:rtsp://1.0.1.113/media/video2/audio1
a=recvonly
m=audio 0 RTP/AVP 0
c=IN
a=control:rtsp://1.0.1.113/media/video2/backchannel
a=rtpmap:0 PCMA/8000
a=rtpmap:0 PCMU/8000
a=sendonly
m=application 0 RTP/AVP 107
c=IN
a=control:rtsp://1.0.1.113/media/video2/metadata
a=rtpmap:107 vnd.onvif.metadata/90000
a=fmtp:107 DecoderTag=h3c-v3 RTCP=0
a=recvonly
`
medias, err := UnmarshalSDP([]byte(s))
assert.Nil(t, err)
assert.Len(t, medias, 4)
}
func TestHikvisionPCM(t *testing.T) { func TestHikvisionPCM(t *testing.T) {
s := `v=0 s := `v=0
o=- 1721969533379665 1721969533379665 IN IP4 192.168.1.12 o=- 1721969533379665 1721969533379665 IN IP4 192.168.1.12