sciveo 0.1.80__tar.gz → 0.1.82__tar.gz

{sciveo-0.1.80 → sciveo-0.1.82}/PKG-INFO

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

{sciveo-0.1.80 → sciveo-0.1.82}/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
@@ -56,9 +56,10 @@ class CameraDaemon(CaptureBase):
     self.init_cam()
 
   def init_cam(self):
+    debug(self.src, "starting...")
     self.cap = cv2.VideoCapture(self.src)
-    debug(self.src, "warming...")
     time.sleep(1)
+    debug(self.src, "started")
 
   def close(self):
     self.cap.release()

{sciveo-0.1.80 → sciveo-0.1.82}/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})", round_value=1)
 
   def do_create_element(self, url):
     pipeline_str = (
@@ -114,6 +116,7 @@ class ColorBarFactory(RTSPFactoryBase):
     self.gen = ColorBarsGenerator(width=width, height=height)
 
   def next_frame(self):
+    self.fps_next_frame.update()
     return self.gen.next_frame()
 
 
@@ -145,6 +148,8 @@ class CamFactory(ColorBarFactory):
     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.80 → sciveo-0.1.82}/sciveo/media/capture/rpi.py

@@ -21,11 +21,13 @@ from sciveo.media.capture.gst_server import CamFactory
 
 class RPICamera(CameraDaemon):
   def __init__(self, cam_id=0, width=640, height=480, period=0):
-    super().__init__(cam_id=cam_id, period=period)
     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={
@@ -37,8 +39,8 @@ class RPICamera(CameraDaemon):
     self.picam2.configure(config)
     self.picam2.start()
 
-    debug(self.src, "warming...")
     time.sleep(1)
+    debug(self.src, "started")
 
   def close(self):
     self.picam2.stop()

{sciveo-0.1.80 → sciveo-0.1.82}/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,6 +37,8 @@ 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()

sciveo-0.1.82/sciveo/version.py

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

{sciveo-0.1.80 → sciveo-0.1.82}/sciveo.egg-info/PKG-INFO

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

sciveo-0.1.80/sciveo/version.py

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