From 682850c02f749714fc6f51d023f329daaacca264 Mon Sep 17 00:00:00 2001
From: Jaon EarlWolf <jamonsterr@gmail.com>
Date: Thu, 10 Dec 2015 17:08:35 -0300
Subject: [PATCH] FS-8641 [verto-communicator] - Added Frame Rate setting

---
 .../src/partials/modal_settings.html               |  9 +++++++--
 .../src/storageService/services/storage.js         |  3 ++-
 .../src/vertoService/services/vertoService.js      | 14 +++++++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/html5/verto/verto_communicator/src/partials/modal_settings.html b/html5/verto/verto_communicator/src/partials/modal_settings.html
index f4775c0e36..4cb666fbbb 100644
--- a/html5/verto/verto_communicator/src/partials/modal_settings.html
+++ b/html5/verto/verto_communicator/src/partials/modal_settings.html
@@ -2,7 +2,6 @@
   <h3 class="modal-title">Device Settings</h3>
 </div>
 <div class="modal-body">
-
   <div class="form-group" ng-show="mydata.useVideo">
     <label for="settings-camera">Camera:</label>
     <select name="camera" id="settings-camera" class="form-control"
@@ -68,6 +67,13 @@
 
   </div>
 
+  <div class="form-group">
+    <label for="settings-framerate">Best frame rate:</label>
+    <select name="settings-framerate" id="settings-framerate" class="form-control"
+            ng-model="mydata.bestFrameRate"
+            ng-options="item.id as item.label for item in verto.framerate"></select>
+  </div>
+
   <div class="form-group">
     <label for="settings-microphone">Audio settings:</label>
     <div class="checkbox">
@@ -138,7 +144,6 @@
               ng-options="item.id as item.label for item in verto.bandwidth"></select>
     </div>
   </div>
-
 </div>
 <div class="modal-footer">
   <button class="btn btn-danger pull-left btn-pull-left" ng-click="resetSettings()">Factory reset</button>
diff --git a/html5/verto/verto_communicator/src/storageService/services/storage.js b/html5/verto/verto_communicator/src/storageService/services/storage.js
index da3a600589..1e2dc6c0bc 100644
--- a/html5/verto/verto_communicator/src/storageService/services/storage.js
+++ b/html5/verto/verto_communicator/src/storageService/services/storage.js
@@ -38,7 +38,8 @@
           googHighpassFilter: true,
           googEchoCancellation: true,
           autoBand: true,
-          testSpeedJoin: true
+          testSpeedJoin: true,
+          bestFrameRate: 15
        };
 
     data.$default(defaultSettings);
diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
index 7a9a5fca28..930501cc48 100644
--- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
@@ -93,6 +93,17 @@ var bandwidth = [{
   label: 'Server Default'
 }, ];
 
+var framerate = [{
+  id: '15',
+  label: '15 FPS'
+}, {
+  id: '20',
+  label: '20 FPS'
+}, {
+  id: '30',
+  label: '30 FPS'
+}, ];
+
 var vertoService = angular.module('vertoService', ['ngCookies']);
 
 vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'storage',
@@ -203,6 +214,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
       videoQuality: videoQuality,
       videoResolution: videoResolution,
       bandwidth: bandwidth,
+      framerate: framerate,
 
       refreshDevicesCallback : function refreshDevicesCallback(callback) {
         data.videoDevices = [{
@@ -364,7 +376,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
             maxWidth: w,
             maxHeight: h,
             minFrameRate: 15,
-            vertoBestFrameRate: 15
+            vertoBestFrameRate: storage.data.bestFrameRate
           });
           videoQuality.forEach(function(qual){
             if (w === qual.width && h === qual.height) {