Use new function SDPMessage.new_from_text.

[toast/stream2beamer.git] / lagarde.py

diff --git a/lagarde.py b/lagarde.py
index 94ea57e64ca76442a8516df8b8984b4ee40beb65..55b1e1f21cacff70c8e5dfe8d068f5d8a6526f4d 100755 (executable)
--- a/lagarde.py
+++ b/lagarde.py
@@ -170,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')
@@ -193,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()
@@ -253,11 +254,8 @@ class WebRTCClient:
                         return
                 elif self.events.sdp_offer.qsize() > 0:
                     sdp_offer = self.events.sdp_offer.get_nowait()
-                    res, sm = GstSdp.SDPMessage.new()
+                    res, sm = GstSdp.SDPMessage.new_from_text(sdp_offer)
                     assert res == GstSdp.SDPResult.OK
-                    GstSdp.sdp_message_parse_buffer(bytes(sdp_offer.encode()), sm)
-                    # the three lines above can also be done this way in new versions of GStreamer:
-                    # sm = GstSdp.SDPMessage.new_from_text(sdp_offer)
                     rd = GstWebRTC.WebRTCSessionDescription.new(GstWebRTC.WebRTCSDPType.OFFER, sm)
                     gst_promise = Gst.Promise.new_with_change_func(self.set_remote_desciption_done)
                     self.webrtcbin.emit('set-remote-description', rd, gst_promise)