From 33c7f6d0e4f77c1cb8f6bd726c657edd9855fa98 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 18 Dec 2019 09:16:56 +0800 Subject: [PATCH 01/27] Temporarily disable chat demo page. --- trunk/research/players/srs_chat.html | 748 +-------------------------- 1 file changed, 6 insertions(+), 742 deletions(-) diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html index fc4c9f450..c89c2585d 100644 --- a/trunk/research/players/srs_chat.html +++ b/trunk/research/players/srs_chat.html @@ -35,215 +35,13 @@
-
+
- Usage: - 输入名字，设点“加入会议”按钮 -
- -
-
- - - - - -
-
- - - - - - -
-
-
- - [我的] 本地摄像头 - -
-
-
-
-
-
-
- 		-
-
- - [我的] 远程服务器流 - - 播放地址 - - -
-
-
-
-
-
-
-
-
-
-
- - [XX] - 加入时间[] - - 播放地址 - - -
-
-
-
-
-
-
-
-
-
-
- -
- -
@@ -253,539 +51,5 @@ - - - - - - - - - From b0afc00733490375970ab34210b09f4d45c58f14 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 18 Dec 2019 11:06:01 +0800 Subject: [PATCH 02/27] Detect whether flash enabled for srs-player. 3.0.73 --- README.md | 1 + trunk/research/players/js/srs.page.js | 2 +- trunk/research/players/js/srs.player.js | 3 + trunk/research/players/srs_player.html | 595 ++++++++++-------------- trunk/src/core/srs_core.hpp | 2 +- 5 files changed, 250 insertions(+), 353 deletions(-) diff --git a/README.md b/README.md index 7ceea8d6f..a06dda986 100755 --- a/README.md +++ b/README.md @@ -145,6 +145,7 @@ For previous versions, please read: ## V3 changes +* v3.0, 2019-12-18, Detect whether flash enabled for srs-player. 3.0.73 * v3.0, 2019-12-17, Fix HTTP CORS bug when sending response for OPTIONS. 3.0.72 * v3.0, 2019-12-17, Enhance HTTP response write for final_request. * v3.0, 2019-12-17, Refactor HTTP stream to disconnect client when unpublish. diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js index 6a3132741..dee353e7b 100755 --- a/trunk/research/players/js/srs.page.js +++ b/trunk/research/players/js/srs.page.js @@ -80,7 +80,7 @@ function build_default_rtmp_url() { var port = (query.port == undefined)? schema=="http"?80:1935:query.port; var vhost = (query.vhost == undefined)? window.location.hostname:query.vhost; var app = (query.app == undefined)? "live":query.app; - var stream = (query.stream == undefined)? "demo":query.stream; + var stream = (query.stream == undefined)? "livestream":query.stream; var queries = []; if (server != vhost && vhost != "__defaultVhost__") { diff --git a/trunk/research/players/js/srs.player.js b/trunk/research/players/js/srs.player.js index 356b61abd..eba57f06e 100755 --- a/trunk/research/players/js/srs.player.js +++ b/trunk/research/players/js/srs.player.js @@ -118,6 +118,9 @@ SrsPlayer.prototype.start = function(url) { flashvars, params, attributes, function(callbackObj){ self.callbackObj = callbackObj; + if (!callbackObj.success) { + console.error('Initialize player failed:'); console.error(callbackObj); + } } ); diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html index 5ff31b882..65a90c7b8 100755 --- a/trunk/research/players/srs_player.html +++ b/trunk/research/players/srs_player.html @@ -45,369 +45,220 @@
-
- - Usage: 输入RTMP/HTTP地址后点击“播放视频”即可播放视频 -
-
- URL: - - - -
-