sciveo 0.1.77__tar.gz → 0.1.79__tar.gz

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

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

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

@@ -60,6 +60,7 @@ def main():
   parser.add_argument('--execute', type=str, default=None, help='Execute command')
   parser.add_argument('--pid', type=int, default=None, help='Process PID')
   parser.add_argument('--serial', type=str, default=None, help='Serial Name')
+  parser.add_argument('--data-json', type=str, default="{}", help='Json Data')
 
   args = parser.parse_args()
 
@@ -113,14 +114,15 @@ def main():
       player.run()
     else:
       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)
+        server = CamFactory(args.src_id, args.width, args.height, args.fps, list_draw=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)
+          server = CamFactory(args.src, args.width, args.height, args.fps, list_draw=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.77 → sciveo-0.1.79}/sciveo/media/capture/gst_server.py

@@ -23,16 +23,17 @@ from sciveo.media.capture.cam import CameraDaemon
 
 
 class RTSPFactoryBase(GstRtspServer.RTSPMediaFactory):
-  def __init__(self, width, height, fps):
+  def __init__(self, width, height, fps, appsrc_name="rtspvideo"):
     super().__init__()
     self.width = width
     self.height = height
     self.fps = fps
+    self.appsrc_name = appsrc_name
     self.set_shared(True)
 
   def do_create_element(self, url):
     pipeline_str = (
-      f"appsrc name=mysrc is-live=true block=true format=time "
+      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 "
@@ -41,7 +42,7 @@ class RTSPFactoryBase(GstRtspServer.RTSPMediaFactory):
     return Gst.parse_launch(pipeline_str)
 
   def do_configure(self, rtsp_media):
-    self.appsrc = rtsp_media.get_element().get_child_by_name("mysrc")
+    self.appsrc = rtsp_media.get_element().get_child_by_name(self.appsrc_name)
     self.appsrc.connect("need-data", self.on_need_data)
     self.timestamp = 0
 
@@ -108,8 +109,8 @@ class ColorBarsGenerator:
 
 
 class ColorBarFactory(RTSPFactoryBase):
-  def __init__(self, width, height, fps):
-    super().__init__(width, height, fps)
+  def __init__(self, width, height, fps, appsrc_name="colorbar"):
+    super().__init__(width, height, fps, appsrc_name=appsrc_name)
     self.gen = ColorBarsGenerator(width=width, height=height)
 
   def next_frame(self):
@@ -118,7 +119,7 @@ class ColorBarFactory(RTSPFactoryBase):
 
 class CamFactory(ColorBarFactory):
   def __init__(self, cam_id, width, height, fps, list_draw={}):
-    super().__init__(width, height, fps)
+    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

sciveo-0.1.79/sciveo/version.py

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

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

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

sciveo-0.1.77/sciveo/version.py

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