胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
821e7e01 1 parent 65a5f4d4

refine the ui buffer effect

内嵌 并排对比
正在显示 4 个修改的文件 包含 261 行增加 和 232 行删除
... ... @@ -234,7 +234,7 @@ SrsPlayer.prototype.on_player_metadata = function(metadata) {
SrsPlayer.prototype.on_player_timer = function(time, buffer_length) {
// ignore.
}
function __srs_on_player_ready(id) {
function __srs_find_player(id) {
for (var i = 0; i < SrsPlayer.__players.length; i++) {
var player = SrsPlayer.__players[i];
... ... @@ -242,49 +242,34 @@ function __srs_on_player_ready(id) {
continue;
}
player.on_player_ready();
return;
return player;
}
throw new Error("player not found. id=" + id);
}
function __srs_on_player_ready(id) {
var player = __srs_find_player(id);
player.on_player_ready();
}
function __srs_on_player_metadata(id, metadata) {
for (var i = 0; i < SrsPlayer.__players.length; i++) {
var player = SrsPlayer.__players[i];
if (player.id != id) {
continue;
}
// user may override the on_player_metadata,
// so set the data before invoke it.
player.metadata = metadata;
player.on_player_metadata(metadata);
return;
}
var player = __srs_find_player(id);
throw new Error("player not found. id=" + id);
// user may override the on_player_metadata,
// so set the data before invoke it.
player.metadata = metadata;
player.on_player_metadata(metadata);
}
function __srs_on_player_timer(id, time, buffer_length) {
for (var i = 0; i < SrsPlayer.__players.length; i++) {
var player = SrsPlayer.__players[i];
if (player.id != id) {
continue;
}
buffer_length = Math.max(0, buffer_length);
buffer_length = Math.min(player.buffer_time, buffer_length);
// user may override the on_player_timer,
// so set the data before invoke it.
player.time = time;
player.buffer_length = buffer_length;
player.on_player_timer(time, buffer_length);
return;
}
var player = __srs_find_player(id);
throw new Error("player not found. id=" + id);
buffer_length = Math.max(0, buffer_length);
buffer_length = Math.min(player.buffer_time, buffer_length);
// user may override the on_player_timer,
// so set the data before invoke it.
player.time = time;
player.buffer_length = buffer_length;
player.on_player_timer(time, buffer_length);
}
... ...
... ... @@ -100,12 +100,16 @@
$("#btn_dar_original").text("视频原始比例" + "(" + metadata.width + ":" + metadata.height + ")");
select_dar("#btn_dar_original", 0, 0);
select_fs_size("#btn_fs_size_screen_100", "screen", 100);
select_buffer_time("#btn_bt_0_8", 0.8);
}
srs_player.on_player_timer = function(time, buffer_length) {
var buffer = buffer_length / srs_player.buffer_time * 100;
$("#pb_buffer").width(Number(buffer).toFixed(1) + "%");
// @remark, hack the default buffer time.
if (!__active_bt && time > 3) {
select_buffer_time("#btn_bt_2", 2);
}
$("#pb_buffer_bg").attr("title",
"缓冲区长度:" + Number(buffer_length).toFixed(1) + "秒("
+ Number(buffer).toFixed(1) + "%)");
... ...
... ... @@ -22,54 +22,60 @@ package
public class srs_player extends Sprite
{
// user set id.
private var id:String = null;
private var js_id:String = null;
// user set callback
private var on_player_ready:String = null;
private var on_player_metadata:String = null;
private var on_player_timer:String = null;
private var js_on_player_ready:String = null;
private var js_on_player_metadata:String = null;
private var js_on_player_timer:String = null;
// play param url.
private var url:String = null;
private var user_url:String = null;
// play param, user set width and height
private var w:int = 0;
private var h:int = 0;
private var user_w:int = 0;
private var user_h:int = 0;
// user set dar den:num
private var dar_num:int = 0;
private var dar_den:int = 0;
private var user_dar_num:int = 0;
private var user_dar_den:int = 0;
// user set fs(fullscreen) refer and percent.
private var fs_refer:String = null;
private var fs_percent:int = 0;
private var user_fs_refer:String = null;
private var user_fs_percent:int = 0;
private var conn:NetConnection = null;
private var stream:NetStream = null;
private var video:Video = null;
private var metadata:Object = {};
private var timer:Timer = new Timer(300);
// media specified.
private var media_conn:NetConnection = null;
private var media_stream:NetStream = null;
private var media_video:Video = null;
private var media_metadata:Object = {};
private var media_timer:Timer = new Timer(300);
// controls.
// flash donot allow js to set to fullscreen,
// only allow user click to enter fullscreen.
private var fs_mask:Sprite = new Sprite();
private var control_fs_mask:Sprite = new Sprite();
public function srs_player()
{
flash.system.Security.allowDomain("*");
if (!this.stage) {
this.addEventListener(Event.ADDED_TO_STAGE, this.onAddToStage);
this.addEventListener(Event.ADDED_TO_STAGE, this.system_on_add_to_stage);
} else {
this.onAddToStage(null);
this.system_on_add_to_stage(null);
}
}
private function onAddToStage(evt:Event):void {
/**
* system event callback, when this control added to stage.
* the main function.
*/
private function system_on_add_to_stage(evt:Event):void {
this.removeEventListener(Event.ADDED_TO_STAGE, this.system_on_add_to_stage);
this.stage.align = StageAlign.TOP_LEFT;
this.stage.scaleMode = StageScaleMode.NO_SCALE;
this.stage.addEventListener(FullScreenEvent.FULL_SCREEN, this.on_stage_fullscreen);
this.stage.addEventListener(FullScreenEvent.FULL_SCREEN, this.user_on_stage_fullscreen);
this.addChild(this.fs_mask);
this.fs_mask.buttonMode = true;
this.fs_mask.addEventListener(MouseEvent.CLICK, on_user_click_video);
this.addChild(this.control_fs_mask);
this.control_fs_mask.buttonMode = true;
this.control_fs_mask.addEventListener(MouseEvent.CLICK, user_on_click_video);
this.contextMenu = new ContextMenu();
this.contextMenu.hideBuiltInItems();
... ... @@ -83,63 +89,132 @@ package
throw new Error("must specifies the on_player_ready");
}
this.id = flashvars.id;
this.on_player_ready = flashvars.on_player_ready;
this.on_player_metadata = flashvars.on_player_metadata;
this.on_player_timer = flashvars.on_player_timer;
this.js_id = flashvars.id;
this.js_on_player_ready = flashvars.on_player_ready;
this.js_on_player_metadata = flashvars.on_player_metadata;
this.js_on_player_timer = flashvars.on_player_timer;
this.media_timer.addEventListener(TimerEvent.TIMER, this.system_on_timer);
this.media_timer.start();
flash.utils.setTimeout(this.system_on_js_ready, 0);
}
/**
* system callack event, when js ready, register callback for js.
* the actual main function.
*/
private function system_on_js_ready():void {
if (!flash.external.ExternalInterface.available) {
trace("js not ready, try later.");
flash.utils.setTimeout(this.system_on_js_ready, 100);
return;
}
this.timer.addEventListener(TimerEvent.TIMER, this.on_timer);
this.timer.start();
flash.external.ExternalInterface.addCallback("__play", this.js_call_play);
flash.external.ExternalInterface.addCallback("__stop", this.js_call_stop);
flash.external.ExternalInterface.addCallback("__pause", this.js_call_pause);
flash.external.ExternalInterface.addCallback("__resume", this.js_call_resume);
flash.external.ExternalInterface.addCallback("__dar", this.js_call_dar);
flash.external.ExternalInterface.addCallback("__set_fs", this.js_call_set_fs_size);
flash.external.ExternalInterface.addCallback("__set_bt", this.js_call_set_bt);
flash.utils.setTimeout(this.on_js_ready, 0);
flash.external.ExternalInterface.call(this.js_on_player_ready, this.js_id);
}
private function on_timer(evt:TimerEvent):void {
if (!this.stream) {
/**
* system callack event, timer to do some regular tasks.
*/
private function system_on_timer(evt:TimerEvent):void {
if (!this.media_stream) {
trace("stream is null, ignore timer event.");
return;
}
trace("notify js the timer event.");
flash.external.ExternalInterface.call(
this.on_player_timer, this.id, this.stream.time, this.stream.bufferLength);
this.js_on_player_timer, this.js_id, this.media_stream.time, this.media_stream.bufferLength);
}
/**
* system callack event, when got metadata from stream.
* or got video dimension change event(the DAR notification), to update the metadata manually.
*/
private function system_on_metadata(metadata:Object):void {
this.media_metadata = metadata;
// for context menu
var customItems:Array = [new ContextMenuItem("SrsPlayer")];
if (metadata.hasOwnProperty("server")) {
customItems.push(new ContextMenuItem("Server: " + metadata.server));
}
if (metadata.hasOwnProperty("contributor")) {
customItems.push(new ContextMenuItem("Contributor: " + metadata.contributor));
}
contextMenu.customItems = customItems;
// for js.
var obj:Object = __get_video_size_object();
obj.server = 'srs';
obj.contributor = 'winlin';
if (metadata.hasOwnProperty("server")) {
obj.server = metadata.server;
}
if (metadata.hasOwnProperty("contributor")) {
obj.contributor = metadata.contributor;
}
var code:int = flash.external.ExternalInterface.call(js_on_player_metadata, js_id, obj);
if (code != 0) {
throw new Error("callback on_player_metadata failed. code=" + code);
}
}
private function on_stage_fullscreen(evt:FullScreenEvent):void {
/**
* player callack event, when user click video to enter or leave fullscreen.
*/
private function user_on_stage_fullscreen(evt:FullScreenEvent):void {
if (!evt.fullScreen) {
execute_user_set_dar();
__execute_user_set_dar();
} else {
execute_user_enter_fullscreen();
__execute_user_enter_fullscreen();
}
}
private function on_js_ready():void {
if (!flash.external.ExternalInterface.available) {
trace("js not ready, try later.");
flash.utils.setTimeout(this.on_js_ready, 100);
/**
* user event callback, js cannot enter the fullscreen mode, user must click to.
*/
private function user_on_click_video(evt:MouseEvent):void {
if (!this.stage.allowsFullScreen) {
trace("donot allow fullscreen.");
return;
}
flash.external.ExternalInterface.addCallback("__play", this.js_call_play);
flash.external.ExternalInterface.addCallback("__stop", this.js_call_stop);
flash.external.ExternalInterface.addCallback("__pause", this.js_call_pause);
flash.external.ExternalInterface.addCallback("__resume", this.js_call_resume);
flash.external.ExternalInterface.addCallback("__dar", this.js_call_dar);
flash.external.ExternalInterface.addCallback("__set_fs", this.js_call_set_fs_size);
flash.external.ExternalInterface.addCallback("__set_bt", this.js_call_set_bt);
flash.external.ExternalInterface.call(this.on_player_ready, this.id);
// enter fullscreen to get the fullscreen size correctly.
if (this.stage.displayState == StageDisplayState.FULL_SCREEN) {
this.stage.displayState = StageDisplayState.NORMAL;
} else {
this.stage.displayState = StageDisplayState.FULL_SCREEN;
}
}
/**
* function for js to call: to pause the stream. ignore if not play.
*/
private function js_call_pause():void {
if (this.stream) {
this.stream.pause();
if (this.media_stream) {
this.media_stream.pause();
}
}
/**
* function for js to call: to resume the stream. ignore if not play.
*/
private function js_call_resume():void {
if (this.stream) {
this.stream.resume();
if (this.media_stream) {
this.media_stream.resume();
}
}
... ... @@ -153,10 +228,10 @@ package
* use user specified width if -1.
*/
private function js_call_dar(num:int, den:int):void {
dar_num = num;
dar_den = den;
user_dar_num = num;
user_dar_den = den;
flash.utils.setTimeout(execute_user_set_dar, 0);
flash.utils.setTimeout(__execute_user_set_dar, 0);
}
/**
... ... @@ -168,24 +243,8 @@ package
* 100 means 100%.
*/
private function js_call_set_fs_size(refer:String, percent:int):void {
fs_refer = refer;
fs_percent = percent;
}
/**
* js cannot enter the fullscreen mode, user must click to.
*/
private function on_user_click_video(evt:MouseEvent):void {
if (!this.stage.allowsFullScreen) {
trace("donot allow fullscreen.");
return;
}
// enter fullscreen to get the fullscreen size correctly.
if (this.stage.displayState == StageDisplayState.FULL_SCREEN) {
this.stage.displayState = StageDisplayState.NORMAL;
} else {
this.stage.displayState = StageDisplayState.FULL_SCREEN;
}
user_fs_refer = refer;
user_fs_percent = percent;
}
/**
... ... @@ -193,50 +252,48 @@ package
* @buffer_time the buffer time in seconds.
*/
private function js_call_set_bt(buffer_time:Number):void {
if (this.stream) {
this.stream.bufferTime = buffer_time;
if (this.media_stream) {
this.media_stream.bufferTime = buffer_time;
}
}
/**
* function for js to call: to stop the stream. ignore if not play.
*/
private function js_call_stop():void {
if (this.stream) {
this.stream.close();
this.stream = null;
if (this.media_stream) {
this.media_stream.close();
this.media_stream = null;
}
if (this.conn) {
this.conn.close();
this.conn = null;
if (this.media_conn) {
this.media_conn.close();
this.media_conn = null;
}
if (this.video) {
this.removeChild(this.video);
this.video = null;
if (this.media_video) {
this.removeChild(this.media_video);
this.media_video = null;
}
}
private function draw_black_background(_width:int, _height:int):void {
// draw black bg.
this.graphics.beginFill(0x00, 1.0);
this.graphics.drawRect(0, 0, _width, _height);
this.graphics.endFill();
// draw the fs mask.
this.fs_mask.graphics.beginFill(0xff0000, 0);
this.fs_mask.graphics.drawRect(0, 0, _width, _height);
this.fs_mask.graphics.endFill();
}
private function js_call_play(url:String, _width:int, _height:int, _buffer_time:Number):void {
this.url = url;
this.w = _width;
this.h = _height;
trace("start to play url: " + this.url + ", w=" + this.w + ", h=" + this.h);
/**
* function for js to call: to play the stream. stop then play.
* @param url, the rtmp/http url to play.
* @param _width, the player width.
* @param _height, the player height.
* @param buffer_time, the buffer time in seconds. recommend to >=0.5
*/
private function js_call_play(url:String, _width:int, _height:int, buffer_time:Number):void {
this.user_url = url;
this.user_w = _width;
this.user_h = _height;
trace("start to play url: " + this.user_url + ", w=" + this.user_w + ", h=" + this.user_h);
js_call_stop();
this.conn = new NetConnection();
this.conn.client = {};
this.conn.client.onBWDone = function():void {};
this.conn.addEventListener(NetStatusEvent.NET_STATUS, function(evt:NetStatusEvent):void {
this.media_conn = new NetConnection();
this.media_conn.client = {};
this.media_conn.client.onBWDone = function():void {};
this.media_conn.addEventListener(NetStatusEvent.NET_STATUS, function(evt:NetStatusEvent):void {
trace ("NetConnection: code=" + evt.info.code);
// TODO: FIXME: failed event.
... ... @@ -244,77 +301,45 @@ package
return;
}
stream = new NetStream(conn);
stream.bufferTime = _buffer_time;
stream.client = {};
stream.client.onMetaData = on_metadata;
stream.addEventListener(NetStatusEvent.NET_STATUS, function(evt:NetStatusEvent):void {
media_stream = new NetStream(media_conn);
media_stream.bufferTime = buffer_time;
media_stream.client = {};
media_stream.client.onMetaData = system_on_metadata;
media_stream.addEventListener(NetStatusEvent.NET_STATUS, function(evt:NetStatusEvent):void {
trace ("NetStream: code=" + evt.info.code);
if (evt.info.code == "NetStream.Video.DimensionChange") {
on_metadata(metadata);
system_on_metadata(media_metadata);
}
// TODO: FIXME: failed event.
});
if (url.indexOf("http") == 0) {
stream.play(url);
media_stream.play(url);
} else {
var streamName:String = url.substr(url.lastIndexOf("/"));
stream.play(streamName);
media_stream.play(streamName);
}
video = new Video();
video.width = _width;
video.height = _height;
video.attachNetStream(stream);
video.smoothing = true;
addChild(video);
media_video = new Video();
media_video.width = _width;
media_video.height = _height;
media_video.attachNetStream(media_stream);
media_video.smoothing = true;
addChild(media_video);
draw_black_background(_width, _height);
__draw_black_background(_width, _height);
// lowest layer, for mask to cover it.
setChildIndex(video, 0);
setChildIndex(media_video, 0);
});
if (url.indexOf("http") == 0) {
this.conn.connect(null);
this.media_conn.connect(null);
} else {
var tcUrl:String = this.url.substr(0, this.url.lastIndexOf("/"));
this.conn.connect(tcUrl);
}
}
private function on_metadata(metadata:Object):void {
this.metadata = metadata;
// for context menu
var customItems:Array = [new ContextMenuItem("SrsPlayer")];
if (metadata.hasOwnProperty("server")) {
customItems.push(new ContextMenuItem("Server: " + metadata.server));
}
if (metadata.hasOwnProperty("contributor")) {
customItems.push(new ContextMenuItem("Contributor: " + metadata.contributor));
}
contextMenu.customItems = customItems;
// for js.
var obj:Object = get_video_size_object();
obj.server = 'srs';
obj.contributor = 'winlin';
if (metadata.hasOwnProperty("server")) {
obj.server = metadata.server;
}
if (metadata.hasOwnProperty("contributor")) {
obj.contributor = metadata.contributor;
}
var code:int = flash.external.ExternalInterface.call(on_player_metadata, id, obj);
if (code != 0) {
throw new Error("callback on_player_metadata failed. code=" + code);
var tcUrl:String = this.user_url.substr(0, this.user_url.lastIndexOf("/"));
this.media_conn.connect(tcUrl);
}
}
... ... @@ -324,26 +349,26 @@ package
* 2. override with metadata size if specified.
* 3. override with codec size if specified.
*/
private function get_video_size_object():Object {
private function __get_video_size_object():Object {
var obj:Object = {
width: video.width,
height: video.height
width: media_video.width,
height: media_video.height
};
// override with metadata size.
if (metadata.hasOwnProperty("width")) {
obj.width = metadata.width;
if (this.media_metadata.hasOwnProperty("width")) {
obj.width = this.media_metadata.width;
}
if (metadata.hasOwnProperty("height")) {
obj.height = metadata.height;
if (this.media_metadata.hasOwnProperty("height")) {
obj.height = this.media_metadata.height;
}
// override with codec size.
if (video.videoWidth > 0) {
obj.width = video.videoWidth;
if (media_video.videoWidth > 0) {
obj.width = media_video.videoWidth;
}
if (video.videoHeight > 0) {
obj.height = video.videoHeight;
if (media_video.videoHeight > 0) {
obj.height = media_video.videoHeight;
}
return obj;
... ... @@ -352,17 +377,17 @@ package
/**
* execute the enter fullscreen action.
*/
private function execute_user_enter_fullscreen():void {
if (!fs_refer || fs_percent <= 0) {
private function __execute_user_enter_fullscreen():void {
if (!user_fs_refer || user_fs_percent <= 0) {
return;
}
// change to video size if refer to video.
var obj:Object = get_video_size_object();
var obj:Object = __get_video_size_object();
// get the DAR
var num:int = dar_num;
var den:int = dar_den;
var num:int = user_dar_num;
var den:int = user_dar_den;
if (num == 0) {
num = obj.height;
... ... @@ -379,7 +404,7 @@ package
}
// for refer is screen.
if (fs_refer == "screen") {
if (user_fs_refer == "screen") {
obj = {
width: this.stage.fullScreenWidth,
height: this.stage.fullScreenHeight
... ... @@ -387,34 +412,34 @@ package
}
// rescale to fs
update_video_size(num, den, obj.width * fs_percent / 100, obj.height * fs_percent / 100, this.stage.fullScreenWidth, this.stage.fullScreenHeight);
__update_video_size(num, den, obj.width * user_fs_percent / 100, obj.height * user_fs_percent / 100, this.stage.fullScreenWidth, this.stage.fullScreenHeight);
}
/**
* for user set dar, or leave fullscreen to recover the dar.
*/
private function execute_user_set_dar():void {
private function __execute_user_set_dar():void {
// get the DAR
var num:int = dar_num;
var den:int = dar_den;
var num:int = user_dar_num;
var den:int = user_dar_den;
var obj:Object = get_video_size_object();
var obj:Object = __get_video_size_object();
if (num == 0) {
num = obj.height;
}
if (num == -1) {
num = this.h;
num = this.user_h;
}
if (den == 0) {
den = obj.width;
}
if (den == -1) {
den = this.w;
den = this.user_w;
}
update_video_size(num, den, this.w, this.h, this.w, this.h);
__update_video_size(num, den, this.user_w, this.user_h, this.user_w, this.user_h);
}
/**
... ... @@ -426,8 +451,8 @@ package
* @param _w/_h the video draw paper size. used to rescale the player together with DAR.
* @param _sw/_wh the stage size, >= paper size. used to center the player.
*/
private function update_video_size(_num:int, _den:int, _w:int, _h:int, _sw:int, _sh:int):void {
if (!this.video || _num <= 0 || _den <= 0) {
private function __update_video_size(_num:int, _den:int, _w:int, _h:int, _sw:int, _sh:int):void {
if (!this.media_video || _num <= 0 || _den <= 0) {
return;
}
... ... @@ -435,21 +460,36 @@ package
// calc the height by DAR
var _height:int = _w * _num / _den;
if (_height <= _h) {
this.video.width = _w;
this.video.height = _height;
this.media_video.width = _w;
this.media_video.height = _height;
} else {
// height overflow, calc the width by DAR
var _width:int = _h * _den / _num;
this.video.width = _width;
this.video.height = _h;
this.media_video.width = _width;
this.media_video.height = _h;
}
// align center.
this.video.x = (_sw - this.video.width) / 2;
this.video.y = (_sh - this.video.height) / 2;
this.media_video.x = (_sw - this.media_video.width) / 2;
this.media_video.y = (_sh - this.media_video.height) / 2;
draw_black_background(_sw, _sh);
__draw_black_background(_sw, _sh);
}
/**
* draw black background and draw the fullscreen mask.
*/
private function __draw_black_background(_width:int, _height:int):void {
// draw black bg.
this.graphics.beginFill(0x00, 1.0);
this.graphics.drawRect(0, 0, _width, _height);
this.graphics.endFill();
// draw the fs mask.
this.control_fs_mask.graphics.beginFill(0xff0000, 0);
this.control_fs_mask.graphics.drawRect(0, 0, _width, _height);
this.control_fs_mask.graphics.endFill();
}
}
}
\ No newline at end of file
... ...