external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Migrating streaming service from ossrs.net to r.ossrs.net

Browse source
This commit is contained in:
winlin 2020-02-14 21:57:02 +08:00
parent 21c2cb6512
commit 23324cde31
1 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
trunk/research/players/js/srs.page.js
View file

@ -43,6 +43,12 @@ function user_extra_params(query, params) {
var server = (query.server == undefined)? window.location.hostname:query.server; var server = (query.server == undefined)? window.location.hostname:query.server;
var vhost = (query.vhost == undefined)? window.location.hostname:query.vhost; 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";
}
for (var key in query.user_query) { for (var key in query.user_query) {
if (key == 'app' || key == 'autostart' || key == 'dir' if (key == 'app' || key == 'autostart' || key == 'dir'
|| key == 'filename' || key == 'host' || key == 'hostname' || key == 'filename' || key == 'host' || key == 'hostname'
@ -78,6 +84,12 @@ function build_default_rtmp_url() {
var app = (!query.app)? "live":query.app; var app = (!query.app)? "live":query.app;
var stream = (!query.stream)? "livestream":query.stream; 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";
}
var queries = []; var queries = [];
if (server != vhost && vhost != "__defaultVhost__") { if (server != vhost && vhost != "__defaultVhost__") {
queries.push("vhost=" + vhost); queries.push("vhost=" + vhost);
@ -102,6 +114,12 @@ function build_default_publish_rtmp_url() {
var app = (!query.app)? "live":query.app; var app = (!query.app)? "live":query.app;
var stream = (!query.stream)? "demo":query.stream; 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";
}
var queries = []; var queries = [];
if (server != vhost && vhost != "__defaultVhost__") { if (server != vhost && vhost != "__defaultVhost__") {
queries.push("vhost=" + vhost); queries.push("vhost=" + vhost);
@ -127,6 +145,12 @@ function build_default_bandwidth_rtmp_url() {
var app = (!query.app)? "app":query.app; var app = (!query.app)? "app":query.app;
var key = (!query.key)? "35c9b402c12a7246868752e2878f7e0e":query.key; var key = (!query.key)? "35c9b402c12a7246868752e2878f7e0e":query.key;
// Note that ossrs.net provides only web service,
// that is migrating to r.ossrs.net
if (vhost == "ossrs.net") {
vhost = "r.ossrs.net";
}
return "rtmp://" + server + ":" + port + "/" + app + "?key=" + key + "&vhost=" + vhost; return "rtmp://" + server + ":" + port + "/" + app + "?key=" + key + "&vhost=" + vhost;
} }
@ -141,6 +165,12 @@ function build_default_bandwidth_rtmp_url() {
function build_default_hls_url() { function build_default_hls_url() {
var query = parse_query_string(); 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. // for http, use hls_vhost to override server if specified.
var server = window.location.hostname; var server = window.location.hostname;
if (query.server != undefined) { if (query.server != undefined) {