external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

Merge pull request #483 from CallMeNP/patch-1

Browse source 
为research/players/srs_player 考虑静态资源部署到单独域名的情况
This commit is contained in:
winlin 2015-09-17 17:48:33 +08:00
commit 8c2c5984fb
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
trunk/research/players/js/srs.player.js
View file

@ -25,6 +25,7 @@ function SrsPlayer(container, width, height, private_object) {
this.buffer_time = 0.3; // default to 0.3 this.buffer_time = 0.3; // default to 0.3
this.volume = 1.0; // default to 100% this.volume = 1.0; // default to 100%
this.callbackObj = null; this.callbackObj = null;
this.srs_player_url = "srs_player/release/srs_player.swf?_version="+srs_get_version_code();
// callback set the following values. // callback set the following values.
this.meatadata = {}; // for on_player_metadata this.meatadata = {}; // for on_player_metadata
@ -88,7 +89,7 @@ SrsPlayer.prototype.start = function(url) {
var self = this; var self = this;
swfobject.embedSWF( swfobject.embedSWF(
"srs_player/release/srs_player.swf?_version="+srs_get_version_code(), this.srs_player_url,
this.container, this.container,
this.width, this.height, this.width, this.height,
"11.1.0", "js/AdobeFlashPlayerInstall.swf", "11.1.0", "js/AdobeFlashPlayerInstall.swf",
@ -183,6 +184,25 @@ SrsPlayer.prototype.set_bt = function(buffer_time) {
this.buffer_time = buffer_time; this.buffer_time = buffer_time;
this.callbackObj.ref.__set_bt(buffer_time); this.callbackObj.ref.__set_bt(buffer_time);
} }
/**
* set the srs_player.swf url
* @param url, srs_player.swf's url.
* @param params, object.
*/
SrsPlayer.prototype.set_srs_player_url = function(url, params) {
var query_array = [],
query_string = "",
p;
params = params || {};
params._version = srs_get_version_code();
for (p in params) {
if (params.hasOwnProperty(p)) {
query_array.push(p + "=" + encodeURIComponent(params[p]));
}
}
query_string = query_array.join("&");
this.srs_player_url = url + "?" + query_string;
}
SrsPlayer.prototype.on_player_ready = function() { SrsPlayer.prototype.on_player_ready = function() {
} }
SrsPlayer.prototype.on_player_metadata = function(metadata) { SrsPlayer.prototype.on_player_metadata = function(metadata) {

2
trunk/research/players/srs_player/src/srs_player.as
View file

@ -79,6 +79,8 @@ package
this.stage.addEventListener(FullScreenEvent.FULL_SCREEN, this.user_on_stage_fullscreen); this.stage.addEventListener(FullScreenEvent.FULL_SCREEN, this.user_on_stage_fullscreen);
Security.allowDomain("*");
this.addChild(this.control_fs_mask); this.addChild(this.control_fs_mask);
this.control_fs_mask.buttonMode = true; this.control_fs_mask.buttonMode = true;
this.control_fs_mask.addEventListener(MouseEvent.CLICK, user_on_click_video); this.control_fs_mask.addEventListener(MouseEvent.CLICK, user_on_click_video);