mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpbin: Free session if request pads are released

Browse source 
Free the session when all the request pads are released.
Don't mess with the session list in free_session as it is called from a foreach
on that list.
Set the state of the upstream element to NULL first.

See #561752
This commit is contained in:
Olivier Crête 2009-05-22 01:03:55 +02:00 committed by Wim Taymans
parent 4424fd3c93
commit fb59348dbe
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/rtpmanager/gstrtpbin.c
View file

@ -554,8 +554,8 @@ free_session (GstRtpBinSession * sess)
GST_DEBUG_OBJECT (bin, "freeing session %p", sess); GST_DEBUG_OBJECT (bin, "freeing session %p", sess);
gst_element_set_state (sess->session, GST_STATE_NULL);
gst_element_set_state (sess->demux, GST_STATE_NULL); gst_element_set_state (sess->demux, GST_STATE_NULL);
gst_element_set_state (sess->session, GST_STATE_NULL);
if (sess->recv_rtp_sink != NULL) { if (sess->recv_rtp_sink != NULL) {
gst_element_release_request_pad (sess->session, sess->recv_rtp_sink); gst_element_release_request_pad (sess->session, sess->recv_rtp_sink);
@ -589,8 +589,6 @@ free_session (GstRtpBinSession * sess)
g_mutex_free (sess->lock); g_mutex_free (sess->lock);
g_hash_table_destroy (sess->ptmap); g_hash_table_destroy (sess->ptmap);
bin->sessions = g_slist_remove (bin->sessions, sess);
g_free (sess); g_free (sess);
} }
@ -2512,6 +2510,13 @@ gst_rtp_bin_release_pad (GstElement * element, GstPad * pad)
} else if (session->send_rtcp_src == target) { } else if (session->send_rtcp_src == target) {
remove_rtcp (rtpbin, session, pad); remove_rtcp (rtpbin, session, pad);
} }
/* no more request pads, free the complete session */
if (session->recv_rtp_sink == NULL && session->recv_rtcp_sink == NULL &&
session->send_rtp_sink == NULL && session->send_rtcp_src == NULL) {
rtpbin->sessions = g_slist_remove (rtpbin->sessions, session);
free_session (session);
}
GST_RTP_BIN_UNLOCK (rtpbin); GST_RTP_BIN_UNLOCK (rtpbin);
gst_object_unref (target); gst_object_unref (target);