sciveo 0.1.86__tar.gz → 0.1.88__tar.gz

{sciveo-0.1.86 → sciveo-0.1.88}/PKG-INFO

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

{sciveo-0.1.86 → sciveo-0.1.88}/sciveo/cli.py

@@ -133,12 +133,15 @@ def main():
   elif args.command == 'capture':
     from sciveo.media.capture.cam import CameraDaemon, ScreenDaemon, CapturePlayer
     if args.src == "screen":
-      cap = ScreenDaemon(src=1, region=json.loads(args.data_json))
+      cap = ScreenDaemon(src=args.src_id, region=json.loads(args.data_json))
     elif args.src == "cam":
       cap = CameraDaemon(cam_id=args.src_id)
+    elif args.src == "rpi":
+      from sciveo.media.capture.rpi import RPICamera
+      cap = RPICamera(cam_id=args.src_id, width=args.width, height=args.height)
     else:
       cap = CameraDaemon(cam_id=args.src_id)
-    player = CapturePlayer(cap, tag=args.src)
+    player = CapturePlayer(cap=cap, tag=args.src, fps=args.fps or 0)
     player.play()
   elif args.command == 'media-server':
     from sciveo.media.pipelines.server import __START_SCIVEO_MEDIA_SERVER__

{sciveo-0.1.86 → sciveo-0.1.88}/sciveo/media/capture/cam.py

@@ -18,7 +18,7 @@ import mss
 
 from sciveo.tools.logger import *
 from sciveo.tools.daemon import DaemonBase
-from sciveo.tools.timers import FPSCounter
+from sciveo.tools.timers import FPSCounter, FPSDelay
 
 
 class CaptureBase(DaemonBase):
@@ -154,14 +154,26 @@ class ScreenDaemon(CaptureBase):
 
 
 class CapturePlayer:
-  def __init__(self, cap, tag="capture", key_quit=ord('q')):
+  def __init__(self, cap, tag="capture", fps=0, key_quit='q'):
     self.cap = cap
     self.tag = tag
     self.key_quit = key_quit
+
+    self.fps = fps
+    if self.fps > 0:
+      self.delay = 1.0 / self.fps
+    else:
+      self.delay = 0
+
+    self.fps_player = FPSCounter(period=10, tag=f"play", round_value=1)
+    self.fps_delay = FPSDelay(self.fps)
     self.cap.start()
 
   def play(self):
+    info("Press", self.key_quit, "to quit")
     while(True):
+      self.fps_delay.start()
+
       frame = self.cap.read()
       if frame is None:
         time.sleep(0.1)
@@ -170,6 +182,10 @@ class CapturePlayer:
       if cv2.waitKey(1) & 0xFF == ord(self.key_quit):
         break
 
+      self.fps_player.update()
+
+      self.fps_delay.wait()
+
     self.cap.close()
 
 

{sciveo-0.1.86 → sciveo-0.1.88}/sciveo/media/capture/gst_server.py

@@ -11,7 +11,6 @@
 
 import numpy as np
 import time
-import cv2
 
 import gi
 gi.require_version('Gst', '1.0')
@@ -187,6 +186,7 @@ class CamPlayerDaemon(DaemonBase):
     self.cam_factory.serve(host=self.host, port=self.port, stream=self.stream)
 
   def play(self):
+    import cv2
     while(True):
       frame = self.cam_factory.read_cam_frame()
       if frame is None:

{sciveo-0.1.86 → sciveo-0.1.88}/sciveo/ml/evaluation/object_detection.py

@@ -147,7 +147,10 @@ class EvalObjectDetection:
 
     # Compute AP using the trapezoidal rule (integrating precision over recall)
     order = np.argsort(recall)
-    ap = np.trapezoid(precision[order], recall[order])
+    try:
+      ap = np.trapezoid(precision[order], recall[order])
+    except Exception:
+      ap = np.trapz(precision[order], recall[order])
     return ap, FP
 
   # TODO: Use simple gradient-based threshold optimisation instead of current grid search.

{sciveo-0.1.86 → sciveo-0.1.88}/sciveo/tools/timers.py

@@ -14,6 +14,25 @@ import time
 from sciveo.tools.logger import *
 
 
+class FPSDelay:
+  def __init__(self, fps):
+    self.fps = fps
+    if fps > 0:
+      self.delay = 1.0 / fps
+    else:
+      self.delay = 0
+
+  def start(self):
+    self.from_time = time.time()
+
+  def wait(self):
+    current_time = time.time()
+    elapsed_time = current_time - self.from_time
+    time_to_wait = self.delay - elapsed_time
+    if time_to_wait > 0:
+      time.sleep(time_to_wait)
+
+
 class FPSCounter:
   def __init__(self, period=1, tag="", print_period=1, printer=debug, round_value=2):
     self.period = period

sciveo-0.1.88/sciveo/version.py

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

{sciveo-0.1.86 → sciveo-0.1.88}/sciveo.egg-info/PKG-INFO

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

sciveo-0.1.86/sciveo/version.py

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