External/mediamtx
1
0
Fork 1
mirror of https://github.com/bluenviron/mediamtx.git synced 2025-12-25 12:32:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: allow publishing with RTP/AVP

Browse source
This commit is contained in:
aler9 2020-01-15 22:27:44 +01:00
parent 5d5ac15666
commit e78f3f22a0
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client.go
View file

@ -358,13 +358,13 @@ func (c *client) handleRequest(req *rtsp.Request) bool {
return true
case "SETUP":
transportstr, ok := req.Headers["Transport"]
transportStr, ok := req.Headers["Transport"]
if !ok {
c.writeResError(req, fmt.Errorf("transport header missing"))
return false
}
th := newTransportHeader(transportstr)
th := newTransportHeader(transportStr)
if _, ok := th["unicast"]; !ok {
c.writeResError(req, fmt.Errorf("transport header does not contain unicast"))
@ -388,7 +388,7 @@ func (c *client) handleRequest(req *rtsp.Request) bool {
}() {
rtpPort, rtcpPort := th.getClientPorts()
if rtpPort == 0 || rtcpPort == 0 {
c.writeResError(req, fmt.Errorf("transport header does not have valid client ports (%s)", transportstr))
c.writeResError(req, fmt.Errorf("transport header does not have valid client ports (%s)", transportStr))
return false
}
@ -502,7 +502,7 @@ func (c *client) handleRequest(req *rtsp.Request) bool {
return true
} else {
c.writeResError(req, fmt.Errorf("transport header does not contain a valid protocol (RTP/AVP or RTP/AVP/TCP) (%s)", transportstr))
c.writeResError(req, fmt.Errorf("transport header does not contain a valid protocol (RTP/AVP, RTP/AVP/UDP or RTP/AVP/TCP) (%s)", transportStr))
return false
}
@ -519,10 +519,20 @@ func (c *client) handleRequest(req *rtsp.Request) bool {
}
// record via UDP
if _, ok := th["RTP/AVP/UDP"]; ok {
if func() bool {
_, ok := th["RTP/AVP"]
if ok {
return true
}
_, ok = th["RTP/AVP/UDP"]
if ok {
return true
}
return false
}(); ok {
rtpPort, rtcpPort := th.getClientPorts()
if rtpPort == 0 || rtcpPort == 0 {
c.writeResError(req, fmt.Errorf("transport header does not have valid client ports (%s)", transportstr))
c.writeResError(req, fmt.Errorf("transport header does not have valid client ports (%s)", transportStr))
return false
}
@ -623,7 +633,7 @@ func (c *client) handleRequest(req *rtsp.Request) bool {
return true
} else {
c.writeResError(req, fmt.Errorf("transport header does not contain a valid protocol (RTP/AVP or RTP/AVP/TCP) (%s)", transportstr))
c.writeResError(req, fmt.Errorf("transport header does not contain a valid protocol (RTP/AVP, RTP/AVP/UDP or RTP/AVP/TCP) (%s)", transportStr))
return false
}