Merge pull request #1511 from fmcloudconsulting/fix/rtsp-server-interleaved

Accept rtsp client without interleaved parameter

pkg/rtsp/server.go

@@ -148,15 +148,14 @@ func (c *Conn) Accept() error {
 			}
 
 		case MethodSetup:
-			tr := req.Header.Get("Transport")
-
 			res := &tcp.Response{
 				Header:  map[string][]string{},
 				Request: req,
 			}
 
-			const transport = "RTP/AVP/TCP;unicast;interleaved="
+			// Test if client requests TCP transport, otherwise return 461 Transport not supported
-			if tr = core.Between(tr, "interleaved=", ";"); tr != "" {
+			// This allows smart clients who initially requested UDP to fall back on TCP transport
+			if tr := req.Header.Get("Transport"); strings.HasPrefix(tr, "RTP/AVP/TCP") {
 				c.session = core.RandString(8, 10)
 				c.state = StateSetup
 
@@ -164,13 +163,13 @@ func (c *Conn) Accept() error {
 					if i := reqTrackID(req); i >= 0 && i < len(c.Senders) {
 						// mark sender as SETUP
 						c.Senders[i].Media.ID = MethodSetup
-						tr = 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", transport+tr)
+						res.Header.Set("Transport", tr)
 					} else {
 						res.Status = "400 Bad Request"
 					}
 				} else {
-					res.Header.Set("Transport", transport+tr)
+					res.Header.Set("Transport", tr)
 				}
 			} else {
 				res.Status = "461 Unsupported transport"