diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js index 1d81275f4..0c9babf38 100755 --- a/trunk/research/players/js/srs.page.js +++ b/trunk/research/players/js/srs.page.js @@ -18,13 +18,6 @@ function srs_get_player_vhost() { return "players"; } function srs_get_api_server_port() { return 8085; } // the srs http server port function srs_get_srs_http_server_port() { return 8080; } -// get the stream published to vhost, -// generally we need to transcode the stream to support HLS and filters. -// for example, src_vhost is "players", we transcode stream to vhost "players_pub". -// if not equals to the player vhost, return the orignal vhost. -function srs_get_player_publish_vhost(src_vhost) { return (src_vhost != srs_get_player_vhost())? src_vhost:(src_vhost + "_pub"); } -// for chat, use rtmp only vhost, low latecy, without gop cache. -function srs_get_player_chat_vhost(src_vhost) { return (src_vhost != srs_get_player_vhost())? src_vhost:(src_vhost + "_chat"); } ////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////// @@ -108,7 +101,7 @@ function build_default_publish_rtmp_url() { var queries = []; if (server != vhost && vhost != "__defaultVhost__") { - queries.push("vhost=" + srs_get_player_chat_vhost(vhost)); + queries.push("vhost=" + vhost); } if (query.shp_identify) { queries.push("shp_identify=" + query.shp_identify); diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html index 1da264975..c4fb72789 100644 --- a/trunk/research/players/srs_publisher.html +++ b/trunk/research/players/srs_publisher.html @@ -1,17 +1,20 @@ - SRS + SRS - +
@@ -31,509 +34,35 @@
-
-
- -

Usage:

 -

- 请点击下面的图标，启用Flash -

-

- 若没有见到这个图标，Chrome浏览器请打开 - chrome://settings/content/flash 并修改为"Ask first"。 -

-
-
-
+ +
+ + Warning: + + Flash推流已经很少用，建议用OBS或FFMPEG推流， + 如果一定要使用Flash推流请点这里。 +
- -
-
- - Usage: - 设置编码参数，点“发布视频”，允许Flash访问摄像头即可推流 -
-
-
- - -
-
-
-
- 发布地址: - - - -
-
-
-
- 播放地址 - 1.RTMP低延时(请发布视频) - 2.RTMP已转码(请发布视频) - 3.HLS-m3u8(请发布视频) - 4.HLS-JWPlayer(请发布视频) -
-
- - -
-
-
-
-
- - 本地摄像头 - -
-
-
-
-
-
-
-
-
-
-
- - 远程服务器 - - 黑屏 - - - 播放地址 - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - 远程服务器 - - 低延时 - - - 播放地址 - - -
-
-
-
-
-
-
-
-
-
-
-
-
- +
- - - - - - - - - diff --git a/trunk/research/players/srs_publisher2.html b/trunk/research/players/srs_publisher2.html new file mode 100644 index 000000000..aa9bdb011 --- /dev/null +++ b/trunk/research/players/srs_publisher2.html @@ -0,0 +1,473 @@ + + + + SRS + + + + + + +
+
+
+ SRS +
+ +
+
+
+
+
+
+
+ +

Usage:

 +

+ 请点击下面的图标，启用Flash +

+

+ 若没有见到这个图标，Chrome浏览器请打开 + chrome://settings/content/flash 并修改为"Ask first"。 +

+
+
+
+
+ +
+
+ + Remark: + Flash推流只支持H.264+Speex，音频不支持AAC，所以无法输出HLS +
+
+ + Usage: + 设置编码参数，点“发布视频”，允许Flash访问摄像头即可推流 +
+
+
+ + +
+
+
+
+ 发布地址: + + + + RTMP播放地址(请发布视频) +
+
+ + +
+
+
+
+
+ + 本地摄像头 + +
+
+
+
+
+
+
+
+
+
+
+ + 远程服务器 + + 低延时 + + + 播放地址 + + +
+
+
+
+
+
+
+
+
+
+
+ + +
+ + + + + + + + + + + + + + +