apps/go2rtc
1
0
Fork 0
mirror of https://github.com/AlexxIT/go2rtc.git synced 2025-09-27 04:36:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix extra slash for RTSP SETUP #1236

Browse Source
This commit is contained in:
Alex X
2025-03-09 17:08:25 +03:00
parent b6934922fa
commit 3954a555f8
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/rtsp/client.go
View File

@@ -237,13 +237,11 @@ func (c *Conn) SetupMedia(media *core.Media) (byte, error) {
rawURL := media.ID // control rawURL := media.ID // control
if !strings.Contains(rawURL, "://") { if !strings.Contains(rawURL, "://") {
rawURL = c.URL.String() rawURL = c.URL.String()
if !strings.HasSuffix(rawURL, "/") { // prefix check for https://github.com/AlexxIT/go2rtc/issues/1236
if !strings.HasSuffix(rawURL, "/") && !strings.HasPrefix(media.ID, "/") {
rawURL += "/" rawURL += "/"
} }
rawURL += media.ID rawURL += media.ID
} else if strings.HasPrefix(rawURL, "rtsp://rtsp://") {
// fix https://github.com/AlexxIT/go2rtc/issues/830
rawURL = rawURL[7:]
} }
trackURL, err := urlParse(rawURL) trackURL, err := urlParse(rawURL)
if err != nil { if err != nil {

1
pkg/rtsp/helpers.go
View File

@@ -117,6 +117,7 @@ func findFmtpLine(payloadType uint8, descriptions []*sdp.MediaDescription) strin
// 1. Content-Base: rtsp://::ffff:192.168.1.123/onvif/profile.1/ // 1. Content-Base: rtsp://::ffff:192.168.1.123/onvif/profile.1/
// 2. Content-Base: rtsp://rtsp://turret2-cam.lan:554/stream1/ // 2. Content-Base: rtsp://rtsp://turret2-cam.lan:554/stream1/
func urlParse(rawURL string) (*url.URL, error) { func urlParse(rawURL string) (*url.URL, error) {
// fix https://github.com/AlexxIT/go2rtc/issues/830
if strings.HasPrefix(rawURL, "rtsp://rtsp://") { if strings.HasPrefix(rawURL, "rtsp://rtsp://") {
rawURL = rawURL[7:] rawURL = rawURL[7:]
} }