sciveo 0.1.76__tar.gz → 0.1.77__tar.gz

{sciveo-0.1.76 → sciveo-0.1.77}/PKG-INFO

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

{sciveo-0.1.76 → sciveo-0.1.77}/sciveo/cli.py

@@ -39,14 +39,15 @@ def main():
   parser.add_argument('--auth', type=str, default=config['secret_access_key'], help='Auth secret access key')
   parser.add_argument('--timeout', type=float, default=1.0, help='Timeout')
   parser.add_argument('--net', type=str, default=None, help='Network like 192.168.10.0/24')
+  parser.add_argument('--url', type=str, default=None, help='URL')
   parser.add_argument('--host', type=str, default=None, help='Host ip or name')
   parser.add_argument('--port', type=int, default=22, help='Host port number, used for network ops')
   parser.add_argument('--ports', type=str, default="[]", help='Host ports list')
   parser.add_argument('--localhost', type=bool, default=False, help='Add localhost to list of hosts')
   parser.add_argument('--input-path', type=str, default=None, help='Input Path')
   parser.add_argument('--output-path', type=str, default=None, help='Output Path')
-  parser.add_argument('--width', type=str, default=None, help='width')
-  parser.add_argument('--height', type=str, default=None, help='height')
+  parser.add_argument('--width', type=int, default=None, help='width')
+  parser.add_argument('--height', type=int, default=None, help='height')
   parser.add_argument('--fps', type=int, help='FPS')
   parser.add_argument('--stream', type=str, default=None, help='Stream')
   parser.add_argument('--rate', type=int, help='Rate number')
@@ -101,7 +102,14 @@ def main():
   elif args.command == 'rtsp':
     if args.src is None and args.src_id is None:
       from sciveo.media.capture.nvr import RTSPVideoPlayer
-      player = RTSPVideoPlayer(f"rtsp://{args.host}:{args.port}/{args.stream}")
+      if args.url is not None:
+        url = args.url
+      elif args.host is not None and args.stream is not None:
+        url = f"rtsp://{args.host}:{args.port}/{args.stream}"
+      else:
+        warning("Invalid URL")
+        return
+      player = RTSPVideoPlayer(url)
       player.run()
     else:
       from sciveo.media.capture.gst_server import CamFactory, ColorBarFactory

sciveo-0.1.77/sciveo/media/capture/draw.py

@@ -0,0 +1,81 @@
+#
+# 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.
+#
+# 2025
+#
+
+import cv2
+import numpy as np
+from datetime import datetime
+from sciveo.tools.logger import *
+
+
+class DrawNone:
+  def __call__(self, frame, tag):
+    return frame
+
+class DrawDateTime:
+  def __init__(self, position=(10, 10), color=(255, 255, 255), thickness=3, font_scale_factor=0.001, font=cv2.FONT_HERSHEY_SIMPLEX):
+    """
+    position: tuple (x, y) displacement from top-left
+    color: BGR tuple
+    thickness: line thickness
+    font_scale_factor: relative to frame height (0.0015 is reasonable)
+    font: cv2 font
+    """
+    self.position = position
+    self.color = color
+    self.thickness = thickness
+    self.font = font
+    self.font_scale_factor = font_scale_factor
+
+  def __call__(self, frame, tag):
+    """
+    Draws date/time (or custom text) on the frame.
+
+    frame: np.ndarray
+    text: optional text to draw; if None, current date/time is used
+    position, color, thickness: optional overrides
+    """
+    if frame is None or len(frame.shape) < 2:
+      return frame  # invalid frame
+
+    h, w = frame.shape[:2]
+
+    font_scale = max(0.2, h * self.font_scale_factor)
+
+    date_text = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    draw_text = f"{tag} {date_text}"
+
+    # Adjust position to avoid going out of frame
+    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)
+    return frame
+
+
+
+if __name__ == "__main__":
+
+  cap = cv2.VideoCapture(0)
+  drawer = DrawDateTime(tag="test cam", position=(10, 10))
+
+  while True:
+    ret, frame = cap.read()
+    if not ret:
+      break
+
+    frame = drawer(frame)
+
+    cv2.imshow("Frame", frame)
+    if cv2.waitKey(1) & 0xFF == ord('q'):
+      break
+
+  cap.release()
+  cv2.destroyAllWindows()

{sciveo-0.1.76 → sciveo-0.1.77}/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.media.capture.draw import *
 from sciveo.media.capture.cam import CameraDaemon
 
 
@@ -116,15 +117,24 @@ class ColorBarFactory(RTSPFactoryBase):
 
 
 class CamFactory(ColorBarFactory):
-  def __init__(self, cam_id, width, height, fps):
+  def __init__(self, cam_id, width, height, fps, list_draw={}):
     super().__init__(width, height, fps)
     self.cam = CameraDaemon(cam_id=cam_id)
     self.cam.start()
+    self.list_draw = list_draw
+    self.list_draw_processors = {
+      "none": DrawNone(),
+      "dt": DrawDateTime(),
+    }
 
   def next_frame(self):
     frame = self.cam.read()
     if frame is None:
       frame = super().next_frame()
+
+    for k, v in self.list_draw.items():
+      self.list_draw_processors.get(k, DrawNone())(frame, v)
+
     return frame
 
 
@@ -133,5 +143,5 @@ 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)
+    server = CamFactory(0, 640, 480, 30, list_draw={"dt": "cam-test"})
     server.serve(host="0.0.0.0", port=8554, stream="camera")

sciveo-0.1.77/sciveo/version.py

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

{sciveo-0.1.76 → sciveo-0.1.77}/sciveo.egg-info/PKG-INFO

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

{sciveo-0.1.76 → sciveo-0.1.77}/sciveo.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ sciveo/db/read_table.py
 sciveo/media/__init__.py
 sciveo/media/capture/__init__.py
 sciveo/media/capture/cam.py
+sciveo/media/capture/draw.py
 sciveo/media/capture/gst_server.py
 sciveo/media/capture/motion_detection.py
 sciveo/media/capture/nvr.py

sciveo-0.1.76/sciveo/version.py

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