sciveo 0.1.88__tar.gz → 0.1.90__tar.gz

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

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

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

@@ -114,21 +114,16 @@ def main():
       player = RTSPVideoPlayer(url)
       player.run()
     else:
-      from sciveo.media.capture.gst_server import CamFactory, ColorBarFactory, CamPlayerDaemon
+      from sciveo.media.capture.gst_server import CamFactory, ColorBarFactory
       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)
+        server = CamFactory(args.src_id, args.width, args.height, args.fps, configuration=data, display=args.display)
       elif args.src is not None:
         if "color" in args.src:
-          server = ColorBarFactory(args.width, args.height, args.fps)
+          server = ColorBarFactory(args.width, args.height, args.fps, display=args.display)
         else:
           # 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:
-        player = CamPlayerDaemon(server, host=args.host, port=args.port, stream=args.stream, display=args.display)
-        player.start()
-        player.play()
-      else:
+          server = CamFactory(args.src, args.width, args.height, args.fps, configuration=data, display=args.display)
         server.serve(host=args.host, port=args.port, stream=args.stream)
   elif args.command == 'capture':
     from sciveo.media.capture.cam import CameraDaemon, ScreenDaemon, CapturePlayer

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

@@ -11,6 +11,7 @@
 
 import numpy as np
 import time
+import cv2
 
 import gi
 gi.require_version('Gst', '1.0')
@@ -26,12 +27,14 @@ from sciveo.media.capture.cam import CameraDaemon
 
 
 class RTSPFactoryBase(GstRtspServer.RTSPMediaFactory):
-  def __init__(self, width, height, fps, appsrc_name="rtspvideo"):
+  def __init__(self, width, height, fps, appsrc_name="rtspvideo", display=None):
     super().__init__()
     self.width = width
     self.height = height
     self.fps = fps
+    self.frame = None
     self.appsrc_name = appsrc_name
+    self.display = display
     self.set_shared(True)
     self.fps_next_frame = FPSCounter(period=10, tag=f"{appsrc_name} ({self.width}x{self.height}@{self.fps})", round_value=1)
 
@@ -53,10 +56,10 @@ class RTSPFactoryBase(GstRtspServer.RTSPMediaFactory):
     self.timestamp = 0
 
   def on_need_data(self, src, length):
-    frame = self.next_frame()
-    frame = np.ascontiguousarray(frame, dtype=np.uint8)
+    self.frame = self.next_frame()
+    self.frame = np.ascontiguousarray(self.frame, dtype=np.uint8)
 
-    data = frame.tobytes()
+    data = self.frame.tobytes()
     buf = Gst.Buffer.new_allocate(None, len(data), None)
     buf.fill(0, data)
 
@@ -69,6 +72,12 @@ class RTSPFactoryBase(GstRtspServer.RTSPMediaFactory):
   def next_frame(self):
     return np.zeros((self.height, self.width, 3), dtype=np.uint8)
 
+  def play_imshow(self):
+    if self.frame is not None:
+      cv2.imshow(f"{self.appsrc_name} {self.frame.shape}", self.frame)
+      cv2.waitKey(1)
+    return True
+
   def serve(self, host="0.0.0.0", port=8554, stream="test"):
     rtsp_url = f"rtsp://{host}:{port}/{stream}"
     server = GstRtspServer.RTSPServer()
@@ -79,6 +88,14 @@ class RTSPFactoryBase(GstRtspServer.RTSPMediaFactory):
     mount_points.add_factory(f"/{stream}", self)
 
     server.attach(None)
+
+    if self.display is not None:
+      # Consider more display options along with current cv2.imshow()
+      if self.display == 0:
+        GLib.idle_add(self.play_imshow)
+      else:
+        GLib.idle_add(self.play_imshow)
+
     info(f"RTSP server {type(self).__name__} running at {rtsp_url}")
     GLib.MainLoop().run()
 
@@ -118,8 +135,8 @@ class ColorBarsGenerator:
 
 
 class ColorBarFactory(RTSPFactoryBase):
-  def __init__(self, width, height, fps, appsrc_name="colorbar"):
-    super().__init__(width, height, fps, appsrc_name=appsrc_name)
+  def __init__(self, width, height, fps, appsrc_name="colorbar", display=None):
+    super().__init__(width, height, fps, appsrc_name=appsrc_name, display=display)
     self.gen = ColorBarsGenerator(width=width, height=height)
 
   def next_frame(self):
@@ -128,8 +145,8 @@ class ColorBarFactory(RTSPFactoryBase):
 
 
 class CamFactory(ColorBarFactory):
-  def __init__(self, cam_id, width, height, fps, configuration={}):
-    super().__init__(width, height, fps, appsrc_name=f"cam{cam_id}")
+  def __init__(self, cam_id, width, height, fps, configuration={}, display=None):
+    super().__init__(width, height, fps, appsrc_name=f"cam{cam_id}", display=display)
     self.cam_id = cam_id
     self.configuration = configuration
     self.list_draw_processors = {
@@ -172,40 +189,10 @@ 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):
-    import cv2
-    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)
     # server.serve(host="0.0.0.0", port=8554, stream="test")
 
-    server = CamFactory(0, 640, 480, 30, list_draw={"dt": "cam-test"})
+    server = CamFactory(0, 640, 480, 30, list_draw={"dt": "cam-test"}, display=0)
     server.serve(host="0.0.0.0", port=8554, stream="camera")

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

@@ -149,7 +149,7 @@ class EvalObjectDetection:
     order = np.argsort(recall)
     try:
       ap = np.trapezoid(precision[order], recall[order])
-    except Exception:
+    except AttributeError:
       ap = np.trapz(precision[order], recall[order])
     return ap, FP
 

sciveo-0.1.90/sciveo/version.py

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

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

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

sciveo-0.1.88/sciveo/version.py

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