FS-8290 #resolve [verto_communicator] automatically mark dedicated encoder if out...

FS-8290 [verto_communicator] fix logic

FS-8290 [verto_communicator] change Dedicated Encoder input from checkbox to hidden

diff --git a/html5/verto/verto_communicator/src/partials/modal_settings.html b/html5/verto/verto_communicator/src/partials/modal_settings.html
index 0f258c28022ce4cd06cddc20544c36bf19ec85cb..aeaa65a6f594fb6dbb674d2f55608b275224480b 100644 (file)
--- a/html5/verto/verto_communicator/src/partials/modal_settings.html
+++ b/html5/verto/verto_communicator/src/partials/modal_settings.html
@@ -46,12 +46,6 @@
         Use STUN
       </label>
     </div>
-    <div class="checkbox">
-      <label>
-        <input type="checkbox" name="use_dedenc" ng-value="mydata.useDedenc" ng-model="mydata.useDedenc">
-        Use Dedicated Remote Encoder
-      </label>
-    </div>
     <div class="checkbox">
       <label>
         <input type="checkbox" name="mirror_input" ng-value="mydata.mirrorInput" ng-model="mydata.mirrorInput">
@@ -95,11 +89,18 @@
             ng-model="mydata.vidQual"
             ng-options="item.id as item.label for item in verto.videoQuality"></select>
   </div>
+  
+  <input type="hidden" name="use_dedenc" ng-value="mydata.useDedenc" ng-model="mydata.useDedenc">
+
+  <div ng-show="mydata.useDedenc">
+    <b>Using Dedicated Remote Encoder</b>
+  </div>
 
   <div class="form-group">
     <label for="outgoing-bandwidth">Max outgoing bandwidth:</label>
     <select name="outgoing_bandwidth" id="outgoing-bandwidth" class="form-control"
             ng-model="mydata.outgoingBandwidth"
+           ng-change="checkUseDedRemoteEncoder(mydata.outgoingBandwidth)"
             ng-options="item.id as item.label for item in verto.bandwidth"></select>
   </div>
 
@@ -107,6 +108,7 @@
     <label for="incoming-bandwidth">Max incoming bandwidth:</label>
     <select name="incoming_bandwidth" id="incoming-bandwidth" class="form-control"
             ng-model="mydata.incomingBandwidth"
+           ng-change="checkUseDedRemoteEncoder(mydata.incomingBandwidth)"
             ng-options="item.id as item.label for item in verto.bandwidth"></select>
   </div>
 

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js
index b144d3026ef4b01bfbe95ee36a477bf70078979d..2b70948bbe6d69b14c4c8163a578f67ee93bb950 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js
@@ -34,6 +34,14 @@
            window.location.reload();
          };
         };
+
+        $scope.checkUseDedRemoteEncoder = function(option) {
+          if ($scope.mydata.incomingBandwidth != 'default' || $scope.mydata.outgoingBandwidth != 'default') {
+            $scope.mydata.useDedenc = true;
+          } else {
+            $scope.mydata.useDedenc = false;
+          }
+        };
       }
     ]);