From c6921959e14a4a42999ed4561b6d0e68b5698a19 Mon Sep 17 00:00:00 2001 From: Davide Colombo Date: Thu, 28 Jan 2016 16:50:17 +0100 Subject: [PATCH] FS-8792: apply video resolution on combobox video quality changes --- .../src/partials/modal_settings.html | 1 + .../controllers/ModalSettingsController.js | 30 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/html5/verto/verto_communicator/src/partials/modal_settings.html b/html5/verto/verto_communicator/src/partials/modal_settings.html index c7c4470d4a..9360b640a8 100644 --- a/html5/verto/verto_communicator/src/partials/modal_settings.html +++ b/html5/verto/verto_communicator/src/partials/modal_settings.html @@ -131,6 +131,7 @@ diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js index c1665eacca..a99fefe058 100644 --- a/html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js +++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js @@ -56,11 +56,23 @@ $scope.checkAutoBand = function(option) { $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) { $scope.mydata.outgoingBandwidth = 'default'; $scope.mydata.incomingBandwidth = 'default'; - $scope.mydata.vidQual = 'hd'; $scope.mydata.testSpeedJoin = false; + } else { $scope.mydata.testSpeedJoin = true; } @@ -73,6 +85,22 @@ $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 + }); + + }; + } ]);