You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/03/11 07:21:16 UTC

[openmeetings] branch master updated: [OPENMEETINGS-2029] Safari width algorithm is corrected

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 8600fdb  [OPENMEETINGS-2029] Safari width algorithm is corrected
8600fdb is described below

commit 8600fdb6beb04ff72d3cf6ec725c3f0d2a428e9f
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Mar 11 14:21:05 2019 +0700

    [OPENMEETINGS-2029] Safari width algorithm is corrected
---
 .../src/main/java/org/apache/openmeetings/web/room/raw-settings.js   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index 9474a52..8fcebb0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -226,16 +226,17 @@ var VideoSettings = (function() {
 	}
 	function _setCntsDimensions(cnts) {
 		const b = kurentoUtils.WebRtcPeer.browser;
-		let width = s.video.width;
 		if (b.name === 'Safari') {
+			let width = s.video.width;
 			//valid widths are 320, 640, 1280
 			[320, 640, 1280].some(function(w) {
 				if (width < w + 1) {
-					cnts.video.width = w;
+					width = w;
 					return true;
 				}
 				return false;
 			});
+			cnts.video.width = width < 1281 ? width : 1280;
 		} else {
 			cnts.video.width = s.video.width;
 			cnts.video.height = s.video.height;