From 5957beafa27dee4c8a0b64ebf88daca9de93addb Mon Sep 17 00:00:00 2001
From: Italo Rossi <italorossib@gmail.com>
Date: Tue, 4 Oct 2016 21:56:11 -0300
Subject: [PATCH] FS-9608 [verto_communicator] [verto] Passing audio params
 directly to audio object and updating goog settings

---
 html5/verto/js/src/jquery.FSRTC.js             | 18 ++++--------------
 .../controllers/SettingsController.js          | 10 ++++++++++
 .../src/vertoService/services/vertoService.js  |  1 -
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/html5/verto/js/src/jquery.FSRTC.js b/html5/verto/js/src/jquery.FSRTC.js
index 832a9a3fb7..cccbacf23a 100644
--- a/html5/verto/js/src/jquery.FSRTC.js
+++ b/html5/verto/js/src/jquery.FSRTC.js
@@ -475,27 +475,17 @@
 	    audio = false;
 	} else {
 	    audio = {
-		//mandatory: {},
-		//optional: []
-            advanced: []
 	    };
 
+	    if (obj.options.audioParams) {
+	        audio = obj.options.audioParams;
+        }
+
 	    if (obj.options.useMic !== "any") {
 		//audio.optional = [{sourceId: obj.options.useMic}]
 		audio.deviceId = {exact: obj.options.useMic};
 	    }
 
-	    //FIXME
-	    if (obj.options.audioParams) {
-		for (var key in obj.options.audioParams) {
-		    var con = {};
-		    //con[key] = obj.options.audioParams[key];
-		    if (obj.options.audioParams[key]) {
-			con.exact = key;
-			audio.advanced.push(con);
-		    }
-		}
-	    }
 
 
 	}
diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/SettingsController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/SettingsController.js
index a7da6f4beb..a130639155 100644
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/SettingsController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/SettingsController.js
@@ -51,6 +51,16 @@
           if (storage.data.autoBand) {
             $scope.testSpeed();
           }
+
+          var audioParams = {
+            googEchoCancellation: storage.data.googEchoCancellation === undefined ? true : storage.data.googEchoCancellation,
+            googNoiseSuppression: storage.data.googNoiseSuppression === undefined ? true : storage.data.googNoiseSuppression,
+            googHighpassFilter: storage.data.googHighpassFilter === undefined ? true : storage.data.googHighpassFilter,
+            googAutoGainControl: storage.data.googAutoGainControl === undefined ? true : storage.data.googAutoGainControl,
+            googAutoGainControl2: storage.data.googAutoGainControl === undefined ? true : storage.data.googAutoGainControl
+          };
+          verto.data.instance.options.audioParams = audioParams;
+
         };
 
         $scope.changedLanguage = function(langKey){
diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
index 883cebf3b9..cb35195a82 100644
--- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
@@ -709,7 +709,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
             socketUrl: data.wsURL,
             tag: "webcam",
             ringFile: "sounds/bell_ring2.wav",
-            // TODO: Add options for this.
             audioParams: {
                 googEchoCancellation: storage.data.googEchoCancellation === undefined ? true : storage.data.googEchoCancellation,
                 googNoiseSuppression: storage.data.googNoiseSuppression === undefined ? true : storage.data.googNoiseSuppression,