kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-18 09:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #538 in FS/freeswitch from ~STEFAN_YOHANSSON/freeswitch:bugfix/FS-8290-automatically-mark-dedicated-encoder to master

Browse Source 
* commit '9b82894f02370576483bc520e0906f99095c2008':
  FS-8290 #resolve [verto_communicator] automatically mark dedicated encoder if out/in bandwith isnt 'Server default'
This commit is contained in:
Ítalo Rossi 2015-10-05 19:53:42 -05:00
commit 1926629f64
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
html5/verto/verto_communicator/src/partials/modal_settings.html
View File

@ -46,12 +46,6 @@
Use STUN Use STUN
</label> </label>
</div> </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"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="mirror_input" ng-value="mydata.mirrorInput" ng-model="mydata.mirrorInput"> <input type="checkbox" name="mirror_input" ng-value="mydata.mirrorInput" ng-model="mydata.mirrorInput">
@ -96,10 +90,17 @@
ng-options="item.id as item.label for item in verto.videoQuality"></select> ng-options="item.id as item.label for item in verto.videoQuality"></select>
</div> </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"> <div class="form-group">
<label for="outgoing-bandwidth">Max outgoing bandwidth:</label> <label for="outgoing-bandwidth">Max outgoing bandwidth:</label>
<select name="outgoing_bandwidth" id="outgoing-bandwidth" class="form-control" <select name="outgoing_bandwidth" id="outgoing-bandwidth" class="form-control"
ng-model="mydata.outgoingBandwidth" ng-model="mydata.outgoingBandwidth"
ng-change="checkUseDedRemoteEncoder(mydata.outgoingBandwidth)"
ng-options="item.id as item.label for item in verto.bandwidth"></select> ng-options="item.id as item.label for item in verto.bandwidth"></select>
</div> </div>
@ -107,6 +108,7 @@
<label for="incoming-bandwidth">Max incoming bandwidth:</label> <label for="incoming-bandwidth">Max incoming bandwidth:</label>
<select name="incoming_bandwidth" id="incoming-bandwidth" class="form-control" <select name="incoming_bandwidth" id="incoming-bandwidth" class="form-control"
ng-model="mydata.incomingBandwidth" ng-model="mydata.incomingBandwidth"
ng-change="checkUseDedRemoteEncoder(mydata.incomingBandwidth)"
ng-options="item.id as item.label for item in verto.bandwidth"></select> ng-options="item.id as item.label for item in verto.bandwidth"></select>
</div> </div>

8
html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js
View File

@ -34,6 +34,14 @@
window.location.reload(); 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;
}
};
} }
]); ]);