fixed movie quality setting change when changing the framerate or

resolution

diff --git a/src/config.py b/src/config.py
index 2e9bd8daa81856bd6d2fdf11442d23636fdc8b86..bd0f5ba488ef3917b4c8e311ffc395660043c261 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -781,16 +781,15 @@ def motion_camera_ui_to_dict(ui, old_config=None):
             
         data['quality'] = max(1, int(ui['image_quality']))
     
-    if ui['motion_movies']:
-        if proto == 'v4l2':
-            max_val = data['width'] * data['height'] * data['framerate'] / 3
-        
-        else: # always assume netcam image size of (640x480) - we have no means to test it
-            max_val = 640 * 480 * data['framerate'] / 3
-            
-        max_val = min(max_val, 9999999)
+    if proto == 'v4l2':
+        max_val = data['width'] * data['height'] * data['framerate'] / 3
+    
+    else: # always assume a netcam image size of 640x480, since we have no means to know it at this point
+        max_val = 640 * 480 * data['framerate'] / 3
         
-        data['ffmpeg_bps'] = int(ui['movie_quality']) * max_val / 100
+    max_val = min(max_val, 9999999)
+    
+    data['ffmpeg_bps'] = int(ui['movie_quality']) * max_val / 100
     
     # working schedule
     if ui['working_schedule']: