Merge branch 'master' of https://github.com/EasyDarwin/EasyDarwin

binstreamio · Jan 22, 2019 · 21f4cde · 21f4cde
2 parents 223d53a + 7e152bc
commit 21f4cde
Show file tree

Hide file tree

Showing 135 changed files with 17,758 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,5 @@ node_modules
 .idea
 easydarwin_debug.ini
 .DS_Store
-/www/*
 Unnamed
 dev.ini
diff --git a/rtsp/rtsp-client.go b/rtsp/rtsp-client.go
@@ -282,7 +282,7 @@ func (client *RTSPClient) requestStream(timeout time.Duration) (err error) {
 					client.logger.Printf("Setup video err.%v", err)
 					return err
 				}
-				headers["Transport"] = fmt.Sprintf("RTP/AVP/TCP;unicast;client_port=%d-%d", client.UDPServer.VPort, client.UDPServer.VControlPort)
+				headers["Transport"] = fmt.Sprintf("RTP/AVP/UDP;unicast;client_port=%d-%d", client.UDPServer.VPort, client.UDPServer.VControlPort)
 				client.Conn.timeout = 0 //	UDP ignore timeout
 			}
 			if session != "" {
@@ -315,7 +315,7 @@ func (client *RTSPClient) requestStream(timeout time.Duration) (err error) {
 					client.logger.Printf("Setup audio err.%v", err)
 					return err
 				}
-				headers["Transport"] = fmt.Sprintf("RTP/AVP/TCP;unicast;client_port=%d-%d", client.UDPServer.APort, client.UDPServer.AControlPort)
+				headers["Transport"] = fmt.Sprintf("RTP/AVP/UDP;unicast;client_port=%d-%d", client.UDPServer.APort, client.UDPServer.AControlPort)
 				client.Conn.timeout = 0 //	UDP ignore timeout
 			}
 			if session != "" {

diff --git a/www/apidoc/api_project.js b/www/apidoc/api_project.js
@@ -25,8 +25,8 @@ define({
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2019-01-06T13:09:09.474Z",
+    "time": "2019-01-13T08:33:51.329Z",
     "url": "http://apidocjs.com",
-    "version": "0.17.6"
+    "version": "0.17.7"
   }
 });
diff --git a/www/apidoc/api_project.json b/www/apidoc/api_project.json
@@ -25,8 +25,8 @@
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2019-01-06T13:09:09.474Z",
+    "time": "2019-01-13T08:33:51.329Z",
     "url": "http://apidocjs.com",
-    "version": "0.17.6"
+    "version": "0.17.7"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,5 @@ node_modules @@
     .idea
     easydarwin_debug.ini
     .DS_Store
-    /www/*
     Unnamed
     dev.ini