From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 11 Jan 2014 18:04:12 +0000 (+0200)
Subject: default video codec is now msmpeg4
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=8def9f7a40f5ca4ae77c09a2b8b4ca079b3a7fd7;p=motioneye-debian

default video codec is now msmpeg4
---

diff --git a/src/cleanup.py b/src/cleanup.py
index 7ac6a39..aa1aef2 100644
--- 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 1bcbcf3..5a8a69c 100644
--- 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 60697f8..03538ba 100644
--- 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 23fefd0..0783177 100644
--- 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 df0d825..d8abd03 100644
--- 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) {