mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]
This commit is contained in:
parent
276b60200f
commit
f8a7db51f2
25 changed files with 2 additions and 278 deletions
|
@ -1,31 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
// for bw to init url
|
||||
// url: scheme://host:port/path?query#fragment
|
||||
function srs_init_bwt(rtmp_url, hls_url) {
|
||||
update_nav();
|
||||
|
||||
if (rtmp_url) {
|
||||
//var query = parse_query_string();
|
||||
var search_filed = String(window.location.search).replace(" ", "").split("?")[1];
|
||||
$(rtmp_url).val("rtmp://" + window.location.host + ":" + 1935 + "/app?" + search_filed);
|
||||
}
|
||||
if (hls_url) {
|
||||
$(hls_url).val(build_default_hls_url());
|
||||
}
|
||||
}
|
||||
|
||||
function srs_bwt_check_url(url) {
|
||||
if (url.indexOf("key") != -1 && url.indexOf("vhost") != -1) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function srs_bwt_build_default_url() {
|
||||
var url_default = "rtmp://" + window.location.host + ":" + 1935 + "/app?key=35c9b402c12a7246868752e2878f7e0e&vhost=bandcheck.srs.com";
|
||||
return url_default;
|
||||
=======
|
||||
/**
|
||||
* the SrsBandwidth object.
|
||||
* @param container the html container id.
|
||||
|
@ -161,5 +133,4 @@ function __srs_on_update_status(id, status) {
|
|||
var bandwidth = __srs_find_bandwidth(id);
|
||||
bandwidth.status = status;
|
||||
bandwidth.on_update_status(status);
|
||||
>>>>>>> upstream/master
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue