update handling of caps in decodebin_pad_added()

[toast/stream2beamer.git] / lagarde.py

diff --git a/lagarde.py b/lagarde.py
index a658a4ea27a1eb0da4ef7aadfff89ced674d43a0..08c37b0f428adf66d4e0d09d92c04823f3de9229 100755 (executable)
--- a/lagarde.py
+++ b/lagarde.py
@@ -62,29 +62,33 @@ class Lagarde:
             return
 
         caps = pad.get_current_caps()
-        assert (len(caps))
-        s = caps[0]
-        name = s.get_name()
-        if name.startswith('video'):
-            q = Gst.ElementFactory.make('queue')
-            conv = Gst.ElementFactory.make('videoconvert')
-            sink = Gst.ElementFactory.make('autovideosink')
-            self.pipe.add(q, conv, sink)
-            self.pipe.sync_children_states()
-            pad.link(q.get_static_pad('sink'))
-            q.link(conv)
-            conv.link(sink)
-        elif name.startswith('audio'):
-            q = Gst.ElementFactory.make('queue')
-            conv = Gst.ElementFactory.make('audioconvert')
-            resample = Gst.ElementFactory.make('audioresample')
-            sink = Gst.ElementFactory.make('autoaudiosink')
-            self.pipe.add(q, conv, resample, sink)
-            self.pipe.sync_children_states()
-            pad.link(q.get_static_pad('sink'))
-            q.link(conv)
-            conv.link(resample)
-            resample.link(sink)
+        # assert (len(caps)) # we have a Gst.Caps object and it has no length
+        # s = caps[0] # also, it's not a list
+        padsize = caps.get_size()
+        assert(padsize > 0)
+        for i in range(padsize): # pythonic?!
+            s = caps.get_structure(i) # Gst.Structure
+            name = s.get_name()
+            if name.startswith('video'):
+                q = Gst.ElementFactory.make('queue')
+                conv = Gst.ElementFactory.make('videoconvert')
+                sink = Gst.ElementFactory.make('autovideosink')
+                self.pipe.add(q, conv, sink)
+                self.pipe.sync_children_states()
+                pad.link(q.get_static_pad('sink'))
+                q.link(conv)
+                conv.link(sink)
+            elif name.startswith('audio'):
+                q = Gst.ElementFactory.make('queue')
+                conv = Gst.ElementFactory.make('audioconvert')
+                resample = Gst.ElementFactory.make('audioresample')
+                sink = Gst.ElementFactory.make('autoaudiosink')
+                self.pipe.add(q, conv, resample, sink)
+                self.pipe.sync_children_states()
+                pad.link(q.get_static_pad('sink'))
+                q.link(conv)
+                conv.link(resample)
+                resample.link(sink)
 
     async def listen_to_gstreamer_bus(self):
         Gst.init(None)
@@ -115,7 +119,6 @@ class Lagarde:
                     gst_promise = Gst.Promise.new()
                     self.webrtcbin.emit('set-remote-description', rd, gst_promise)
                     gst_promise.wait()
-                    print(gst_promise.get_reply())
                     self.sdp_offer = None
 
                     log.info('create-answer')
@@ -193,6 +196,9 @@ class Lagarde:
                     value_json = json.loads(msg_value)
                     log.info(f'ICE: {value_json}')
                     self.received_ice_candidates.append(value_json)
+                elif msg_type == 'roomClosed':
+                    log.info('Oh noes, the room went away!')
+                    # and here we should clean up
                 else:
                     log.error(f'Unknown message type {msg_type}')