sciveo 0.1.69__tar.gz → 0.1.71__tar.gz

{sciveo-0.1.69 → sciveo-0.1.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.69
+Version: 0.1.71
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

{sciveo-0.1.69 → sciveo-0.1.71}/sciveo/media/capture/motion_detection.py

@@ -19,6 +19,7 @@ from sciveo.tools.logger import *
 from sciveo.tools.daemon import DaemonBase
 from sciveo.media.capture.readers import VideoReaderFFMPEG
 from sciveo.tools.queue import TouchedFilePathQueue
+from sciveo.tools.simple_counter import SimpleStat
 
 
 class MotionDetectorGrid:
@@ -71,6 +72,8 @@ class VideoMotionDetector:
     current_threshold = self.configuration["threshold_motion"] * k_motion_level
     motion_level = np.mean(fgmask)
 
+    self.stat.set(motion_level)
+
     if motion_level > current_threshold:
       self.count_motion_hold += 1
       if self.count_motion_hold >= self.configuration["threshold_motion_hold"]:
@@ -82,6 +85,11 @@ class VideoMotionDetector:
 
   def __call__(self, list_frames):
     self.count_motion_hold = 0
+    self.stat = SimpleStat()
+
+    if len(list_frames) > 0:
+      for i in range(10):
+        fgmask = self.apply(list_frames[0])
 
     for frame in list_frames:
       try:
@@ -131,10 +139,10 @@ class MotionDetectorDaemon(DaemonBase):
           source_id = file_name_split[0]
 
           if source_id in self.configuration:
-            configuration = self.configuration.get(source_id, { "threshold_motion": 5, "threshold_motion_hold": 8, "grid": [[0.0]] })
+            configuration = self.configuration.get(source_id, { "threshold_motion": 5, "threshold_motion_hold": 5, "grid": [[0.0]] })
             md = self.motion_detectors.get(source_id, VideoMotionDetector(source_id, configuration))
-            motion = md(VideoReaderFFMPEG.read(file_path, resolution=360, RGB=False, gpu_id=0))
-
+            motion = md(VideoReaderFFMPEG.read(file_path, resolution=360, RGB=False, gpu_id=-1, framestep=5))
+            debug("STAT", source_id, md.stat)
             if motion:
               self.on_motion(source_id, file_name, file_path, configuration)
 

{sciveo-0.1.69 → sciveo-0.1.71}/sciveo/media/capture/readers.py

@@ -43,7 +43,7 @@ class VideoReaderFFMPEG:
     return width, height
 
   @staticmethod
-  def read(file_path, resolution=720, RGB=False, gpu_id=-1, timeout=30):
+  def read(file_path, resolution=720, RGB=False, gpu_id=-1, timeout=30, fps=None, framestep=None):
     timer_video_read = Timer()
     frames = []
 
@@ -81,6 +81,11 @@ class VideoReaderFFMPEG:
     if in_w != out_w or in_h != out_h:
       ffmpeg_input = ffmpeg_input.filter('scale', out_w, out_h)
 
+    if fps is not None:
+      ffmpeg_input = ffmpeg_input.filter('fps', fps=fps)
+    if framestep is not None:
+      ffmpeg_input = ffmpeg_input.filter('framestep', step=framestep)
+
     process = (
       ffmpeg_input
       .output('pipe:', format='rawvideo', pix_fmt=pix_fmt, vsync='vfr')

sciveo-0.1.71/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.1.71'

{sciveo-0.1.69 → sciveo-0.1.71}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.69
+Version: 0.1.71
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

sciveo-0.1.69/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.1.69'