sciveo 0.1.79__tar.gz → 0.1.81__tar.gz

{sciveo-0.1.79 → sciveo-0.1.81}/PKG-INFO

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

{sciveo-0.1.79 → sciveo-0.1.81}/sciveo/cli.py

@@ -116,13 +116,13 @@ def main():
       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, list_draw=data)
+        server = CamFactory(args.src_id, args.width, args.height, args.fps, configuration=data)
       elif args.src is not None:
         if "color" in args.src:
           server = ColorBarFactory(args.width, args.height, args.fps)
         else:
           # warning("RTSP src", args.src, "not recognised")
-          server = CamFactory(args.src, args.width, args.height, args.fps, list_draw=data)
+          server = CamFactory(args.src, args.width, args.height, args.fps, configuration=data)
       server.serve(host=args.host, port=args.port, stream=args.stream)
   elif args.command == 'media-server':
     from sciveo.media.pipelines.server import __START_SCIVEO_MEDIA_SERVER__

{sciveo-0.1.79 → sciveo-0.1.81}/sciveo/media/capture/cam.py

@@ -46,23 +46,28 @@ class CaptureBase(DaemonBase):
     pass
 
   def loop(self):
-    with self.lock_frame:
-      self.read_frame()
-      self.fps.update()
+    self.read_frame()
+    self.fps.update()
 
 
 class CameraDaemon(CaptureBase):
   def __init__(self, cam_id=0, period=0):
     super().__init__(src=cam_id, tag="cam", period=period)
-    self.cap = cv2.VideoCapture(cam_id)
-    debug(cam_id, "warming...")
+    self.init_cam()
+
+  def init_cam(self):
+    debug(self.src, "starting...")
+    self.cap = cv2.VideoCapture(self.src)
     time.sleep(1)
+    debug(self.src, "started")
 
   def close(self):
     self.cap.release()
 
   def read_frame(self):
-    ret, self.frame = self.cap.read()
+    ret, frame = self.cap.read()
+    with self.lock_frame:
+      self.frame = frame
 
 
 class PredictorCameraDaemon(DaemonBase):
@@ -142,8 +147,10 @@ class ScreenDaemon(CaptureBase):
 
   def read_frame(self):
     sct_img = self.sct.grab(self.monitor)
-    self.frame = np.array(sct_img)
-    self.frame = cv2.cvtColor(self.frame, cv2.COLOR_BGRA2BGR)
+    frame = np.array(sct_img)
+    frame = cv2.cvtColor(frame, cv2.COLOR_BGRA2BGR)
+    with self.lock_frame:
+      self.frame = frame
 
 
 if __name__ == '__main__':

{sciveo-0.1.79 → sciveo-0.1.81}/sciveo/media/capture/draw.py

@@ -16,7 +16,7 @@ from sciveo.tools.logger import *
 
 
 class DrawNone:
-  def __call__(self, frame, tag):
+  def __call__(self, frame, configuration):
     return frame
 
 class DrawDateTime:
@@ -34,7 +34,7 @@ class DrawDateTime:
     self.font = font
     self.font_scale_factor = font_scale_factor
 
