mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtcbin: fix prevention of webrtcbin deletion due to ref held by probe callback

Browse source 
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/810

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1150>
This commit is contained in:
Rob Agar 2021-10-14 14:07:07 +01:00
parent be9cf6c9cd
commit 66a24023c0
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c
View file

@ -1858,10 +1858,20 @@ gst_webrtc_bin_attach_tos_to_session (GstWebRTCBin * webrtc, guint session_id)
} }
} }
static void
weak_free (GWeakRef * weak)
{
g_weak_ref_clear (weak);
g_free (weak);
}
static GstPadProbeReturn static GstPadProbeReturn
_nicesink_pad_probe (GstPad * pad, GstPadProbeInfo * info, gpointer user_data) _nicesink_pad_probe (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
{ {
GstWebRTCBin *webrtc = user_data; GstWebRTCBin *webrtc = g_weak_ref_get ((GWeakRef *) user_data);
if (!webrtc)
return GST_PAD_PROBE_REMOVE;
if (GST_EVENT_TYPE (GST_PAD_PROBE_INFO_EVENT (info)) if (GST_EVENT_TYPE (GST_PAD_PROBE_INFO_EVENT (info))
== GST_EVENT_CUSTOM_DOWNSTREAM_STICKY) { == GST_EVENT_CUSTOM_DOWNSTREAM_STICKY) {
@ -1950,6 +1960,9 @@ _nicesink_pad_probe (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
} }
} }
} }
gst_object_unref (webrtc);
return GST_PAD_PROBE_OK; return GST_PAD_PROBE_OK;
} }
@ -1994,11 +2007,15 @@ gst_webrtc_bin_attach_probe_to_ice_sink (GstWebRTCBin * webrtc,
GstWebRTCICETransport * transport) GstWebRTCICETransport * transport)
{ {
GstPad *pad; GstPad *pad;
GWeakRef *weak;
pad = gst_element_get_static_pad (transport->sink, "sink"); pad = gst_element_get_static_pad (transport->sink, "sink");
weak = g_new0 (GWeakRef, 1);
g_weak_ref_init (weak, webrtc);
gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
_nicesink_pad_probe, g_object_ref (webrtc), _nicesink_pad_probe, weak, (GDestroyNotify) weak_free);
(GDestroyNotify) gst_object_unref);
gst_object_unref (pad); gst_object_unref (pad);
} }