mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpmux: Only free pad private when pad is disposed

Browse source
This commit is contained in:
Olivier Crête 2009-04-22 16:25:07 -04:00 committed by Tim-Philipp Müller
parent 92bb5199ac
commit ed0b407038
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/rtpmanager/gstrtpmux.c
View file

@ -85,7 +85,6 @@ static void gst_rtp_mux_finalize (GObject * object);
static GstPad *gst_rtp_mux_request_new_pad (GstElement * element, static GstPad *gst_rtp_mux_request_new_pad (GstElement * element,
GstPadTemplate * templ, const gchar * name); GstPadTemplate * templ, const gchar * name);
static void gst_rtp_mux_release_pad (GstElement * element, GstPad * pad);
static GstFlowReturn gst_rtp_mux_chain (GstPad * pad, GstBuffer * buffer); static GstFlowReturn gst_rtp_mux_chain (GstPad * pad, GstBuffer * buffer);
static gboolean gst_rtp_mux_setcaps (GstPad * pad, GstCaps * caps); static gboolean gst_rtp_mux_setcaps (GstPad * pad, GstCaps * caps);
static GstCaps *gst_rtp_mux_getcaps (GstPad * pad); static GstCaps *gst_rtp_mux_getcaps (GstPad * pad);
@ -147,7 +146,6 @@ gst_rtp_mux_class_init (GstRTPMuxClass * klass)
gstelement_class->request_new_pad = gstelement_class->request_new_pad =
GST_DEBUG_FUNCPTR (gst_rtp_mux_request_new_pad); GST_DEBUG_FUNCPTR (gst_rtp_mux_request_new_pad);
gstelement_class->release_pad = GST_DEBUG_FUNCPTR (gst_rtp_mux_release_pad);
gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_rtp_mux_change_state); gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_rtp_mux_change_state);
klass->chain_func = gst_rtp_mux_chain; klass->chain_func = gst_rtp_mux_chain;
@ -245,6 +243,14 @@ gst_rtp_mux_create_sinkpad (GstRTPMux * rtp_mux, GstPadTemplate * templ)
return newpad; return newpad;
} }
static void
free_pad_private (gpointer data, GObject * where_the_object_was)
{
GstRTPMuxPadPrivate *padpriv = data;
g_slice_free (GstRTPMuxPadPrivate, padpriv);
}
static void static void
gst_rtp_mux_setup_sinkpad (GstRTPMux * rtp_mux, GstPad * sinkpad) gst_rtp_mux_setup_sinkpad (GstRTPMux * rtp_mux, GstPad * sinkpad)
{ {
@ -265,6 +271,7 @@ gst_rtp_mux_setup_sinkpad (GstRTPMux * rtp_mux, GstPad * sinkpad)
gst_pad_set_active (sinkpad, TRUE); gst_pad_set_active (sinkpad, TRUE);
gst_pad_set_element_private (sinkpad, padpriv); gst_pad_set_element_private (sinkpad, padpriv);
g_object_weak_ref (sinkpad, free_pad_private, padpriv);
/* dd the pad to the element */ /* dd the pad to the element */
gst_element_add_pad (GST_ELEMENT (rtp_mux), sinkpad); gst_element_add_pad (GST_ELEMENT (rtp_mux), sinkpad);
@ -296,18 +303,6 @@ gst_rtp_mux_request_new_pad (GstElement * element,
return newpad; return newpad;
} }
static void
gst_rtp_mux_release_pad (GstElement * element, GstPad * pad)
{
GstRTPMuxPadPrivate *padpriv = gst_pad_get_element_private (pad);
if (padpriv)
g_slice_free (GstRTPMuxPadPrivate, padpriv);
gst_pad_set_element_private (pad, NULL);
gst_element_remove_pad (element, pad);
}
/* Put our own clock-base on the buffer */ /* Put our own clock-base on the buffer */
static void static void
gst_rtp_mux_readjust_rtp_timestamp (GstRTPMux * rtp_mux, GstPad * pad, gst_rtp_mux_readjust_rtp_timestamp (GstRTPMux * rtp_mux, GstPad * pad,