kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-22 03:12:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #692 in FS/freeswitch from ~DCOLOMBO/freeswitch:bugfix/FS-8792-video-quality-combo-box-doesn-t-apply to master

Browse Source 
* commit 'c6921959e14a4a42999ed4561b6d0e68b5698a19':
  FS-8792: apply video resolution on combobox video quality changes
This commit is contained in:
Italo Rossi 2016-02-25 12:04:48 -06:00
commit 37d5d003a5
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,6 +131,7 @@
<select name="video_quality" id="video-quality" class="form-control" <select name="video_quality" id="video-quality" class="form-control"
ng-disabled="mydata.autoBand" ng-disabled="mydata.autoBand"
ng-model="mydata.vidQual" ng-model="mydata.vidQual"
ng-change="checkVideoQuality(mydata.vidQual)"
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>

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

@ -56,11 +56,23 @@
$scope.checkAutoBand = function(option) { $scope.checkAutoBand = function(option) {
$scope.mydata.useDedenc = false; $scope.mydata.useDedenc = false;
var bestres = videoQuality[videoQuality.length-1];
$scope.mydata.vidQual = bestres.id;
storage.data.vidQual = bestres.id;
verto.data.instance.videoParams({
minWidth: bestres.width,
minHeight: bestres.height,
maxWidth: bestres.width,
maxHeight: bestres.height,
minFrameRate: 15,
vertoBestFrameRate: storage.data.bestFrameRate
});
storage.data.vidQual = bestres.id;
if (!option) { if (!option) {
$scope.mydata.outgoingBandwidth = 'default'; $scope.mydata.outgoingBandwidth = 'default';
$scope.mydata.incomingBandwidth = 'default'; $scope.mydata.incomingBandwidth = 'default';
$scope.mydata.vidQual = 'hd';
$scope.mydata.testSpeedJoin = false; $scope.mydata.testSpeedJoin = false;
} else { } else {
$scope.mydata.testSpeedJoin = true; $scope.mydata.testSpeedJoin = true;
} }
@ -73,6 +85,22 @@
$scope.mydata.useDedenc = true; $scope.mydata.useDedenc = true;
} }
}; };
$scope.checkVideoQuality = function(resolution) {
var w = videoResolution[resolution]['width'];
var h = videoResolution[resolution]['height'];
storage.data.vidQual = resolution;
verto.data.instance.videoParams({
minWidth: w,
minHeight: h,
maxWidth: w,
maxHeight: h,
minFrameRate: 15,
vertoBestFrameRate: storage.data.bestFrameRate
});
};
} }
]); ]);