gilles/go2rtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code refactoring for UnmarshalSDP

Browse Source
This commit is contained in:
Alex X
2024-11-01 12:08:06 +03:00
parent 3f5f1328e7
commit 1d1bcb0a63
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/rtsp/helpers.go
+4 -6
View File
@@ -28,8 +28,7 @@ func UnmarshalSDP(rawSDP []byte) ([]*core.Media, error) {
sd := &sdp.SessionDescription{} sd := &sdp.SessionDescription{}
if err := sd.Unmarshal(rawSDP); err != nil { if err := sd.Unmarshal(rawSDP); err != nil {
// fix multiple `s=` https://github.com/AlexxIT/WebRTC/issues/417 // fix multiple `s=` https://github.com/AlexxIT/WebRTC/issues/417
re, _ := regexp.Compile("\ns=[^\n]+") rawSDP = regexp.MustCompile("\ns=[^\n]+").ReplaceAll(rawSDP, nil)
rawSDP = re.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 {
@@ -38,12 +37,11 @@ func UnmarshalSDP(rawSDP []byte) ([]*core.Media, error) {
// Fix invalid media type (errSDPInvalidValue) caused by // Fix invalid media type (errSDPInvalidValue) caused by
// some TP-LINK IP camera, e.g. TL-IPC44GW // some TP-LINK IP camera, e.g. TL-IPC44GW
m := regexp.MustCompile("m=[^ ]+ ") for _, b := range regexp.MustCompile("m=[^ ]+ ").FindAll(rawSDP, -1) {
for _, i := range m.FindAll(rawSDP, -1) { switch string(b[2 : len(b)-1]) {
switch string(i[2 : len(i)-1]) {
case "audio", "video", "application": case "audio", "video", "application":
default: default:
rawSDP = bytes.Replace(rawSDP, i, []byte("m=application "), 1) rawSDP = bytes.Replace(rawSDP, b, []byte("m=application "), 1)
} }
} }