From 68bbfdc9a2c3e8025cf418e5a966931fb20ecefd Mon Sep 17 00:00:00 2001 From: Emil Ljungdahl Date: Mon, 14 Oct 2024 11:26:20 +0200 Subject: [PATCH] webrtcbin: Clean up bin elements when datachannel is removed When a datachannel within a session is removed after proper close, reference to the error_ignore_bin elements of the datachannel appsrc/appsink were left in webrtcbin. This caused the bin-objects to be left and not freed until the whole webrtc session was terminated. Among other things that includes a thread from the appsrc. Part-of: --- .../gst-plugins-bad/ext/webrtc/gstwebrtcbin.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c index 5a79e6f486..ced8a4117e 100644 --- a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c +++ b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c @@ -2629,8 +2629,18 @@ _on_data_channel_ready_state (WebRTCDataChannel * channel, if (found == FALSE) { GST_FIXME_OBJECT (webrtc, "Received close for unknown data channel"); - } else if (found_pending == FALSE) { - webrtc->priv->data_channels_closed++; + } else { + gst_element_set_locked_state (channel->src_bin, TRUE); + gst_element_set_state (channel->src_bin, GST_STATE_NULL); + gst_bin_remove (GST_BIN (webrtc), channel->src_bin); + + gst_element_set_locked_state (channel->sink_bin, TRUE); + gst_element_set_state (channel->sink_bin, GST_STATE_NULL); + gst_bin_remove (GST_BIN (webrtc), channel->sink_bin); + + if (found_pending == FALSE) { + webrtc->priv->data_channels_closed++; + } } DC_UNLOCK (webrtc); }