From 9b82894f02370576483bc520e0906f99095c2008 Mon Sep 17 00:00:00 2001 From: Stefan Yohansson Date: Fri, 2 Oct 2015 17:36:53 -0300 Subject: [PATCH] FS-8290 #resolve [verto_communicator] automatically mark dedicated encoder if out/in bandwith isnt 'Server default' FS-8290 [verto_communicator] fix logic FS-8290 [verto_communicator] change Dedicated Encoder input from checkbox to hidden --- .../src/partials/modal_settings.html | 14 ++++++++------ .../controllers/ModalSettingsController.js | 8 ++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/html5/verto/verto_communicator/src/partials/modal_settings.html b/html5/verto/verto_communicator/src/partials/modal_settings.html index 0f258c2802..aeaa65a6f5 100644 --- 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 -
- -
+ + + +
+ Using Dedicated Remote Encoder +
@@ -107,6 +108,7 @@ diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js index b144d3026e..2b70948bbe 100644 --- 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; + } + }; } ]);