From 42d1c0c0deb23e91d1b42563d6eefa22c02df435 Mon Sep 17 00:00:00 2001 From: Joao Mesquita Date: Fri, 28 Aug 2015 17:56:51 -0300 Subject: [PATCH] FS-8092 [verto_communicator] If there is no data in localStorage, select best resolution for selected camera. --- .../src/storageService/services/storage.js | 2 +- .../src/vertoService/services/vertoService.js | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/html5/verto/verto_communicator/src/storageService/services/storage.js b/html5/verto/verto_communicator/src/storageService/services/storage.js index f2f7def4f5..377006c258 100644 --- a/html5/verto/verto_communicator/src/storageService/services/storage.js +++ b/html5/verto/verto_communicator/src/storageService/services/storage.js @@ -30,7 +30,7 @@ mirrorInput: false, outgoingBandwidth: 'default', incomingBandwidth: 'default', - vidQual: 'qvga', + vidQual: undefined, askRecoverCall: false, googNoiseSuppression: false, googHighpassFilter: false, diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js index 87445f1ef6..7a6e90c701 100644 --- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js +++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js @@ -123,7 +123,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora }; function cleanShareCall(that) { - that.refreshVideoResolution(); data.shareCall = null; data.callState = 'active'; that.refreshDevices(); @@ -193,7 +192,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora return { data: data, callState: callState, - // changeData: changeData, // Options to compose the interface. videoQuality: videoQuality, @@ -306,7 +304,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora }); videoQuality.forEach(function(qual){ if (w === qual.width && h === qual.height) { - if (storage.data.vidQual !== qual.id) { + if (storage.data.vidQual !== qual.id || storage.data.vidQual === undefined) { storage.data.vidQual = qual.id; } } @@ -534,7 +532,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora data.instance.deviceParams({ useCamera: storage.data.selectedVideo, useMic: storage.data.selectedAudio, - resCheck: that.refreshVideoResolution + onResCheck: that.refreshVideoResolution }); } @@ -586,8 +584,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora call: function(destination, callback) { console.debug('Attempting to call destination ' + destination + '.'); - //this.refreshVideoResolution(); - var call = data.instance.newCall({ destination_number: destination, caller_id_name: data.name, @@ -621,8 +617,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora screenshare: function(destination, callback) { console.log('share screen video'); - this.refreshVideoResolution(); - var that = this; getScreenId(function(error, sourceId, screen_constraints) {