winlin

merge from srs2

@@ -26,6 +26,7 @@ function SrsPlayer(container, width, height, private_object) { @@ -26,6 +26,7 @@ function SrsPlayer(container, width, height, private_object) {
26 this.max_buffer_time = this.buffer_time * 3; // default to 3 x bufferTime. 26 this.max_buffer_time = this.buffer_time * 3; // default to 3 x bufferTime.
27 this.volume = 1.0; // default to 100% 27 this.volume = 1.0; // default to 100%
28 this.callbackObj = null; 28 this.callbackObj = null;
  29 + this.srs_player_url = "srs_player/release/srs_player.swf?_version="+srs_get_version_code();
29 30
30 // callback set the following values. 31 // callback set the following values.
31 this.meatadata = {}; // for on_player_metadata 32 this.meatadata = {}; // for on_player_metadata
@@ -89,7 +90,7 @@ SrsPlayer.prototype.start = function(url) { @@ -89,7 +90,7 @@ SrsPlayer.prototype.start = function(url) {
89 var self = this; 90 var self = this;
90 91
91 swfobject.embedSWF( 92 swfobject.embedSWF(
92 - "srs_player/release/srs_player.swf?_version="+srs_get_version_code(), 93 + this.srs_player_url,
93 this.container, 94 this.container,
94 this.width, this.height, 95 this.width, this.height,
95 "11.1.0", "js/AdobeFlashPlayerInstall.swf", 96 "11.1.0", "js/AdobeFlashPlayerInstall.swf",
@@ -219,6 +220,25 @@ SrsPlayer.prototype.set_mbt = function(max_buffer_time) { @@ -219,6 +220,25 @@ SrsPlayer.prototype.set_mbt = function(max_buffer_time) {
219 this.callbackObj.ref.__set_mbt(max_buffer_time); 220 this.callbackObj.ref.__set_mbt(max_buffer_time);
220 } 221 }
221 /** 222 /**
  223 + * set the srs_player.swf url
  224 + * @param url, srs_player.swf's url.
  225 + * @param params, object.
  226 + */
  227 + SrsPlayer.prototype.set_srs_player_url = function(url, params) {
  228 + var query_array = [],
  229 + query_string = "",
  230 + p;
  231 + params = params || {};
  232 + params._version = srs_get_version_code();
  233 + for (p in params) {
  234 + if (params.hasOwnProperty(p)) {
  235 + query_array.push(p + "=" + encodeURIComponent(params[p]));
  236 + }
  237 + }
  238 + query_string = query_array.join("&");
  239 + this.srs_player_url = url + "?" + query_string;
  240 +}
  241 + /**
222 * the callback when player is ready. 242 * the callback when player is ready.
223 */ 243 */
224 SrsPlayer.prototype.on_player_ready = function() { 244 SrsPlayer.prototype.on_player_ready = function() {
@@ -79,6 +79,8 @@ package @@ -79,6 +79,8 @@ package
79 79
80 this.stage.addEventListener(FullScreenEvent.FULL_SCREEN, this.user_on_stage_fullscreen); 80 this.stage.addEventListener(FullScreenEvent.FULL_SCREEN, this.user_on_stage_fullscreen);
81 81
  82 + Security.allowDomain("*");
  83 +
82 this.addChild(this.control_fs_mask); 84 this.addChild(this.control_fs_mask);
83 this.control_fs_mask.buttonMode = true; 85 this.control_fs_mask.buttonMode = true;
84 this.control_fs_mask.addEventListener(MouseEvent.CLICK, user_on_click_video); 86 this.control_fs_mask.addEventListener(MouseEvent.CLICK, user_on_click_video);