sciveo 0.1.68__tar.gz → 0.1.70__tar.gz

{sciveo-0.1.68 → sciveo-0.1.70}/PKG-INFO

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

{sciveo-0.1.68 → sciveo-0.1.70}/sciveo/media/capture/motion_detection.py

@@ -109,9 +109,16 @@ class MotionDetectorDaemon(DaemonBase):
   def on_motion(self, source_id, file_name, file_path, configuration):
     debug("MOTION", source_id, file_name, configuration)
     if "dst" in self.configuration:
-      dst_file_path = os.path.join(self.configuration["dst"], file_name)
-      shutil.copy(file_path, dst_file_path)
-      debug("CP", file_path, "=>", dst_file_path)
+      file_name_split = file_name.split("___")
+      if len(file_name_split) >= 3:
+        cam_id = file_name_split[0]
+        video_date = file_name_split[1]
+        video_file_name = file_name_split[2]
+        video_base_path = os.path.join(self.configuration["dst"], cam_id, video_date)
+        dst_file_path = os.path.join(video_base_path, video_file_name)
+        os.makedirs(video_base_path, exist_ok=True)
+        shutil.copy(file_path, dst_file_path)
+        debug("CP", file_path, "=>", dst_file_path)
 
   def run(self):
     while(self.is_running):
@@ -124,9 +131,9 @@ 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))
 
             if motion:
               self.on_motion(source_id, file_name, file_path, configuration)

{sciveo-0.1.68 → sciveo-0.1.70}/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.70/sciveo/version.py

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

{sciveo-0.1.68 → sciveo-0.1.70}/sciveo.egg-info/PKG-INFO

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

sciveo-0.1.68/sciveo/version.py

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