default video codec is now msmpeg4

diff --git a/src/cleanup.py b/src/cleanup.py
index 7ac6a39f054e0445f06eba538b9e5114b155dbf4..aa1aef242fbdba6a1a75bc1da67502030d20576c 100644 (file)
--- a/src/cleanup.py
+++ b/src/cleanup.py
@@ -42,8 +42,8 @@ def stop():
     if not running():
         raise Exception('cleanup is not running')
     
-    _process.join(timeout=10)
     if _process.is_alive():
+        _process.join(timeout=10)
         logging.error('cleanup process did not finish in time, killing it...')
         os.kill(_process.pid, signal.SIGKILL)
     

diff --git a/src/config.py b/src/config.py
index 1bcbcf3ed061ad5932b798a1bdac1752934a09de..5a8a69c099c26ef3f9778562c103ba655394c4b4 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -1002,6 +1002,7 @@ def _set_default_motion_camera(camera_id, data):
     data.setdefault('ffmpeg_bps', 400000)
     data.setdefault('movie_filename', '%Y-%m-%d/%H-%M-%S')
     data.setdefault('ffmpeg_cap_new', False)
+    data.setdefault('ffmpeg_video_codec', 'msmpeg4')
     data.setdefault('@preserve_movies', 0)
     
     data.setdefault('@motion_notifications', False)

diff --git a/src/mediafiles.py b/src/mediafiles.py
index 60697f887365a3961d9cfaf332c142c664c8276f..03538baa85486e5364b8e2b6b25bad201de23cba 100644 (file)
--- a/src/mediafiles.py
+++ b/src/mediafiles.py
@@ -112,7 +112,7 @@ def cleanup_media(media_type):
         exts = _PICTURE_EXTS
         
     elif media_type == 'movie':
-        exts = _MOVIE_EXTS
+        exts = _MOVIE_EXTS + ['.thumb']
         
     for camera_id in config.get_camera_ids():
         camera_config = config.get_camera(camera_id)

diff --git a/src/thumbnailer.py b/src/thumbnailer.py
index 23fefd051bde1293af4d74cc4db2adf9f0ff8021..07831770d5befef229a69595a0d8401ffab74d28 100644 (file)
--- a/src/thumbnailer.py
+++ b/src/thumbnailer.py
@@ -42,8 +42,8 @@ def stop():
     if not running():
         raise Exception('thumbnailer is not running')
     
-    _process.join(timeout=10)
     if _process.is_alive():
+        _process.join(timeout=10)
         logging.error('thumbnailer process did not finish in time, killing it...')
         os.kill(_process.pid, signal.SIGKILL)
     

diff --git a/static/js/main.js b/static/js/main.js
index df0d825b339db851f5c257ed1a5dc87ff3045403..d8abd0347f944bbf7a8e5fbe0f734f7e3b50adc5 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -1719,6 +1719,7 @@ function addCameraFrameUi(cameraId, cameraName, framerate) {
         cameraImg.addClass('error').removeClass('loading');
         cameraImg.height(Math.round(cameraImg.width() * 0.75));
         cameraPlaceholder.css('opacity', 1);
+        cameraProgress.css('opacity', 0);
     });
     cameraImg.load(function () {
         if (refreshDisabled) {