update new pass

diff --git a/html5/verto/verto_communicator/package.json b/html5/verto/verto_communicator/package.json
index b2b0502a553c77332f1fd943a19dee52294d8887..de23baa785dfcbacc9a204909b900dfd9d3a406d 100644 (file)
--- a/html5/verto/verto_communicator/package.json
+++ b/html5/verto/verto_communicator/package.json
@@ -15,7 +15,7 @@
     "grunt-contrib-copy": "^0.7.0",
     "grunt-contrib-cssmin": "^0.12.0",
     "grunt-contrib-htmlmin": "^0.4.0",
-    "grunt-contrib-imagemin": "^0.9.2",
+    "grunt-contrib-imagemin": "^1.0.0",
     "grunt-contrib-jshint": "^0.11.0",
     "grunt-contrib-uglify": "^0.7.0",
     "grunt-contrib-watch": "latest",

diff --git a/html5/verto/verto_communicator/src/config.json b/html5/verto/verto_communicator/src/config.json
index c07687453cfc581e3709cdada84a42582d64bcca..e7b09aae9524e5cd0a8249c6a7f8f02b94600126 100644 (file)
--- a/html5/verto/verto_communicator/src/config.json
+++ b/html5/verto/verto_communicator/src/config.json
@@ -1,5 +1,4 @@
 {
       "login": "1008",
-      "password": "1234",
-      "dedEncWatermark": 3072
+      "password": "1234"
 }

diff --git a/html5/verto/verto_communicator/src/config.json.sample b/html5/verto/verto_communicator/src/config.json.sample
index 96b82a89863c3f956d832e05a887fa26d943b8d5..a905c6161dd7c50eaed7367f4caa8dff9487cf94 100644 (file)
--- a/html5/verto/verto_communicator/src/config.json.sample
+++ b/html5/verto/verto_communicator/src/config.json.sample
@@ -9,6 +9,5 @@
       "autologin": "true",
       "autocall": "3500",
       "googlelogin": "true",
-      "wsURL": "wss://gamma.tollfreegateway.com/wss2",
-      "dedEncWatermark": 3072
+      "wsURL": "wss://gamma.tollfreegateway.com/wss2"
 }

diff --git a/html5/verto/verto_communicator/src/partials/modal_settings.html b/html5/verto/verto_communicator/src/partials/modal_settings.html
index 5ca463dbb7e3356da03716669ecc3a53e3c5b750..bf32521d57ff42aa6423393df515f4375e217e55 100644 (file)
--- a/html5/verto/verto_communicator/src/partials/modal_settings.html
+++ b/html5/verto/verto_communicator/src/partials/modal_settings.html
@@ -84,8 +84,8 @@
   </div>
 
   <div class="form-group">
-    <label>Video settings:</label>
-    <!-- <a class="btn btn-primary" href="" ng-click="testSpeed()">Check Speed</a> -->
+    <label>Video settings:</label> <br><br>
+    <a class="btn btn-primary" href="" ng-click="testSpeed()">Check Speed</a> 
     <span ng-bind="speedMsg"></span>
 
     <input type="hidden" name="use_dedenc" ng-value="mydata.useDedenc" ng-model="mydata.useDedenc">

diff --git a/html5/verto/verto_communicator/src/storageService/services/splash_screen.js b/html5/verto/verto_communicator/src/storageService/services/splash_screen.js
index 13c238bdd0de4e95fd656ff5880b74b3f85d50ca..40c2b6951bf3652c3381875de648c335b9c0938d 100644 (file)
--- a/html5/verto/verto_communicator/src/storageService/services/splash_screen.js
+++ b/html5/verto/verto_communicator/src/storageService/services/splash_screen.js
@@ -82,7 +82,7 @@
               'message': 'Check Connection Speed.'
             };
 
