mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 02:32:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtc: Clean up pad block allocs on dispose.

Browse source 
Release references in pad blocks and release the memory in the
dispose function too, in case the state change doesn't get
run (because calling the parent state change fails).
This commit is contained in:
Jan Schmidt 2018-06-27 22:42:12 +10:00
parent ed90d3b2ec
commit bc128d6100
1 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ext/webrtc/transportsendbin.c
View file

@ -68,6 +68,8 @@ enum
PROP_RTCP_MUX,
};
static void cleanup_blocks (TransportSendBin * send);
static void
_set_rtcp_mux (TransportSendBin * send, gboolean rtcp_mux)
{
@ -263,27 +265,13 @@ transport_send_bin_change_state (GstElement * element,
case GST_STATE_CHANGE_READY_TO_NULL:{
GstElement *elem;
if (send->rtp_block)
_free_pad_block (send->rtp_block);
send->rtp_block = NULL;
if (send->rtcp_mux_block)
_free_pad_block (send->rtcp_mux_block);
send->rtcp_mux_block = NULL;
cleanup_blocks (send);
elem = send->stream->transport->dtlssrtpenc;
gst_element_set_locked_state (elem, FALSE);
if (send->rtcp_block)
_free_pad_block (send->rtcp_block);
send->rtcp_block = NULL;
elem = send->stream->rtcp_transport->dtlssrtpenc;
gst_element_set_locked_state (elem, FALSE);
if (send->rtp_nice_block)
_free_pad_block (send->rtp_nice_block);
send->rtp_nice_block = NULL;
if (send->rtcp_nice_block)
_free_pad_block (send->rtcp_nice_block);
send->rtcp_nice_block = NULL;
break;
}
default:
@ -420,6 +408,28 @@ transport_send_bin_constructed (GObject * object)
G_OBJECT_CLASS (parent_class)->constructed (object);
}
static void
cleanup_blocks (TransportSendBin * send)
{
if (send->rtp_block)
_free_pad_block (send->rtp_block);
send->rtp_block = NULL;
if (send->rtcp_mux_block)
_free_pad_block (send->rtcp_mux_block);
send->rtcp_mux_block = NULL;
if (send->rtcp_block)
_free_pad_block (send->rtcp_block);
send->rtcp_block = NULL;
if (send->rtp_nice_block)
_free_pad_block (send->rtp_nice_block);
send->rtp_nice_block = NULL;
if (send->rtcp_nice_block)
_free_pad_block (send->rtcp_nice_block);
send->rtcp_nice_block = NULL;
}
static void
transport_send_bin_dispose (GObject * object)
{
@ -432,6 +442,7 @@ transport_send_bin_dispose (GObject * object)
rtcp_transport->transport, send);
}
send->stream = NULL;
cleanup_blocks (send);
G_OBJECT_CLASS (parent_class)->dispose (object);
}