diff --git a/README.md b/README.md index bee514a5f..7f3b1d180 100755 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ git clone https://code.csdn.net/winlinvip/srs-csdn.git 报告问题(BugReport): [https://github.com/winlinvip/simple-rtmp-server/issues/new](https://github.com/winlinvip/simple-rtmp-server/issues/new)
中文资料(Wiki): [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki)
+产品对比(Wiki): [https://github.com/winlinvip/simple-rtmp-server/wiki/Compare](https://github.com/winlinvip/simple-rtmp-server/wiki/Compare)
使用步骤(Usage): [https://github.com/winlinvip/simple-rtmp-server#usage](#usage)
功能摘要(Summary): [https://github.com/winlinvip/simple-rtmp-server#summary](#summary)
关于SRS(About): [https://github.com/winlinvip/simple-rtmp-server#about](#about)
diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py index 0d5c8b18d..414b8ea72 100755 --- a/trunk/research/api-server/server.py +++ b/trunk/research/api-server/server.py @@ -764,12 +764,14 @@ class RESTNodes(object): "edge":server, "client":ip, "peers":self.__json_dump_nodes(peers), "streams": { - "hls-cztv-html": "http://demo.chnvideo.com:8085/api/v1/nodes?type=hls&format=html&origin=demo.chnvideo.com&port=8080&stream=live/rtmp_cztv01-sd", - "hls-cztv-m3u8": "http://demo.chnvideo.com:8085/api/v1/nodes?type=hls&format=m3u8&origin=demo.chnvideo.com&port=8080&stream=live/rtmp_cztv01-sd", - "rtmp-cztv-html": "http://demo.chnvideo.com:8085/api/v1/nodes?type=rtmp&format=html&origin=demo.chnvideo.com&vhost=android&port=1935&stream=live/rtmp_cztv01-sd", - "hls-livestream-html": "http://demo.chnvideo.com:8085/api/v1/nodes?type=hls&format=html&origin=demo.chnvideo.com&port=8080&stream=live/livestream", - "hls-livestream-m3u8": "http://demo.chnvideo.com:8085/api/v1/nodes?type=hls&format=m3u8&origin=demo.chnvideo.com&port=8080&stream=live/livestream", - "rtmp-livestream-html": "http://demo.chnvideo.com:8085/api/v1/nodes?type=rtmp&format=html&origin=demo.chnvideo.com&vhost=demo.srs.com&port=1935&stream=live/livestream", + "cztv": { + "hls": "http://demo.chnvideo.com:8085/api/v1/nodes?type=hls&format=html&origin=demo.chnvideo.com&port=8080&stream=live/rtmp_cztv01-sd", + "rtmp": "http://demo.chnvideo.com:8085/api/v1/nodes?type=rtmp&format=html&origin=demo.chnvideo.com&vhost=android&port=1935&stream=live/rtmp_cztv01-sd" + }, + "livestream": { + "hls": "http://demo.chnvideo.com:8085/api/v1/nodes?type=hls&format=html&origin=demo.chnvideo.com&port=8080&stream=live/livestream", + "rtmp": "http://demo.chnvideo.com:8085/api/v1/nodes?type=rtmp&format=html&origin=demo.chnvideo.com&vhost=demo.srs.com&port=1935&stream=live/livestream" + }, "apk": "http://demo.chnvideo.com/android.srs.apk" } }})