-  def __call__(self, frame, tag):
+  def __call__(self, frame, configuration):
     """
     Draws date/time (or custom text) on the frame.
 
@@ -45,9 +45,13 @@ class DrawDateTime:
     if frame is None or len(frame.shape) < 2:
       return frame  # invalid frame
 
+    tag = configuration.get("tag", "")
+
     h, w = frame.shape[:2]
 
-    font_scale = max(0.2, h * self.font_scale_factor)
+    font_scale = configuration.get("font_scale", max(0.2, h * self.font_scale_factor))
+    color = configuration.get("color", self.color)
+    thickness = configuration.get("thickness", self.thickness)
 
     date_text = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     draw_text = f"{tag} {date_text}"
@@ -56,7 +60,7 @@ class DrawDateTime:
     x = min(max(self.position[0], 0), w - 1)
     y = min(max(self.position[1] + int(font_scale * 20), int(font_scale * 20)), h - 1)
 
-    cv2.putText(frame, draw_text, (x, y), self.font, font_scale, self.color, self.thickness, cv2.LINE_AA)
+    cv2.putText(frame, draw_text, (x, y), self.font, font_scale, color, thickness, cv2.LINE_AA)
     return frame
 
 

{sciveo-0.1.79 → sciveo-0.1.81}/sciveo/media/capture/gst_server.py

@@ -18,6 +18,7 @@ from gi.repository import Gst, GObject, GstRtspServer, GLib
 Gst.init(None)
 
 from sciveo.tools.logger import *
+from sciveo.tools.timers import FPSCounter
 from sciveo.media.capture.draw import *
 from sciveo.media.capture.cam import CameraDaemon
 
@@ -30,6 +31,7 @@ class RTSPFactoryBase(GstRtspServer.RTSPMediaFactory):
     self.fps = fps
     self.appsrc_name = appsrc_name
     self.set_shared(True)
+    self.fps_next_frame = FPSCounter(period=10, tag=f"{appsrc_name} ({self.width}x{self.height}@{self.fps})")
 
   def do_create_element(self, url):
     pipeline_str = (
@@ -114,28 +116,40 @@ class ColorBarFactory(RTSPFactoryBase):
     self.gen = ColorBarsGenerator(width=width, height=height)
 
   def next_frame(self):
+    self.fps_next_frame.update()
     return self.gen.next_frame()
 
 
 class CamFactory(ColorBarFactory):
-  def __init__(self, cam_id, width, height, fps, list_draw={}):
+  def __init__(self, cam_id, width, height, fps, configuration={}):
     super().__init__(width, height, fps, appsrc_name=f"cam{cam_id}")
-    self.cam = CameraDaemon(cam_id=cam_id)
-    self.cam.start()
-    self.list_draw = list_draw
+    self.cam_id = cam_id
+    self.configuration = configuration
     self.list_draw_processors = {
       "none": DrawNone(),
       "dt": DrawDateTime(),
     }
 
+    self.init_cam()
+    self.cam.start()
+
+  def init_cam(self):
+    if "RPI" in self.configuration:
+      from sciveo.media.capture.rpi import RPICamera
+      self.cam = RPICamera(cam_id=self.cam_id, width=self.width, height=self.height)
+    else:
+      self.cam = CameraDaemon(cam_id=self.cam_id)
+
   def next_frame(self):
     frame = self.cam.read()
     if frame is None:
       frame = super().next_frame()
 
-    for k, v in self.list_draw.items():
+    for k, v in self.configuration.get("draw", {}).items():
       self.list_draw_processors.get(k, DrawNone())(frame, v)
 
+    self.fps_next_frame.update()
+
     return frame
 
 

sciveo-0.1.81/sciveo/media/capture/rpi.py

@@ -0,0 +1,57 @@
+#
+# Pavlin Georgiev, Softel Labs
+#
+# This is a proprietary file and may not be copied,
+# distributed, or modified without express permission
+# from the owner. For licensing inquiries, please
+# contact pavlin@softel.bg.
+#
+# 2024
+#
+
+import time
+import numpy as np
+import cv2
+from picamera2 import Picamera2
+
+from sciveo.tools.logger import *
+from sciveo.media.capture.cam import CameraDaemon
+from sciveo.media.capture.gst_server import CamFactory
+
+
+class RPICamera(CameraDaemon):
+  def __init__(self, cam_id=0, width=640, height=480, period=0):
+    self.width = width
+    self.height = height
+    super().__init__(cam_id=cam_id, period=period)
+
+  def init_cam(self):
+    debug(self.src, "starting...")
+
+    self.picam2 = Picamera2()
+    config = self.picam2.create_video_configuration(
+      main={
+        "size": (self.width, self.height),
+        "format": "RGB888"
+      },
+      buffer_count=4
+    )
+    self.picam2.configure(config)
+    self.picam2.start()
+
+    time.sleep(1)
+    debug(self.src, "started")
+
+  def close(self):
+    self.picam2.stop()
+
+  def read_frame(self):
+    frame = self.picam2.capture_array()
+    cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
+    with self.lock_frame:
+      self.frame = frame
+
+
+class RPICameraFactory(CamFactory):
+  def init_cam(self):
+    self.cam = RPICamera(cam_id=self.cam_id, width=self.width, height=self.height)

{sciveo-0.1.79 → sciveo-0.1.81}/sciveo/tools/configuration.py

@@ -13,6 +13,8 @@ import os
 import json
 import threading
 
+from sciveo.tools.logger import *
+
 
 class GlobalConfiguration:
   config = None
@@ -20,8 +22,8 @@ class GlobalConfiguration:
 
   def __init__(self, name) -> None:
     home = os.path.expanduser('~')
-    self.name = name
-    self.base_path = os.path.join(home, f'.{name}')
+    self.name = name.lower()
+    self.base_path = os.path.join(home, f'.{self.name}')
     self.data = {}
 
     self.default = {
@@ -33,7 +35,7 @@ class GlobalConfiguration:
       self.read_local_files()
       self.read_environment()
     except Exception as e:
-      error("Exception", e)
+      exception(e)
 
   @staticmethod
   def get(name='sciveo', reload=False):
@@ -52,7 +54,7 @@ class GlobalConfiguration:
     return self.data.get(key, self.default.get(key, None))
 
   def save_kv(self, key, value):
-    key = key.strip().lower().replace("sciveo_", "")
+    key = key.strip().lower().replace(f"{self.name}_", "")
     value = value.strip()
     self.data[key] = value
 

{sciveo-0.1.79 → sciveo-0.1.81}/sciveo/tools/daemon.py

@@ -73,14 +73,14 @@ class DaemonBase:
       try:
         self.loop()
       except Exception as e:
-        error(e)
+        exception(e)
       time.sleep(self.period)
 
   def safe_run(self):
     try:
       self.run()
     except Exception as e:
-      error(e)
+      exception(e)
 
 
 class TasksDaemon(DaemonBase):

sciveo-0.1.81/sciveo/version.py

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

{sciveo-0.1.79 → sciveo-0.1.81}/sciveo.egg-info/PKG-INFO

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

{sciveo-0.1.79 → sciveo-0.1.81}/sciveo.egg-info/SOURCES.txt

@@ -34,6 +34,7 @@ sciveo/media/capture/gst_server.py
 sciveo/media/capture/motion_detection.py
 sciveo/media/capture/nvr.py
 sciveo/media/capture/readers.py
+sciveo/media/capture/rpi.py
 sciveo/media/capture/rtsp.py
 sciveo/media/capture/games/__init__.py
 sciveo/media/capture/games/asteroids/__init__.py

sciveo-0.1.79/sciveo/version.py

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