Moved CPU overuse detection from experimental to extendend settings and enabled it by default.

static/js/controllers/mediastreamcontroller.js

@@ -145,6 +145,7 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder
 				defaultRoom: "",
 				language: "",
 				audioRenderToAssociatedSkin: true,
+				videoCpuOveruseDetection: true,
 				experimental: {
 					enabled: false,
 					audioEchoCancellation2: true,
@@ -152,8 +153,7 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder
 					audioNoiseSuppression2: true,
 					audioTypingNoiseDetection: true,
 					videoLeakyBucket: true,
-					videoNoiseReduction: false,
-					videoCpuOveruseDetection: true
+					videoNoiseReduction: false
 				}
 			}
 		};

static/partials/settings.html

@@ -203,36 +203,37 @@
             </div>
           </div>
 
-          <div ng-show="user.settings.experimental.enabled">
-
           <div class="form-group" ng-show="isChrome">
-              <label class="col-xs-4 control-label">{{_('Optimize for high resolution video')}}</label>
+            <label class="col-xs-4 control-label">{{_('Detect CPU over use')}}</label>
             <div class="col-xs-8">
               <div class="checkbox">
                <label>
-                    <input type="checkbox" ng-model="user.settings.experimental.videoLeakyBucket"/>&nbsp;
+                  <input type="checkbox" ng-model="user.settings.videoCpuOveruseDetection"/>&nbsp;
                </label>
+               <span class="help-block">{{_('Automatically reduce video quality as needed.')}}</span>
               </div>
             </div>
           </div>
 
+          <div ng-show="user.settings.experimental.enabled">
+
             <div class="form-group" ng-show="isChrome">
-              <label class="col-xs-4 control-label">{{_('Reduce video noise')}}</label>
+              <label class="col-xs-4 control-label">{{_('Optimize for high resolution video')}}</label>
               <div class="col-xs-8">
                 <div class="checkbox">
                  <label>
-                    <input type="checkbox" ng-model="user.settings.experimental.videoNoiseReduction"/>&nbsp;
+                    <input type="checkbox" ng-model="user.settings.experimental.videoLeakyBucket"/>&nbsp;
                  </label>
                 </div>
               </div>
             </div>
 
             <div class="form-group" ng-show="isChrome">
-              <label class="col-xs-4 control-label">{{_('Detect CPU over use')}}</label>
+              <label class="col-xs-4 control-label">{{_('Reduce video noise')}}</label>
               <div class="col-xs-8">
                 <div class="checkbox">
                  <label>
-                    <input type="checkbox" ng-model="user.settings.experimental.videoCpuOveruseDetection"/>&nbsp;
+                    <input type="checkbox" ng-model="user.settings.experimental.videoNoiseReduction"/>&nbsp;
                  </label>
                 </div>
               </div>