From 3ab867d907c492fa4ef066e80027a27c758bd7e4 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 25 Dec 2013 14:59:19 +0800 Subject: [PATCH] fix bug of player dar. --- trunk/research/players/js/srs.player.js | 7 +++++-- trunk/research/players/srs_chat.html | 10 ++++++++-- trunk/research/players/srs_player.html | 2 +- .../players/srs_player/release/srs_player.swf | Bin 5332 -> 5333 bytes .../players/srs_player/src/srs_player.as | 4 ++-- trunk/research/players/srs_publisher.html | 10 ++++++++-- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/trunk/research/players/js/srs.player.js b/trunk/research/players/js/srs.player.js index 2896d5649..1b1d7a882 100755 --- a/trunk/research/players/js/srs.player.js +++ b/trunk/research/players/js/srs.player.js @@ -78,6 +78,9 @@ SrsPlayer.prototype.start = function(url) { * @param volume the volume, 0 is mute, 1 is 100%, 2 is 200%. */ SrsPlayer.prototype.play = function(url, volume) { + this.stop(); + SrsPlayer.__players.push(this); + if (url) { this.stream_url = url; } @@ -118,8 +121,8 @@ SrsPlayer.prototype.resume = function() { * use metadata width if 0. * use user specified width if -1. */ -SrsPlayer.prototype.dar = function(num, den) { - this.callbackObj.ref.__dar(num, den); +SrsPlayer.prototype.set_dar = function(num, den) { + this.callbackObj.ref.__set_dar(num, den); } /** * set the fullscreen size data. diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html index 23de8b3f3..270322d91 100755 --- a/trunk/research/players/srs_chat.html +++ b/trunk/research/players/srs_chat.html @@ -78,8 +78,11 @@ realtime_player = new SrsPlayer("realtime_player", 430, 185); realtime_player.on_player_ready = function() { this.set_bt(0.5); - this.set_fs("screen", 100); }; + realtime_player.on_player_metadata = function(metadata) { + this.set_dar(0, 0); + this.set_fs("screen", 100); + } realtime_player.start(); } @@ -230,8 +233,11 @@ var _player = new SrsPlayer("rp_raw_" + chat.id, 600, 300, chat); _player.on_player_ready = function() { this.set_bt(0.5); - this.set_fs("screen", 100); }; + _player.on_player_metadata = function(metadata) { + this.set_dar(0, 0); + this.set_fs("screen", 100); + } _player.start(chat.url); chat.player = _player; diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html index 64b5ab4b2..5ebc545fb 100755 --- a/trunk/research/players/srs_player.html +++ b/trunk/research/players/srs_player.html @@ -34,7 +34,7 @@ var __active_dar = null; function select_dar(dar_id, num, den) { - srs_player.dar(num, den); + srs_player.set_dar(num, den); if (__active_dar) { __active_dar.removeClass("active"); diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf index e57129fdc383c23ce2e07fbb75bce48c29dc8d7d..176e8d6be3984d2c84fb206f712f6529d5f5726a 100755 GIT binary patch literal 5333 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 literal 5332 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