From add64533e30ee6e3f6fbeedf5aeb94bfb2f366d9 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 12 May 2014 10:36:37 +0800 Subject: [PATCH] add donation user chen.chen --- DONATIONS.txt | 1 + trunk/research/api-server/server.py | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/DONATIONS.txt b/DONATIONS.txt index 997d09689..452057b92 100644 --- a/DONATIONS.txt +++ b/DONATIONS.txt @@ -3,3 +3,4 @@ Donations ordered by first donation. * [2014-04-25 13:21] 刘连响 刘连响 * [2014-04-25 13:25] 张瑞圣 大圣(5839109) * [2014-04-25 13:31] 郭强 寒一冰(63395865) +* [2014-05-12 10:22] 陈晨 陈晨 diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py index 414b8ea72..efce3b2e9 100755 --- a/trunk/research/api-server/server.py +++ b/trunk/research/api-server/server.py @@ -594,6 +594,16 @@ class RESTServers(object): "transformers": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=hls&device_id=chnvideo-sales-hiwifi&stream=live/transformers" } } + }, + "cubieboard": { + "meiyi": { + "rtmp": { + "livesteam": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=rtmp&device_id=chnvideo-meiyi-cubieboard&stream=live/livestream" + }, + "hls": { + "livesteam": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=hls&device_id=chnvideo-meiyi-cubieboard&stream=live/livestream" + } + } } } }})