-            if (storage.data.autoBand && verto.instance) {
+            if (storage.data.autoBand && verto.data.instance) {
               verto.testSpeed(cb);
             } else {
               resolve(result);

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/MenuController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/MenuController.js
index f2111ad20e4312450c610e7ca22199df9c1959f6..adb5f6953c7e8867829d0054f8dc14237697b18f 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/MenuController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/MenuController.js
@@ -10,19 +10,26 @@
       $scope.storage = storage;
 
       $rootScope.$on('testSpeed', function(e, data) {
-        var dedEncWatermark = storage.data.dedEncWatermark;
         var vidQual = storage.data.vidQual;
+       var bwp = 4;
 
         $scope.bandDown = data.downKPS;
         $scope.bandUp = data.upKPS;
-        $scope.dedEnc = storage.data.useDedenc;
 
-        $scope.iconClass = 'mdi-device-signal-wifi-3-bar';
+        if (data.downKPS < 2000) {
+          bwp--;
+        }
+
+        if (data.upKPS < 2000) {
+           bwp--;
+        }
+
+        $scope.iconClass = 'mdi-device-signal-wifi-4-bar';                      
 
-        if ($scope.bandDown < dedEncWatermark) {
-          $scope.iconClass = 'mdi-device-signal-wifi-1-bar dedenc';
-        } else if ($scope.bandDown >= 2*dedEncWatermark) {
-          $scope.iconClass = 'mdi-device-signal-wifi-4-bar';
+        if (bwp < 4) {
+           $scope.iconClass = 'mdi-device-signal-wifi-3-bar';
+        } else if (bwp < 2) {
+           $scope.iconClass = 'mdi-device-signal-wifi-1-bar dedenc';
         }
 
         verto.videoQuality.forEach(function(vid) {

diff --git a/html5/verto/verto_communicator/src/vertoService/services/configService.js b/html5/verto/verto_communicator/src/vertoService/services/configService.js
index e5f5cf30f5279ba47452b29d2bc3acd3d6f52903..9fd789e81fda0d4f98f1102fbd3c3d11dfa4015a 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoService/services/configService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/configService.js
@@ -41,12 +41,6 @@ vertoService.service('config', ['$rootScope', '$http', '$location', 'storage', '
           verto.data.googleclientid = data.googleclientid;
         }
 
-        if (data.dedEncWatermark) {
-          storage.data.dedEncWatermark = data.dedEncWatermark;
-        } else {
-          storage.data.dedEncWatermark = 3072;
-        }
-        
         angular.extend(verto.data, data);
 
         /**

diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
index 36b191d44c7add784365ef4bdb512b73e319426d..7128f1239ac32c53d7bc1fe87d10fd4b38eac6a5 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
@@ -76,6 +76,12 @@ var bandwidth = [{
 }, {
   id: '2048',
   label: '2mb'
+}, {
+  id: '3196',
+  label: '3mb'
+}, {
+  id: '4192',
+  label: '4mb'
 }, {
   id: '5120',
   label: '5mb'
@@ -812,7 +818,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
           if (storage.data.autoBand) {
             storage.data.incomingBandwidth = downBand;
             storage.data.outgoingBandwidth = upBand;
-            storage.data.useDedenc = downBand <= storage.data.dedEncWatermark;
+            storage.data.useDedenc = false;
             storage.data.vidQual = 'hd';
 
             if (upBand < 512) {

diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c
index a0adb1779502895c45510ec1651577486a927273..8c6608202250e3421888e62e98b3f59d0cc188a4 100644 (file)
--- a/src/mod/applications/mod_conference/conference_member.c
+++ b/src/mod/applications/mod_conference/conference_member.c
@@ -768,27 +768,18 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
                }
 
                if ((var = switch_channel_get_variable(member->channel, "rtp_video_max_bandwidth_in"))) {
-                       int tmp = atoi(var);
-                       if (tmp > 0) {
-                               member->max_bw_in = tmp;
-                       }
-                       printf("FORCE MAX %d\n", member->max_bw_in);
+                       member->max_bw_in = switch_parse_bandwidth_string(var);
                }
                
                if ((var = switch_channel_get_variable(member->channel, "rtp_video_max_bandwidth_out"))) {
-                       int tmp = atoi(var);
-                       if (tmp > 0) {
-                               member->max_bw_out = tmp;
-                               
-                               if (member->max_bw_out < conference->video_codec_settings.video.bandwidth) {
-                                       printf("DED ENCODER for %d\n", member->max_bw_out);
-                                       conference_utils_member_set_flag_locked(member, MFLAG_NO_MINIMIZE_ENCODING);
-                                       switch_core_media_set_outgoing_bitrate(member->session, SWITCH_MEDIA_TYPE_VIDEO, member->max_bw_out);
-                               }
+                       member->max_bw_out = switch_parse_bandwidth_string(var);;
+
+                       if (member->max_bw_out < conference->video_codec_settings.video.bandwidth) {
+                               conference_utils_member_set_flag_locked(member, MFLAG_NO_MINIMIZE_ENCODING);
+                               switch_core_media_set_outgoing_bitrate(member->session, SWITCH_MEDIA_TYPE_VIDEO, member->max_bw_out);
                        }
                }
-
-
+               
                switch_channel_set_variable_printf(channel, "conference_member_id", "%d", member->id);
                switch_channel_set_variable_printf(channel, "conference_moderator", "%s", conference_utils_member_test_flag(member, MFLAG_MOD) ? "true" : "false");
                switch_channel_set_variable_printf(channel, "conference_ghost", "%s", conference_utils_member_test_flag(member, MFLAG_GHOST) ? "true" : "false");

diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index d159013ec6a024418325b278ed298ba7239bcd93..54b073b492905a6835ee3406f3b41fd15f576a0e 100644 (file)
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -3335,7 +3335,7 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
 
 static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock_t *jsock, cJSON **response)
 {
-       cJSON *obj = cJSON_CreateObject(), *screenShare = NULL, *dedEnc = NULL, *mirrorInput, *json_ptr = NULL;
+       cJSON *obj = cJSON_CreateObject(), *screenShare = NULL, *dedEnc = NULL, *mirrorInput, *json_ptr = NULL, *bandwidth = NULL;
        switch_core_session_t *session = NULL;
        switch_channel_t *channel;
        switch_event_t *var_event;
@@ -3345,7 +3345,7 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
        cJSON *dialog;
        verto_pvt_t *tech_pvt;
        char name[512];
-       const char *var, *destination_number, *call_id = NULL, *sdp = NULL, *bandwidth = NULL, 
+       const char *var, *destination_number, *call_id = NULL, *sdp = NULL,
                *caller_id_name = NULL, *caller_id_number = NULL, *remote_caller_id_name = NULL, *remote_caller_id_number = NULL,*context = NULL;
        switch_event_header_t *hp;
        
@@ -3417,15 +3417,19 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
                switch_channel_set_flag(channel, CF_VIDEO_MIRROR_INPUT);
        }
 
-       if ((bandwidth = cJSON_GetObjectCstr(dialog, "outgoingBandwidth"))) {
-               if (strcasecmp(bandwidth, "default")) {
-                       switch_channel_set_variable(channel, "rtp_video_max_bandwidth_in", bandwidth);
+       if ((bandwidth = cJSON_GetObjectItem(dialog, "outgoingBandwidth"))) {
+               if (!zstr(bandwidth->valuestring) && strcasecmp(bandwidth->valuestring, "default")) {
+                       switch_channel_set_variable(channel, "rtp_video_max_bandwidth_in", bandwidth->valuestring);
+               } else if (bandwidth->valueint) {
+                       switch_channel_set_variable_printf(channel, "rtp_video_max_bandwidth_in", "%d", bandwidth->valueint);
                }
        }
 
-       if ((bandwidth = cJSON_GetObjectCstr(dialog, "incomingBandwidth"))) {
-               if (strcasecmp(bandwidth, "default")) {
-                       switch_channel_set_variable(channel, "rtp_video_max_bandwidth_out", bandwidth);
+       if ((bandwidth = cJSON_GetObjectItem(dialog, "incomingBandwidth"))) {
+               if (!zstr(bandwidth->valuestring) && strcasecmp(bandwidth->valuestring, "default")) {
+                       switch_channel_set_variable(channel, "rtp_video_max_bandwidth_out", bandwidth->valuestring);
+               } else if (bandwidth->valueint) {
+                       switch_channel_set_variable_printf(channel, "rtp_video_max_bandwidth_out", "%d", bandwidth->valueint);
                }
        }