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

Merge branch 'master' into rtsp-backchannel

Browse Source
This commit is contained in:
seydx
2024-12-14 11:30:37 +01:00
parent 61322ede6c f1ba5e95ec
commit 1797ff67c0
6 changed files with 196 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/rtsp/server.go
+6 -6
View File
@@ -159,7 +159,7 @@ func (c *Conn) Accept() error {
}
const transport = "RTP/AVP/TCP;unicast;interleaved="
if strings.HasPrefix(tr, transport) {
if tr = core.Between(tr, "interleaved=", ";"); tr != "" {
c.session = core.RandString(8, 10)
c.state = StateSetup
@@ -169,12 +169,12 @@ func (c *Conn) Accept() error {
if trackID >= 0 {
if trackID < len(c.Senders) {
c.Senders[trackID].Media.ID = MethodSetup
tr = fmt.Sprintf("RTP/AVP/TCP;unicast;interleaved=%d-%d", trackID*2, trackID*2+1)
res.Header.Set("Transport", tr)
tr = fmt.Sprintf("%d-%d", trackID*2, trackID*2+1)
res.Header.Set("Transport", transport+tr)
} else if trackID >= len(c.Senders) && trackID < len(c.Senders)+len(c.Receivers) {
c.Receivers[trackID-len(c.Senders)].Media.ID = MethodSetup
tr = fmt.Sprintf("RTP/AVP/TCP;unicast;interleaved=%d-%d", trackID*2, trackID*2+1)
res.Header.Set("Transport", tr)
tr = fmt.Sprintf("%d-%d", trackID*2, trackID*2+1)
res.Header.Set("Transport", transport+tr)
} else {
res.Status = "400 Bad Request"
}
@@ -182,7 +182,7 @@ func (c *Conn) Accept() error {
res.Status = "400 Bad Request"
}
} else {
res.Header.Set("Transport", tr[:len(transport)+3])
res.Header.Set("Transport", transport+tr)
}
} else {
res.Status = "461 Unsupported transport"