Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-05-10 14:01:40 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
1c1efd700062ab34af1e77841d7284aa06689e87
1c1efd70
1 parent
e3e779b9
update readme, update api server stream list
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
9 行增加
和
6 行删除
README.md
trunk/research/api-server/server.py
README.md
查看文件 @
1c1efd7
...
...
@@ -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
)
<br/>
中文资料(Wiki):
[
https://github.com/winlinvip/simple-rtmp-server/wiki
](
https://github.com/winlinvip/simple-rtmp-server/wiki
)
<br/>
产品对比(Wiki):
[
https://github.com/winlinvip/simple-rtmp-server/wiki/Compare
](
https://github.com/winlinvip/simple-rtmp-server/wiki/Compare
)
<br/>
使用步骤(Usage):
[
https://github.com/winlinvip/simple-rtmp-server#usage
](
#usage
)
<br/>
功能摘要(Summary):
[
https://github.com/winlinvip/simple-rtmp-server#summary
](
#summary
)
<br/>
关于SRS(About):
[
https://github.com/winlinvip/simple-rtmp-server#about
](
#about
)
<br/>
...
...
trunk/research/api-server/server.py
查看文件 @
1c1efd7
...
...
@@ -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"
}
}})
...
...
请
注册
或
登录
后发表评论