FS-8792: apply video resolution on combobox video quality changes

diff --git a/html5/verto/verto_communicator/src/partials/modal_settings.html b/html5/verto/verto_communicator/src/partials/modal_settings.html
index c7c4470d4a9818b662418f33cb848c2e3d791dd2..9360b640a8063eb4253cfd810c35ed44fae1a06d 100644 (file)
--- a/html5/verto/verto_communicator/src/partials/modal_settings.html
+++ b/html5/verto/verto_communicator/src/partials/modal_settings.html
@@ -131,6 +131,7 @@
       <select name="video_quality" id="video-quality" class="form-control"
               ng-disabled="mydata.autoBand"
               ng-model="mydata.vidQual"
+              ng-change="checkVideoQuality(mydata.vidQual)"
               ng-options="item.id as item.label for item in verto.videoQuality"></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 c1665eacca6c93ecf400463bf64a4c2fdc2abeb1..a99fefe0585dbf631fb11dedb0cbc99a15dfa626 100644 (file)
--- 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
+          });
+
+        };
+
       }
     ]);