Set "streamable" property of flvmux to True.

[toast/stream2beamer.git] / lagarde.py

diff --git a/lagarde.py b/lagarde.py
index 8ef74071c4b0ecd1d1e45b129001c353212049b6..7c982c3b9bff049e0c593ae4861bb6a2bf701b29 100755 (executable)
--- a/lagarde.py
+++ b/lagarde.py
@@ -5,6 +5,7 @@ import json
 import logging
 import ssl
 import queue
+from typing import List
 
 import gi
 import websockets
@@ -169,16 +170,17 @@ class WebRTCClient:
                 enc.set_property('tune', 'zerolatency')
                 capsfilter = Gst.ElementFactory.make('capsfilter')
                 capsfilter.set_properties(Gst.Caps.from_string('video/x-h264,stream-format=(string)avc'))
-                flmux = Gst.ElementFactory.make('flvmux')
+                flvmux = Gst.ElementFactory.make('flvmux')
+                flvmux.set_property('streamable', True)
                 sink = Gst.ElementFactory.make('rtmpsink')
                 sink.set_property('location', self.rtmp_uri)
-                assert q and conv and enc and capsfilter and flmux and sink
+                assert q and conv and enc and capsfilter and flvmux and sink
 
                 self.pipe.add(q)
                 self.pipe.add(conv)
                 self.pipe.add(enc)
                 self.pipe.add(capsfilter)
-                self.pipe.add(flmux)
+                self.pipe.add(flvmux)
                 self.pipe.add(sink)
 
                 q_pad_sink = q.get_static_pad('sink')
@@ -192,9 +194,9 @@ class WebRTCClient:
                 assert ok
                 ok = enc.link(capsfilter)
                 assert ok
-                ok = capsfilter.link(flmux)
+                ok = capsfilter.link(flvmux)
                 assert ok
-                ok = flmux.link(sink)
+                ok = flvmux.link(sink)
                 assert ok
                 self.pipe.set_state(Gst.State.PLAYING)
                 self.pipe.sync_children_states()
@@ -276,13 +278,7 @@ 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(laplace_uri: str, rtmp_uri: str):
+async def run_room(laplace_uri: str, rtmp_uri: str):
     try:
         events = Events()
         webrtc = WebRTCClient(events, rtmp_uri)
@@ -301,19 +297,43 @@ async def run(laplace_uri: str, rtmp_uri: str):
         print(e)
 
 
+async def run_room_repeated(laplace_uri: str, rtmp_uri: str, sleep_time: float):
+    while True:
+        await run_room(laplace_uri, rtmp_uri)
+        await asyncio.sleep(sleep_time)
+
+
+async def run_rooms(laplace_base_uri: str, rtmp_base_uri: str, rooms: List[str], retry: bool):
+    tasks = []
+    for room in rooms:
+        laplace_uri = laplace_base_uri + room  # TODO: encode
+        rtmp_uri = rtmp_base_uri + room  # TODO: encode
+        if retry:
+            tasks.append(run_room_repeated(laplace_uri, rtmp_uri, 2.))
+        else:
+            tasks.append(run_room(laplace_uri, rtmp_uri))
+    await asyncio.gather(*tasks)
+
+
 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'
+    default_source = 'wss://localhost:1234/ws_connect?id='
+    default_dest = 'rtmp://localhost:1935/'
+    default_room = 'cug'
     parser = argparse.ArgumentParser()
     parser.add_argument('-s', '--source', default=default_source,
-                        help=f'Laplace signalling websocket URI, default: {default_source}')
+                        help=f'Laplace signalling websocket base URI, default: {default_source}')
     parser.add_argument('-d', '--destination', default=default_dest,
-                        help=f'RTMP server URI, default: {default_dest}')
+                        help=f'RTMP server base URI, default: {default_dest}')
+    parser.add_argument('-r', '--retry', action='store_true', help=f'Retry forever if room not found or closed')
+    parser.add_argument('room', nargs='*', help=f'Room names to be used, "{default_room}" if omitted')
     args = parser.parse_args()
 
     Gst.init(None)
-    asyncio.run(run(args.source, args.destination))
+    rooms = args.room
+    if len(rooms) == 0:
+        rooms = [default_room]
+    asyncio.run(run_rooms(args.source, args.destination, rooms, args.retry))
 
 
 if __name__ == '__main__':