FS-9608 [verto_communicator] [verto] Passing audio params directly to audio object...

diff --git a/html5/verto/js/src/jquery.FSRTC.js b/html5/verto/js/src/jquery.FSRTC.js
index 832a9a3fb759b359f34aa15a4cbd944953b02a07..cccbacf23a887c3a7ebc3cc772c27dc396829f83 100644 (file)
--- 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 a7da6f4beb3bf823125c097026c2c37596ea12fc..a130639155abf019cd62ddab1564a460d9e2c7fd 100644 (file)
--- 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 883cebf3b9fbf6c5f75c55e877da3b536cbf0fbe..cb35195a8219242b941b4067ffab0203e4e3d32c 100644 (file)
--- 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,