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

Code refactoring for RTSP transport header processing

Browse Source
This commit is contained in:
Alex X
2025-02-18 12:49:33 +03:00
parent 6fa352f407
commit 637e65e5a0
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/rtsp/server.go
View File

@@ -141,17 +141,14 @@ func (c *Conn) Accept() error {
} }
case MethodSetup: case MethodSetup:
tr := req.Header.Get("Transport")
res := &tcp.Response{ res := &tcp.Response{
Header: map[string][]string{}, Header: map[string][]string{},
Request: req, Request: req,
} }
// Test if client requests TCP transport, otherwise return 461 Transport not supported // Test if client requests TCP transport, otherwise return 461 Transport not supported
// This allows smart clients who initially requested UDP to fall back on TCP transport. // This allows smart clients who initially requested UDP to fall back on TCP transport
if strings.HasPrefix(tr, "RTP/AVP/TCP") { if tr := req.Header.Get("Transport"); strings.HasPrefix(tr, "RTP/AVP/TCP") {
c.session = core.RandString(8, 10) c.session = core.RandString(8, 10)
c.state = StateSetup c.state = StateSetup
@@ -159,16 +156,8 @@ func (c *Conn) Accept() error {
if i := reqTrackID(req); i >= 0 && i < len(c.Senders) { if i := reqTrackID(req); i >= 0 && i < len(c.Senders) {
// mark sender as SETUP // mark sender as SETUP
c.Senders[i].Media.ID = MethodSetup c.Senders[i].Media.ID = MethodSetup
interleaved := fmt.Sprintf("%d-%d", i*2, i*2+1) tr = fmt.Sprintf("RTP/AVP/TCP;unicast;interleaved=%d-%d", i*2, i*2+1)
res.Header.Set("Transport", tr)
// Check if tr already contains the 'interleaved' parameter
if strings.Contains(tr, "interleaved=") {
// If so, just update the interleaved value
res.Header.Set("Transport", strings.Replace(tr, "interleaved=[^;]*", "interleaved="+interleaved, 1))
} else {
// Otherwise, append the interleaved parameter
res.Header.Set("Transport", tr+";interleaved="+interleaved)
}
} else { } else {
res.Status = "400 Bad Request" res.Status = "400 Bad Request"
} }