sciveo 0.1.81__tar.gz → 0.1.83__tar.gz

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

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

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

@@ -28,7 +28,7 @@ class CaptureBase(DaemonBase):
     self.tag = tag
     self.lock_frame = threading.Lock()
     self.frame = None
-    self.fps = FPSCounter(period=10, tag=f"{self.tag} [{self.src}]")
+    self.fps = FPSCounter(period=10, tag=f"{self.tag} [{self.src}]", round_value=1)
 
   def close(self):
     pass

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

@@ -31,16 +31,18 @@ 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})")
+    self.fps_next_frame = FPSCounter(period=10, tag=f"{appsrc_name} ({self.width}x{self.height}@{self.fps})", round_value=1)
 
   def do_create_element(self, url):
     pipeline_str = (
       f"appsrc name={self.appsrc_name} is-live=true block=true format=time "
       f"caps=video/x-raw,format=BGR,width={self.width},height={self.height},framerate={self.fps}/1 "
       "! videoconvert "
-      "! x264enc tune=zerolatency speed-preset=ultrafast "
+      "! video/x-raw,format=I420 "
+      "! x264enc tune=zerolatency speed-preset=ultrafast key-int-max=30 "
       "! rtph264pay config-interval=1 name=pay0 pt=96"
     )
+    info("GST Pipeline", pipeline_str)
     return Gst.parse_launch(pipeline_str)
 
   def do_configure(self, rtsp_media):
@@ -50,13 +52,16 @@ class RTSPFactoryBase(GstRtspServer.RTSPMediaFactory):
 
   def on_need_data(self, src, length):
     frame = self.next_frame()
+    frame = np.ascontiguousarray(frame, dtype=np.uint8)
 
     data = frame.tobytes()
     buf = Gst.Buffer.new_allocate(None, len(data), None)
     buf.fill(0, data)
+
     buf.duration = Gst.SECOND // self.fps
     buf.pts = buf.dts = self.timestamp
     self.timestamp += buf.duration
+
     src.emit("push-buffer", buf)
 
   def next_frame(self):

{sciveo-0.1.81 → sciveo-0.1.83}/sciveo/media/capture/nvr.py

@@ -22,6 +22,7 @@ from sciveo.tools.logger import *
 from sciveo.tools.daemon import DaemonBase
 from sciveo.tools.queue import TouchedFilePathQueue
 from sciveo.tools.simple_counter import RunCounter
+from sciveo.tools.timers import FPSCounter
 from sciveo.media.capture.motion_detection import MotionDetectorDaemon
 
 
@@ -205,13 +206,16 @@ class RTSPVideoPlayer:
     self.name = name
     self.cap = None
     self.is_running = False
+    self.fps = FPSCounter(period=10, tag=f"{name}", printer=info, round_value=1)
 
   def open(self):
-    info("Opening RTSP", self.rtsp_url)
+    info("Opening...", self.rtsp_url)
     self.cap = cv2.VideoCapture(self.rtsp_url)
     if not self.cap.isOpened():
       error("Failed to open RTSP URL", self.rtsp_url)
       self.cap = None
+    else:
+      info("Opened", self.rtsp_url)
 
   def close(self):
     if self.cap:
@@ -250,6 +254,7 @@ class RTSPVideoPlayer:
       info("Quit key pressed, stopping player")
       self.close()
       self.is_running = False
+    self.fps.update()
 
   def finalise(self):
     self.close()

{sciveo-0.1.81 → sciveo-0.1.83}/sciveo/media/capture/rtsp.py

@@ -12,6 +12,7 @@
 import time
 import cv2
 
+from sciveo.tools.timers import FPSCounter
 from sciveo.tools.logger import *
 
 
@@ -23,13 +24,16 @@ class RTSPVideoPlayer:
     self.name = name
     self.cap = None
     self.is_running = False
+    self.fps = FPSCounter(period=10, tag=f"{name}", printer=info, round_value=1)
 
   def open(self):
-    info("Opening RTSP", self.rtsp_url)
+    info("Opening...", self.rtsp_url)
     self.cap = cv2.VideoCapture(self.rtsp_url)
     if not self.cap.isOpened():
       error("Failed to open RTSP URL", self.rtsp_url)
       self.cap = None
+    else:
+      info("Opened", self.rtsp_url)
 
   def close(self):
     if self.cap:
@@ -68,6 +72,7 @@ class RTSPVideoPlayer:
       info("Quit key pressed, stopping player")
       self.close()
       self.is_running = False
+    self.fps.update()
 
   def finalise(self):
     self.close()

{sciveo-0.1.81 → sciveo-0.1.83}/sciveo/tools/timers.py

@@ -15,7 +15,7 @@ from sciveo.tools.logger import *
 
 
 class FPSCounter:
-  def __init__(self, period=1, tag="", print_period=1, printer=debug):
+  def __init__(self, period=1, tag="", print_period=1, printer=debug, round_value=2):
     self.period = period
     self.print_period = print_period
     self.printer = printer
@@ -24,6 +24,7 @@ class FPSCounter:
     self.n = 0
     self.t1 = time.time()
     self.value = 0
+    self.round_value = round_value
 
   def print(self):
     self.print_n += 1
@@ -36,10 +37,17 @@ class FPSCounter:
     t2 = time.time()
     if t2 - self.t1 > self.period:
       self.value = self.n / (t2 - self.t1)
+      if self.round_value is not None:
+        self.value = round(self.value, self.round_value)
       self.n = 0
       self.t1 = time.time()
       self.print()
 
+  def reset(self):
+    self.n = 0
+    self.t1 = time.time()
+    self.value = 0
+
 
 class TimerExec:
   def __init__(self, fn, period=1.0):

sciveo-0.1.83/sciveo/version.py

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

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

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

sciveo-0.1.81/sciveo/version.py

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