From 11cd5c640fa9c6e55f345da7e0e44469d6521f60 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 20 Dec 2013 18:53:13 +0800 Subject: [PATCH] update the srs player, set the DAR. --- .../players/srs_player/release/srs_player.swf | Bin 3452 -> 3443 bytes .../players/srs_player/src/srs_player.as | 23 ++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf index c3de2e90e3bb5eee7e3a0bd7c033ee39162a85eb..69e20cfb17e935cb9f55d65932620f182611ad76 100755 GIT binary patch literal 3443 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 V2!nyg=I#DN5AP)DygW!QAgd>0> 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 diff --git a/trunk/research/players/srs_player/src/srs_player.as b/trunk/research/players/srs_player/src/srs_player.as index 446be1987..54ddcd651 100755 --- a/trunk/research/players/srs_player/src/srs_player.as +++ b/trunk/research/players/srs_player/src/srs_player.as @@ -106,20 +106,17 @@ package public function js_call_dar(num:int, den:int):int { if (this.video && num > 0 && den > 0 && this.video.width > 0) { // set DAR. - if (num < den) { - // calc the height by DAR - var _height:int = this.video.width * num / den; - + // calc the height by DAR + var _height:int = this.w * num / den; + if (_height <= this.h) { + this.video.width = this.w; + this.video.height = _height; + } else { // height overflow, calc the width by DAR - if (_height > this.h) { - var _width:int = this.video.height * den / num; - - this.video.width = _width; - this.video.height = this.h; - } else { - this.video.width = this.w; - this.video.height = _height; - } + var _width:int = this.h * den / num; + + this.video.width = _width; + this.video.height = this.h; } // align center.