Re-implement optional re-connect.

[toast/stream2beamer.git] / lagarde.py

diff --git a/lagarde.py b/lagarde.py
index 63782061dee0ed7288a2e482a6de7f6573ee07b2..15ba5159961a5477e8bac56a0067a3224faa936e 100755 (executable)
--- a/lagarde.py
+++ b/lagarde.py
@@ -123,8 +123,9 @@ class SignalingClient:
 
 
 class WebRTCClient:
-    def __init__(self, events: Events):
+    def __init__(self, events: Events, rtmp_uri: str):
         self.events = events
+        self.rtmp_uri = rtmp_uri
         self.webrtcbin = Gst.ElementFactory.make('webrtcbin', 'laplace')
         self.pipe = Gst.Pipeline.new("pipeline")
         Gst.Bin.do_add_element(self.pipe, self.webrtcbin)
@@ -170,7 +171,7 @@ class WebRTCClient:
                 capsfilter.set_properties(Gst.Caps.from_string('video/x-h264,stream-format=(string)avc'))
                 flmux = Gst.ElementFactory.make('flvmux')
                 sink = Gst.ElementFactory.make('rtmpsink')
-                sink.set_property('location', 'rtmp://192.168.1.46:1935/gregoa')
+                sink.set_property('location', self.rtmp_uri)
                 assert q and conv and enc and capsfilter and flmux and sink
 
                 self.pipe.add(q)
@@ -222,9 +223,9 @@ class WebRTCClient:
         answer = reply.get_value('answer')
         sdp_message = answer.sdp
         mids = [sdp_message.get_media(i).get_attribute_val('mid')
-                     for i in range(sdp_message.medias_len())]
+                for i in range(sdp_message.medias_len())]
         user_fragments = [sdp_message.get_media(i).get_attribute_val('ice-ufrag')
-                               for i in range(sdp_message.medias_len())]
+                          for i in range(sdp_message.medias_len())]
         self.events.sdp_info.put_nowait((mids, user_fragments))
         sdp_answer = sdp_message.as_text()
         log.info(f'Send SDP answer')
@@ -275,17 +276,11 @@ class WebRTCClient:
             self.pipe.set_state(Gst.State.NULL)
 
 
-async def run_repeated(task):
-    while True:
-        await task()
-        await asyncio.sleep(0.1)
-
-
-async def run(uri):
+async def run(laplace_uri: str, rtmp_uri: str):
     try:
         events = Events()
-        webrtc = WebRTCClient(events)
-        signaling = SignalingClient(events, uri)
+        webrtc = WebRTCClient(events, rtmp_uri)
+        signaling = SignalingClient(events, laplace_uri)
 
         webrtc_task = asyncio.Task(webrtc.run())
         signaling_task = asyncio.Task(signaling.run())
@@ -300,15 +295,30 @@ async def run(uri):
         print(e)
 
 
+async def run_repeated(laplace_uri: str, rtmp_uri: str, sleep_time: float):
+    while True:
+        await run(laplace_uri, rtmp_uri)
+        await asyncio.sleep(sleep_time)
+
+
 def main():
     logging.basicConfig(level=logging.DEBUG, format='%(asctime)-15s %(message)s')
+    default_source = 'wss://localhost:1234/ws_connect?id=cug'
+    default_dest = 'rtmp://localhost:1935/cug'
     parser = argparse.ArgumentParser()
-    parser.add_argument('--uri', default='wss://localhost:1234/ws_connect?id=cug',
-                        help='Signalling server URI')
+    parser.add_argument('-s', '--source', default=default_source,
+                        help=f'Laplace signalling websocket URI, default: {default_source}')
+    parser.add_argument('-d', '--destination', default=default_dest,
+                        help=f'RTMP server URI, default: {default_dest}')
+    parser.add_argument('-r', '--retry', action='store_true', help=f'Retry forever if room not found or closed')
     args = parser.parse_args()
 
     Gst.init(None)
-    asyncio.run(run(args.uri), debug=True)
+    if args.retry:
+        job = run_repeated(args.source, args.destination, 2.)
+    else:
+        job = run(args.source, args.destination)
+    asyncio.run(job)
 
 
 if __name__ == '__main__':