BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton

Browse Source
This commit is contained in:
Markos Calderon 2013-05-09 17:30:25 -05:00
commit 00bcf1b232
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
View File

@ -228,9 +228,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
setResolution(_camera.width, _camera.height); setResolution(_camera.width, _camera.height);
} }
_video = new Video; _video = new Video();
_video.attachCamera(_camera); _video.attachCamera(_camera);
_video.smoothing = true;
if (aspectRatio > _videoHolder.width / _videoHolder.height) { if (aspectRatio > _videoHolder.width / _videoHolder.height) {
_video.width = _videoHolder.width; _video.width = _videoHolder.width;
_video.height = _videoHolder.width / aspectRatio; _video.height = _videoHolder.width / aspectRatio;
@ -316,8 +317,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
createButtons(); createButtons();
addControlButtons(); addControlButtons();
// onResize();
} }
private var _isClosing:Boolean = false; private var _isClosing:Boolean = false;
@ -354,13 +354,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
super.onResize(); super.onResize();
if (_videoHolder != null) { if (_videoHolder != null) {
if (videoIsSmallerThanWindow()) {
_video.width = camWidth;
_video.height = camHeight;
} else {
fitVideoToWindow(); fitVideoToWindow();
}
_video.x = (this.width - PADDING_HORIZONTAL - _video.width) / 2; _video.x = (this.width - PADDING_HORIZONTAL - _video.width) / 2;
_video.y = (this.height - PADDING_VERTICAL - _video.height) / 2; _video.y = (this.height - PADDING_VERTICAL - _video.height) / 2;
} }

1
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
View File

@ -169,6 +169,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
_video = new Video(Number(res[0]), Number(res[1])); _video = new Video(Number(res[0]), Number(res[1]));
_video.width = Number(res[0]); _video.width = Number(res[0]);
_video.height = Number(res[1]); _video.height = Number(res[1]);
_video.smoothing = true;
setAspectRatio(Number(res[0]), Number(res[1])); setAspectRatio(Number(res[0]), Number(res[1]));
_video.attachNetStream(ns); _video.attachNetStream(ns);