sciveo 0.1.85__tar.gz → 0.1.87__tar.gz

{sciveo-0.1.85 → sciveo-0.1.87}/PKG-INFO

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

{sciveo-0.1.85 → sciveo-0.1.87}/sciveo/cli.py

@@ -28,7 +28,7 @@ def main():
     'command',
     choices=[
       'init', 'monitor', 'scan',
-      'nvr', 'rtsp',
+      'nvr', 'rtsp', 'capture',
       'predictors-server', 'media-server', 'media-run',
       'watchdog',
     ],
@@ -114,7 +114,7 @@ def main():
       player = RTSPVideoPlayer(url)
       player.run()
     else:
-      from sciveo.media.capture.gst_server import CamFactory, ColorBarFactory, CamDisplayDaemon
+      from sciveo.media.capture.gst_server import CamFactory, ColorBarFactory, CamPlayerDaemon
       data = json.loads(args.data_json)
       if args.src_id is not None:
         server = CamFactory(args.src_id, args.width, args.height, args.fps, configuration=data)
@@ -125,11 +125,24 @@ def main():
           # warning("RTSP src", args.src, "not recognised")
           server = CamFactory(args.src, args.width, args.height, args.fps, configuration=data)
       if args.display is not None:
-        display_daemon = CamDisplayDaemon(server, host=args.host, port=args.port, stream=args.stream, display=args.display)
-        display_daemon.start()
-        display_daemon.display()
+        player = CamPlayerDaemon(server, host=args.host, port=args.port, stream=args.stream, display=args.display)
+        player.start()
+        player.play()
       else:
         server.serve(host=args.host, port=args.port, stream=args.stream)
+  elif args.command == 'capture':
+    from sciveo.media.capture.cam import CameraDaemon, ScreenDaemon, CapturePlayer
+    if args.src == "screen":
+      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=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__
     __START_SCIVEO_MEDIA_SERVER__()

{sciveo-0.1.85 → sciveo-0.1.87}/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):
@@ -153,11 +153,43 @@ class ScreenDaemon(CaptureBase):
       self.frame = frame
 
 
+class CapturePlayer:
+  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)
+        continue
+      cv2.imshow(f"{self.tag} {frame.shape}", frame)
+      if cv2.waitKey(1) & 0xFF == ord(self.key_quit):
+        break
+
+      self.fps_player.update()
+
+      self.fps_delay.wait()
+
+    self.cap.close()
+
+
 if __name__ == '__main__':
   cap = ScreenDaemon(src=1, region=[300,300, 800,800])
-  cap.start()
-  while(True):
-    frame = cap.read()
-    frame = cv2.resize(frame, (250, 250))
-    cv2.imshow("captured", frame)
-    cv2.waitKey(1)
+  player = CapturePlayer(cap, tag="screen", key_quit='q')
+  player.play()

{sciveo-0.1.85 → sciveo-0.1.87}/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')
@@ -173,7 +172,7 @@ class CamFactory(ColorBarFactory):
     return frame
 
 
-class CamDisplayDaemon(DaemonBase):
+class CamPlayerDaemon(DaemonBase):
   def __init__(self, cam_factory, host="0.0.0.0", port=8554, stream="test", display=0):
     super().__init__()
     self.cam_factory = cam_factory
@@ -186,7 +185,8 @@ class CamDisplayDaemon(DaemonBase):
   def loop(self):
     self.cam_factory.serve(host=self.host, port=self.port, stream=self.stream)
 
-  def display(self):
+  def play(self):
+    import cv2
     while(True):
       frame = self.cam_factory.read_cam_frame()
       if frame is None:

{sciveo-0.1.85 → sciveo-0.1.87}/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.87/sciveo/version.py

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

{sciveo-0.1.85 → sciveo-0.1.87}/sciveo.egg-info/PKG-INFO

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

sciveo-0.1.85/sciveo/version.py

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