Player: Refine code

trunk/research/players/index.html

@@ -20,16 +20,19 @@
             update_nav();
 
             var query = parse_query_string();
-            var url = "srs_player.html?vhost=" + srs_get_player_vhost();
+            var params = [];
-
             for (var key in query.user_query) {
-                if (key == "vhost") {
+                params.push(key + "=" + query[key]);
-                    continue;
-                }
-                url += "&" + key + "=" + query[key];
             }
 
-            window.location.href = url;
+            var url = "srs_player.html";
+            if (params.length) {
+                url += '?' + params.join('&');
+            }
+
+            setTimeout(function () {
+                window.location.href = url;
+            }, 0);
         });
     </script>
 </head>

trunk/research/players/js/srs.page.js

@@ -12,13 +12,6 @@ function srs_get_player_modal() { return 740; }
 function srs_get_player_width() { return srs_get_player_modal() - 30; }
 function srs_get_player_height() { return srs_get_player_width() * 9 / 19; }
 
-// get the default vhost for players.
-function srs_get_player_vhost() { return "players"; }
-// the api server port, for chat room.
-function srs_get_api_server_port() { return 8085; }
-// the srs http server port
-function srs_get_srs_http_server_port() { return 8080; }
-
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
@@ -40,17 +33,6 @@ function update_nav() {
 // Special extra params, such as auth_key.
 function user_extra_params(query, params) {
     var queries = params || [];
-    var server = (query.server == undefined)? window.location.hostname:query.server;
-    var vhost = (query.vhost == undefined)? window.location.hostname:query.vhost;
-
-    // Note that ossrs.net provides only web service,
-    // that is migrating to r.ossrs.net
-    if (vhost == "ossrs.net") {
-        vhost = "r.ossrs.net";
-    }
-    if (server == "ossrs.net") {
-        server = "r.ossrs.net";
-    }
 
     for (var key in query.user_query) {
         if (key === 'app' || key === 'autostart' || key === 'dir'
@@ -70,6 +52,13 @@ function user_extra_params(query, params) {
     return queries;
 }
 
+function is_default_port(schema, port) {
+    return (schema === 'http' && port === 80)
+        || (schema === 'https' && port === 443)
+        || (schema === 'webrtc' && port === 1985)
+        || (schema === 'rtmp' && port === 1935);
+}
+
 /**
 @param server the ip of server. default to window.location.hostname
 @param vhost the vhost of rtmp. default to window.location.hostname
@@ -82,63 +71,23 @@ function build_default_rtmp_url() {
 
     var schema = (!query.schema)? "rtmp":query.schema;
     var server = (!query.server)? window.location.hostname:query.server;
-    var port = (!query.port)? schema=="http"?80:1935:query.port;
+    var port = (!query.port)? (schema==="http"? 80:1935) : Number(query.port);
     var vhost = (!query.vhost)? window.location.hostname:query.vhost;
     var app = (!query.app)? "live":query.app;
     var stream = (!query.stream)? "livestream":query.stream;
 
-    // Note that ossrs.net provides only web service,
-    // that is migrating to r.ossrs.net
-    if (vhost == "ossrs.net") {
-        vhost = "r.ossrs.net";
-    }
-    if (server == "ossrs.net") {
-        server = "r.ossrs.net";
-    }
-
     var queries = [];
-    if (server != vhost && vhost != "__defaultVhost__") {
+    if (server !== vhost && vhost !== "__defaultVhost__") {
         queries.push("vhost=" + vhost);
     }
     queries = user_extra_params(query, queries);
 
-    var uri = schema + "://" + server + ":" + port + "/" + app + "/" + stream + "?" + queries.join('&');
+    var uri = schema + "://" + server;
-    while (uri.indexOf("?") == uri.length - 1) {
+    if (!is_default_port(schema, port)) {
-        uri = uri.substr(0, uri.length - 1);
+        uri += ":" + port;
     }
-
+    uri += "/" + app + "/" + stream + "?" + queries.join('&');
-    return uri;
+    while (uri.indexOf("?") === uri.length - 1) {
-}
-// for the chat to init the publish url.
-function build_default_publish_rtmp_url() {
-    var query = parse_query_string();
-
-    var schema = (!query.schema)? "rtmp":query.schema;
-    var server = (!query.server)? window.location.hostname:query.server;
-    var port = (!query.port)? schema=="http"?80:1935:query.port;
-    var vhost = (!query.vhost)? window.location.hostname:query.vhost;
-    var app = (!query.app)? "live":query.app;
-    var stream = (!query.stream)? "demo":query.stream;
-
-    // Note that ossrs.net provides only web service,
-    // that is migrating to r.ossrs.net
-    if (vhost == "ossrs.net") {
-        vhost = "r.ossrs.net";
-    }
-    if (server == "ossrs.net") {
-        server = "r.ossrs.net";
-    }
-
-    var queries = [];
-    if (server != vhost && vhost != "__defaultVhost__") {
-        queries.push("vhost=" + vhost);
-    }
-    if (query.shp_identify) {
-        queries.push("shp_identify=" + query.shp_identify);
-    }
-
-    var uri = schema + "://" + server + ":" + port + "/" + app + "/" + stream + "?" + queries.join('&');
-    while (uri.indexOf("?") == uri.length - 1) {
         uri = uri.substr(0, uri.length - 1);
     }
 
@@ -148,61 +97,20 @@ function build_default_publish_rtmp_url() {
 function build_default_bandwidth_rtmp_url() {
     var query = parse_query_string();
 
+    var schema = 'rtmp';
     var server = (!query.server)? window.location.hostname:query.server;
     var port = (!query.port)? 1935:query.port;
     var vhost = "bandcheck.srs.com";
     var app = (!query.app)? "app":query.app;
     var key = (!query.key)? "35c9b402c12a7246868752e2878f7e0e":query.key;
 
-    // Note that ossrs.net provides only web service,
+    var uri = schema + "://" + server;
-    // that is migrating to r.ossrs.net
+    if (!is_default_port(schema, port)) {
-    if (vhost == "ossrs.net") {
+        uri += ":" + port;
-        vhost = "r.ossrs.net";
-    }
-    if (server == "ossrs.net") {
-        server = "r.ossrs.net";
     }
+    uri += "/" + app + "?key=" + key + "&vhost=" + vhost;
 
-    return "rtmp://" + server + ":" + port + "/" + app + "?key=" + key + "&vhost=" + vhost;
+    return uri;
-}
-
-/**
-@param server the ip of server. default to window.location.hostname
-@param vhost the vhost of hls. default to window.location.hostname
-@param hls_vhost the vhost of hls. override the server if specified.
-@param hls_port the port of hls. default to window.location.port
-@param app the app of hls. default to live.
-@param stream the stream of hls. default to livestream.
-*/
-function build_default_hls_url() {
-    var query = parse_query_string();
-
-    // Note that ossrs.net provides only web service,
-    // that is migrating to r.ossrs.net
-    if (query.hls_vhost == "ossrs.net") {
-        query.hls_vhost = "r.ossrs.net";
-    }
-
-    // for http, use hls_vhost to override server if specified.
-    var server = window.location.hostname;
-    if (query.server != undefined) {
-        server = query.server;
-    } else if (query.hls_vhost != undefined) {
-        server = query.hls_vhost;
-    }
-    
-    var port = (!query.hls_port)? window.location.port:query.hls_port;
-    var app = (!query.app)? "live":query.app;
-    var stream = (!query.stream)? "demo":query.stream;
-
-    if (!port) {
-        port = 8080;
-    }
-    
-    if (stream.indexOf(".flv") >= 0) {
-        return "http://" + server + ":" + port + "/" + app + "/" + stream;
-    }
-    return "http://" + server + ":" + port + "/" + app + "/" + stream + ".m3u8";
 }
 
 function build_default_rtc_url(query) {
@@ -220,23 +128,17 @@ function build_default_rtc_url(query) {
     var stream = (!query.stream)? "livestream":query.stream;
     var api = query.api? ':'+query.api : '';
 
-    // Note that ossrs.net provides only web service,
-    // that is migrating to r.ossrs.net
-    if (vhost == "ossrs.net") {
-        vhost = "r.ossrs.net";
-    }
-    if (server == "ossrs.net") {
-        server = "r.ossrs.net";
-    }
-
     var queries = [];
-    if (server != vhost && vhost != "__defaultVhost__") {
+    if (server !== vhost && vhost !== "__defaultVhost__") {
         queries.push("vhost=" + vhost);
     }
+    if (query.schema && window.location.protocol !== query.schema + ':') {
+        queries.push('schema=' + query.schema);
+    }
     queries = user_extra_params(query, queries);
 
     var uri = "webrtc://" + server + api + "/" + app + "/" + stream + "?" + queries.join('&');
-    while (uri.lastIndexOf("?") == uri.length - 1) {
+    while (uri.lastIndexOf("?") === uri.length - 1) {
         uri = uri.substr(0, uri.length - 1);
     }
 
@@ -250,36 +152,18 @@ function build_default_rtc_url(query) {
 * @param modal_player the div id contains the modal player
 */
 function srs_init_rtmp(rtmp_url, modal_player) {
-    srs_init(rtmp_url, null, modal_player);
-}
-function srs_init_hls(hls_url, modal_player) {
-    srs_init(null, hls_url, modal_player);
-}
-function srs_init_rtc(id, query) {
     update_nav();
-    $(id).val(build_default_rtc_url(query));
-}
-function srs_init(rtmp_url, hls_url, modal_player) {
-    update_nav();
-
     if (rtmp_url) {
         $(rtmp_url).val(build_default_rtmp_url());
     }
-    if (hls_url) {
-        $(hls_url).val(build_default_hls_url());
-    }
     if (modal_player) {
         $(modal_player).width(srs_get_player_modal() + "px");
         $(modal_player).css("margin-left", "-" + srs_get_player_modal() / 2 +"px");
     }
 }
-// for the chat to init the publish url.
+function srs_init_rtc(id, query) {
-function srs_init_publish(rtmp_url) {
     update_nav();
-    
+    $(id).val(build_default_rtc_url(query));
-    if (rtmp_url) {
-        $(rtmp_url).val(build_default_publish_rtmp_url());
-    }
 }
 // for bw to init url
 // url: scheme://host:port/path?query#fragment

trunk/research/players/js/winlin.utility.js

@@ -5,7 +5,7 @@
  * depends: jquery1.10
  * https://gitee.com/winlinvip/codes/rpn0c2ewbomj81augzk4y59
  * @see: http://blog.csdn.net/win_lin/article/details/17994347
- * v 1.0.21
+ * v 1.0.22
  */
 
 /**
@@ -236,9 +236,9 @@ function parse_query_string(){
 
     // parse the query string.
     var query_string = String(window.location.search).replace(" ", "").split("?")[1];
-    if(query_string == undefined){
+    if(query_string === undefined){
         query_string = String(window.location.hash).replace(" ", "").split("#")[1];
-        if(query_string == undefined){
+        if(query_string === undefined){
             return obj;
         }
     }
@@ -252,7 +252,7 @@ function __fill_query(query_string, obj) {
     // pure user query object.
     obj.user_query = {};
 
-    if (query_string.length == 0) {
+    if (query_string.length === 0) {
         return;
     }
 
@@ -317,7 +317,7 @@ function parse_rtmp_url(rtmp_url) {
 
     // when vhost equals to server, and server is ip,
     // the vhost is __defaultVhost__
-    if (a.hostname == vhost) {
+    if (a.hostname === vhost) {
         var re = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
         if (re.test(a.hostname)) {
             vhost = "__defaultVhost__";
@@ -338,8 +338,6 @@ function parse_rtmp_url(rtmp_url) {
             port = 443;
         } else if (schema === 'rtmp') {
             port = 1935;
-        } else if (schema === 'webrtc' || schema === 'rtc') {
-            port = (window.location.href.indexOf('https://')==0)? 443:1985;
         }
     }
 
@@ -351,6 +349,19 @@ function parse_rtmp_url(rtmp_url) {
     };
     __fill_query(a.search, ret);
 
+    // For webrtc API, we use 443 if page is https, or schema specified it.
+    if (!ret.port) {
+        if (schema === 'webrtc' || schema === 'rtc') {
+            if (ret.user_query.schema === 'https') {
+                ret.port = 443;
+            } else if (window.location.href.indexOf('https://') === 0) {
+                ret.port = 443;
+            } else {
+                ret.port = 80;
+            }
+        }
+    }
+
     return ret;
 }
 

trunk/research/players/rtc_player.html

@@ -244,8 +244,15 @@
 
             if (true) {
                 var urlObject = parse_rtmp_url($("#txt_url").val());
-                var schema = window.location.protocol;
+
+                // If user specifies the schema, use it as API schema.
+                var schema = urlObject.user_query.schema;
+                schema = schema? schema + ':' : window.location.protocol;
+
                 var port = urlObject.port || 1985;
+                if (schema === 'https:') {
+                    port = urlObject.port || 443;
+                }
 
                 // @see https://github.com/rtcdn/rtcdn-draft
                 var api = urlObject.user_query.play || '/rtc/v1/play/';

trunk/research/players/srs_player.html

@@ -539,20 +539,21 @@
 
         var apply_url_change = function() {
             var rtmp = parse_rtmp_url($("#txt_url").val());
-            var url = "http://" + query.host + query.pathname + "?"
+            var schema = window.location.protocol;
+            var url = schema + "//" + query.host + query.pathname + "?"
                 + "app=" + rtmp.app + "&stream=" + rtmp.stream
                 + "&server=" + rtmp.server + "&port=" + rtmp.port
                 + "&autostart=true";
             if (query.shp_identify) {
                 url += "&shp_identify=" + query.shp_identify;
             }
-            if (rtmp.vhost == "__defaultVhost__") {
+            if (rtmp.vhost === "__defaultVhost__") {
                 url += "&vhost=" + rtmp.server;
             } else {
                 url += "&vhost=" + rtmp.vhost;
             }
-            if (rtmp.schema == "http") {
+            if (rtmp.schema !== "rtmp") {
-                url += "&schema=http";
+                url += "&schema=" + rtmp.schema;
             }
             if (query.buffer) {
                 url += "&buffer=" + query.buffer;