update server, add rtmp pc url

winlin
Commit 9ef7a834156c56a630fd59735694e938e966e320 9ef7a834 1 parent f5ff9c72
trunk/research/api-server/server.py
--- a/trunk/research/api-server/server.py
查看文件 @9ef7a83
+++ b/trunk/research/api-server/server.py
查看文件 @9ef7a83
@@ -376,6 +376,8 @@ class RESTServers(object):
         elif id == "ingest" or id == "pi":
             if action == "play":
                 url = "http://%s:8080/%s.html"%(self.__server_ip, stream)
+            elif action == "rtmp":
+                url = "../../players/srs_player.html?server=%s&vhost=%s&app=%s&stream=%s&autostart=true"%(self.__server_ip, self.__server_ip, stream.split("/")[0], stream.split("/")[1])
             else:
                 url = "http://%s:8080/api/v1/versions"%(self.__server_ip)
         # others, default.
@@ -579,6 +581,7 @@ class V1(object):
                     "body": "the new raspberry-pi server ip."
                 },
                 "GET id=ingest&action=play&stream=live/livestream": "play the ingest HLS stream on raspberry-pi",
+                "GET id=ingest&action=rtmp&stream=live/livestream": "play the ingest RTMP stream on raspberry-pi",
                 "GET id=ingest&action=mgmt": "open the HTTP api url of raspberry-pi",
                 "GET id=meeting": "redirect to local raspberry-pi meeting url(local ignored)",
                 "GET id=meeting&local=false&index=0": "play the first(index=0) meeting HLS stream on demo.chnvideo.com(not local)",