increasing the device framerate now automatically increases the

streaming framerate

diff --git a/src/config.py b/src/config.py
index e044294bd2eebba1557c2d3500513a2557be40db..0e36ffb8e72e5efc7ad2089cd86bf4282b5edaab 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -472,6 +472,7 @@ def add_camera(device_details):
 
     elif proto == 'netcam':
         camera_config['netcam_url'] = device_details['url']
+        camera_config['text_double'] = True
         if device_details['username']:
             camera_config['netcam_userpass'] = device_details['username'] + ':' + device_details['password']
         _set_default_motion_camera(camera_id, camera_config)

diff --git a/static/css/ui.css b/static/css/ui.css
index ad9acc21c527b16fef094cc3827f2a831c8e7471..895b670948acc7c6bf85292f940d8f878908ae34 100644 (file)
--- a/static/css/ui.css
+++ b/static/css/ui.css
@@ -176,7 +176,7 @@ input[type=text].time {
     width: 3.5em;
 }
 
-input[disabled] {
+input[readonly] {
     border: 1px solid #555 !important;
 }
 

diff --git a/static/js/main.js b/static/js/main.js
index 819f5521d3b904f4c9337b6f6627706ce146705a..40d05aacc8de3ac2a1033e665fbfd5749a1056ff 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -469,7 +469,7 @@ function initUI() {
         makeSlider($this, Number($tr.attr('min')), Number($tr.attr('max')),
                 Number($tr.attr('snap')), ticks, Number($tr.attr('ticksnum')), Number($tr.attr('decimals')), $tr.attr('unit'));
     });
-
+    
     /* progress bars */
     makeProgressBar($('div.progress-bar'));
 
@@ -672,6 +672,16 @@ function initUI() {
         pushCameraConfig($(this).parents('tr:eq(0)').attr('reboot') == 'true');
     });
     
+    /* streaming framerate must be >= device framerate */
+    $('#framerateSlider').change(function (val) {
+        var value = Number($('#framerateSlider').val());
+        var streamingValue = Number($('#streamingFramerateSlider').val());
+        
+        if (streamingValue < value) {
+            $('#streamingFramerateSlider').val(value).change();
+        }
+    });
+    
     /* preview controls */
     $('#brightnessSlider').change(function () {pushPreview('brightness');});
     $('#contrastSlider').change(function () {pushPreview('contrast');});
@@ -1465,11 +1475,11 @@ function dict2CameraUi(dict) {
     var mjpgUrl = location.protocol + '//' + location.host.split(':')[0] + ':' + dict.streaming_port;
     var embedUrl = cameraUrl + 'frame/';
 
-    if (dict.proto == 'motioneye') { // TODO what about other protocols
+    if (dict.proto == 'motioneye') {
         /* cannot tell the mjpg streaming url for a remote motionEye camera */
         mjpgUrl = '';
     }
-    
+
     if ($('#normalPasswordEntry').val()) { /* anonymous access is disabled */ 
         snapshotUrl = addAuthParams('GET', snapshotUrl);
         if (mjpgUrl) {

diff --git a/templates/main.html b/templates/main.html
index 92df18ef19741be372b816207e01e80cb931fa9e..d7133e6a6fa7196384da628370f14183745171da 100644 (file)
--- a/templates/main.html
+++ b/templates/main.html
@@ -205,11 +205,11 @@
                     </tr>
                     <tr class="settings-item advanced-setting">
                         <td class="settings-item-label"><span class="settings-item-label">Camera Device</span></td>
-                        <td class="settings-item-value"><input type="text" class="styled device camera-config" id="deviceUriEntry" disabled="disabled"></td>
+                        <td class="settings-item-value"><input type="text" class="styled device camera-config" id="deviceUriEntry" readonly="readonly"></td>
                     </tr>
                     <tr class="settings-item advanced-setting">
                         <td class="settings-item-label"><span class="settings-item-label">Camera Type</span></td>
-                        <td class="settings-item-value"><input type="text" class="styled device camera-config" id="deviceTypeEntry" disabled="disabled"></td>
+                        <td class="settings-item-value"><input type="text" class="styled device camera-config" id="deviceTypeEntry" readonly="readonly"></td>
                     </tr>
                     <tr class="settings-item advanced-setting">
                         <td colspan="100"><div class="settings-item-separator"></div></td>
@@ -253,7 +253,7 @@
                             <select class="video-resolution styled device camera-config" id="resolutionSelect">
                             </select>
                         </td>
-                        <td><span class="help-mark" title="the video resolution (larger values produce better quality but require larger storage space and bandwidth)">?</span></td>
+                        <td><span class="help-mark" title="the video resolution (larger values produce better quality but require more CPU power, larger storage space and bandwidth)">?</span></td>
                     </tr>
                     <tr class="settings-item advanced-setting">
                         <td class="settings-item-label"><span class="settings-item-label">Video Rotation</span></td>
@@ -270,7 +270,7 @@
                     <tr class="settings-item advanced-setting" min="2" max="30" snap="0" ticks="2|5|10|15|20|25|30" decimals="0">
                         <td class="settings-item-label"><span class="settings-item-label">Frame Rate</span></td>
                         <td class="settings-item-value"><input type="text" class="range styled device camera-config" id="framerateSlider"></td>
-                        <td><span class="help-mark" title="sets the number of frames captured by the camera every second (higher values produce smoother videos but require larger storage space and bandwidth)">?</span></td>
+                        <td><span class="help-mark" title="sets the number of frames captured by the camera every second (higher values produce smoother videos but require more CPU power, larger storage space and bandwidth)">?</span></td>
                     </tr>
                     <tr class="settings-item advanced-setting">
                         <td class="settings-item-label"><span class="settings-item-label">Extra Motion Options</span></td>