From 4d32ca9826adec30d9f7f1bb71783cc1b272f55b Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sat, 5 Aug 2017 13:17:48 -0500 Subject: [PATCH] FS-10420: [verto.js] Verto on Safari -- some more tweaks --- .../src/vertoService/services/vertoService.js | 15 +++++++++++---- html5/verto/video_demo-live_canvas/verto.js | 2 +- html5/verto/video_demo/verto.js | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js index 5ac1e7d3ba..6ae35994ec 100644 --- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js +++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js @@ -127,7 +127,7 @@ var updateVideoSize = function(ms) { var w = videoElem.width(); var h = videoElem.height(); var new_w, new_h; - var aspect = 1920 / 1080; + var aspect = w / h; var videoContainer = jQuery('div.video-wrapper'); if (w > h) { new_w = videoContainer.width(); @@ -264,10 +264,17 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora label: 'Screen' }]; data.audioDevices = [{ - id: 'none', - label: 'No Microphone' + id: 'any', + label: 'Default Microphone' + }, + { + id: 'none', + label: 'No Microphone' }]; - data.speakerDevices = []; + data.speakerDevices = [{ + id: 'any', + label: 'Default Speaker' + }]; if(!storage.data.selectedShare) { storage.data.selectedShare = data.shareDevices[0]['id']; diff --git a/html5/verto/video_demo-live_canvas/verto.js b/html5/verto/video_demo-live_canvas/verto.js index ae3279e619..71d823b392 100644 --- a/html5/verto/video_demo-live_canvas/verto.js +++ b/html5/verto/video_demo-live_canvas/verto.js @@ -442,7 +442,7 @@ function real_size() { var new_w; var new_h; - var aspect = 1920 / 1080; /*temasys doesn't provide video width hack aspect to wide screen*/ + var aspect = w / h; if (w > h) { new_w = window.innerWidth; diff --git a/html5/verto/video_demo/verto.js b/html5/verto/video_demo/verto.js index bd23d9edd0..9041468a54 100644 --- a/html5/verto/video_demo/verto.js +++ b/html5/verto/video_demo/verto.js @@ -147,7 +147,7 @@ function real_size() { var new_w; var new_h; - var aspect = 1920 / 1080; /*temasys doesn't provide video width hack aspect to wide screen*/ + var aspect = w / h; if (w > h) { new_w = window.innerWidth;