sciveo 0.1.84__tar.gz → 0.1.86__tar.gz

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

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

{sciveo-0.1.84 → sciveo-0.1.86}/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',
     ],
@@ -61,6 +61,7 @@ def main():
   parser.add_argument('--pid', type=int, default=None, help='Process PID')
   parser.add_argument('--serial', type=str, default=None, help='Serial Name')
   parser.add_argument('--data-json', type=str, default="{}", help='Json Data')
+  parser.add_argument('--display', type=int, default=None, help='Display number')
 
   args = parser.parse_args()
 
@@ -113,7 +114,7 @@ def main():
       player = RTSPVideoPlayer(url)
       player.run()
     else:
-      from sciveo.media.capture.gst_server import CamFactory, ColorBarFactory
+      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)
@@ -123,7 +124,22 @@ def main():
         else:
           # warning("RTSP src", args.src, "not recognised")
           server = CamFactory(args.src, args.width, args.height, args.fps, configuration=data)
-      server.serve(host=args.host, port=args.port, stream=args.stream)
+      if args.display is not None:
+        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=1, region=json.loads(args.data_json))
+    elif args.src == "cam":
+      cap = CameraDaemon(cam_id=args.src_id)
+    else:
+      cap = CameraDaemon(cam_id=args.src_id)
+    player = CapturePlayer(cap, tag=args.src)
+    player.play()
   elif args.command == 'media-server':
     from sciveo.media.pipelines.server import __START_SCIVEO_MEDIA_SERVER__
     __START_SCIVEO_MEDIA_SERVER__()

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

@@ -153,11 +153,27 @@ class ScreenDaemon(CaptureBase):
       self.frame = frame
 
 
+class CapturePlayer:
+  def __init__(self, cap, tag="capture", key_quit=ord('q')):
+    self.cap = cap
+    self.tag = tag
+    self.key_quit = key_quit
+    self.cap.start()
+
+  def play(self):
+    while(True):
+      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.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.84 → sciveo-0.1.86}/sciveo/media/capture/gst_server.py

@@ -10,6 +10,8 @@
 #
 
 import numpy as np
+import time
+import cv2
 
 import gi
 gi.require_version('Gst', '1.0')
@@ -18,6 +20,7 @@ from gi.repository import Gst, GObject, GstRtspServer, GLib
 Gst.init(None)
 
 from sciveo.tools.logger import *
+from sciveo.tools.daemon import DaemonBase
 from sciveo.tools.timers import FPSCounter
 from sciveo.media.capture.draw import *
 from sciveo.media.capture.cam import CameraDaemon
@@ -145,12 +148,16 @@ class CamFactory(ColorBarFactory):
     else:
       self.cam = CameraDaemon(cam_id=self.cam_id)
 
-  def next_frame(self):
+  def read_cam_frame(self):
     try:
       frame = self.cam.read()
     except Exception as e:
       exception(e, "CAM frame read FAIL")
       frame = None
+    return frame
+
+  def next_frame(self):
+    frame = self.read_cam_frame()
 
     if frame is None:
       frame = super().next_frame()
@@ -166,6 +173,35 @@ class CamFactory(ColorBarFactory):
     return frame
 
 
+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
+    self.host = host
+    self.port = port
+    self.stream = stream
+    self.display = display
+    self.fps_display = FPSCounter(period=10, tag=f"display", round_value=1)
+
+  def loop(self):
+    self.cam_factory.serve(host=self.host, port=self.port, stream=self.stream)
+
+  def play(self):
+    while(True):
+      frame = self.cam_factory.read_cam_frame()
+      if frame is None:
+        time.sleep(0.1)
+        continue
+
+      if self.display == 0:
+        cv2.imshow(f"cam {self.cam_factory.cam_id} {frame.shape}", frame)
+        if cv2.waitKey(1) & 0xFF == ord('q'):
+          break
+
+      self.fps_display.update()
+
+
+
 if __name__ == "__main__":
 
     # server = ColorBarFactory(640, 480, 10)

sciveo-0.1.86/sciveo/version.py

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

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

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

sciveo-0.1.84/sciveo/version.py

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